From c7543a95fcd787767044ab220e7b8c30588ae7d2 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Wed, 22 Mar 2017 16:29:04 +0100
Subject: [PATCH] Update on load process
---
modeling/modelsForTestingTTool/testdiplo.xml | 564 +++++++++----------
src/ui/MainGUI.java | 21 +-
2 files changed, 299 insertions(+), 286 deletions(-)
diff --git a/modeling/modelsForTestingTTool/testdiplo.xml b/modeling/modelsForTestingTTool/testdiplo.xml
index e2b1273031..6161c0529e 100644
--- a/modeling/modelsForTestingTTool/testdiplo.xml
+++ b/modeling/modelsForTestingTTool/testdiplo.xml
@@ -8,8 +8,8 @@
<cdparam x="202" y="135" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="202" y="135" id="89" />
-<P2 x="716" y="122" id="74" />
+<P1 x="202" y="135" id="95" />
+<P2 x="716" y="122" id="78" />
<Point x="494" y="61" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
@@ -26,14 +26,14 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1041" y="214" id="11" />
-<P2 x="279" y="167" id="95" />
+<P2 x="279" y="167" id="89" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
<cdparam x="662" y="349" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="875" y="362" id="63" />
+<P1 x="875" y="362" id="59" />
<P2 x="1019" y="214" id="12" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -41,7 +41,7 @@
<cdparam x="665" y="154" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="878" y="145" id="78" />
+<P1 x="878" y="145" id="74" />
<P2 x="1024" y="205" id="14" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -57,7 +57,7 @@
<cdparam x="236" y="311" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="236" y="285" id="93" />
+<P1 x="236" y="285" id="91" />
<P2 x="411" y="460" id="27" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -66,7 +66,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="424" y="229" id="48" />
-<P2 x="675" y="395" id="59" />
+<P2 x="675" y="395" id="63" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="9" >
@@ -81,7 +81,7 @@
<cdparam x="292" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="279" y="218" id="91" />
+<P1 x="279" y="218" id="93" />
<P2 x="408" y="221" id="43" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -174,14 +174,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="60" >
<father id="73" num="0" />
-<cdparam x="662" y="395" />
+<cdparam x="862" y="362" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evt2" />
+<infoparam name="Primitive port" value="Event jevt2" />
<TGConnectingPoint num="0" id="59" />
<extraparam>
-<Prop commName="evt2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="jevt2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -208,14 +208,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="64" >
<father id="73" num="2" />
-<cdparam x="862" y="362" />
+<cdparam x="662" y="395" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event jevt2" />
+<infoparam name="Primitive port" value="Event evt2" />
<TGConnectingPoint num="0" id="63" />
<extraparam>
-<Prop commName="jevt2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evt2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -244,15 +244,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="75" >
<father id="88" num="0" />
-<cdparam x="703" y="122" />
+<cdparam x="865" y="145" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event comm" />
+<infoparam name="Primitive port" value="Event jevt1" />
<TGConnectingPoint num="0" id="74" />
<extraparam>
-<Prop commName="comm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="jevt1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -278,15 +278,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="79" >
<father id="88" num="2" />
-<cdparam x="865" y="145" />
+<cdparam x="703" y="122" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event jevt1" />
+<infoparam name="Primitive port" value="Event comm" />
<TGConnectingPoint num="0" id="78" />
<extraparam>
-<Prop commName="jevt1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="comm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -314,15 +314,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="90" >
<father id="105" num="0" />
-<cdparam x="189" y="135" />
+<cdparam x="266" y="167" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event testEvt" />
+<infoparam name="Primitive port" value="Event jevt" />
<TGConnectingPoint num="0" id="89" />
<extraparam>
-<Prop commName="testEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="jevt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -331,14 +331,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="92" >
<father id="105" num="1" />
-<cdparam x="266" y="218" />
+<cdparam x="223" y="285" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evsrc" />
+<infoparam name="Primitive port" value="Channel ch1" />
<TGConnectingPoint num="0" id="91" />
<extraparam>
-<Prop commName="evsrc" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="ch1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -348,14 +348,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="94" >
<father id="105" num="2" />
-<cdparam x="223" y="285" />
+<cdparam x="266" y="218" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel ch1" />
+<infoparam name="Primitive port" value="Event evsrc" />
<TGConnectingPoint num="0" id="93" />
<extraparam>
-<Prop commName="ch1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evsrc" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -365,15 +365,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="96" >
<father id="105" num="3" />
-<cdparam x="266" y="167" />
+<cdparam x="189" y="135" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event jevt" />
+<infoparam name="Primitive port" value="Event testEvt" />
<TGConnectingPoint num="0" id="95" />
<extraparam>
-<Prop commName="jevt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="testEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -975,7 +975,7 @@
<cdparam x="579" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="653" y="398" id="273" />
+<P1 x="666" y="385" id="273" />
<P2 x="487" y="255" id="240" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -983,7 +983,7 @@
<cdparam x="574" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="656" y="163" id="251" />
+<P1 x="669" y="150" id="251" />
<P2 x="487" y="238" id="238" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -992,7 +992,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="504" y="247" id="235" />
-<P2 x="376" y="164" id="262" />
+<P2 x="363" y="151" id="262" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="250" >
@@ -1293,7 +1293,7 @@
<cdparam x="579" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="653" y="398" id="352" />
+<P1 x="666" y="385" id="352" />
<P2 x="487" y="255" id="319" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1301,7 +1301,7 @@
<cdparam x="574" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="656" y="163" id="330" />
+<P1 x="669" y="150" id="330" />
<P2 x="487" y="238" id="317" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1310,7 +1310,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="504" y="247" id="314" />
-<P2 x="376" y="164" id="341" />
+<P2 x="363" y="151" id="341" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="329" >
@@ -1501,81 +1501,81 @@
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="3951" >
+<COMPONENT type="1001" id="373" >
<cdparam x="499" y="422" />
<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="3952" />
+<TGConnectingPoint num="0" id="372" />
</COMPONENT>
-<COMPONENT type="1001" id="3948" >
+<COMPONENT type="1001" id="375" >
<cdparam x="311" y="409" />
<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="3949" />
+<TGConnectingPoint num="0" id="374" />
</COMPONENT>
-<COMPONENT type="1010" id="3944" >
+<COMPONENT type="1010" id="378" >
<cdparam x="460" y="333" />
<sizeparam width="75" 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="comm0(x) " />
-<TGConnectingPoint num="0" id="3945" />
-<TGConnectingPoint num="1" id="3946" />
+<TGConnectingPoint num="0" id="376" />
+<TGConnectingPoint num="1" id="377" />
<extraparam>
<Data eventName="comm0" nbOfParams="5" />
<Param index="0" value="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="3940" >
+<COMPONENT type="1010" id="381" >
<cdparam x="295" y="336" />
<sizeparam width="75" 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="comm0(x) " />
-<TGConnectingPoint num="0" id="3941" />
-<TGConnectingPoint num="1" id="3942" />
+<TGConnectingPoint num="0" id="379" />
+<TGConnectingPoint num="1" id="380" />
<extraparam>
<Data eventName="comm0" nbOfParams="5" />
<Param index="0" value="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="3924" >
+<COMPONENT type="1012" id="389" >
<cdparam x="394" y="251" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="3925" />
-<TGConnectingPoint num="1" id="3926" />
-<TGConnectingPoint num="2" id="3927" />
-<TGConnectingPoint num="3" id="3928" />
+<TGConnectingPoint num="0" id="385" />
+<TGConnectingPoint num="1" id="386" />
+<TGConnectingPoint num="2" id="387" />
+<TGConnectingPoint num="3" id="388" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="3929" >
-<father id="3924" num="0" />
+<SUBCOMPONENT type="-1" id="382" >
+<father id="389" num="0" />
<cdparam x="347" y="261" />
<sizeparam width="26" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ b ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3930" >
-<father id="3924" num="1" />
+<SUBCOMPONENT type="-1" id="383" >
+<father id="389" num="1" />
<cdparam x="429" y="261" />
<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3931" >
-<father id="3924" num="2" />
+<SUBCOMPONENT type="-1" id="384" >
+<father id="389" num="2" />
<cdparam x="414" y="296" />
<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1583,127 +1583,127 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1010" id="374" >
+<COMPONENT type="1010" id="392" >
<cdparam x="384" y="131" />
<sizeparam width="75" 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="comm0(x) " />
-<TGConnectingPoint num="0" id="372" />
-<TGConnectingPoint num="1" id="373" />
+<TGConnectingPoint num="0" id="390" />
+<TGConnectingPoint num="1" id="391" />
<extraparam>
<Data eventName="comm0" nbOfParams="5" />
<Param index="0" value="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="378" >
+<COMPONENT type="1000" id="394" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="377" />
+<TGConnectingPoint num="0" id="393" />
</COMPONENT>
-<CONNECTOR type="115" id="379" >
+<CONNECTOR type="115" id="395" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="377" />
-<P2 x="421" y="126" id="372" />
+<P1 x="407" y="70" id="393" />
+<P2 x="421" y="126" id="390" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="380" >
+<CONNECTOR type="115" id="396" >
<cdparam x="421" y="156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="421" y="156" id="373" />
-<P2 x="409" y="241" id="3925" />
+<P1 x="421" y="156" id="391" />
+<P2 x="409" y="241" id="385" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3943" >
+<CONNECTOR type="115" id="397" >
<cdparam x="369" y="266" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="369" y="266" id="3926" />
-<P2 x="332" y="331" id="3941" />
+<P1 x="369" y="266" id="386" />
+<P2 x="332" y="331" id="379" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3947" >
+<CONNECTOR type="115" id="398" >
<cdparam x="449" y="266" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="449" y="266" id="3927" />
-<P2 x="497" y="328" id="3945" />
+<P1 x="449" y="266" id="387" />
+<P2 x="497" y="328" id="376" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3950" >
+<CONNECTOR type="115" id="399" >
<cdparam x="332" 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="332" y="361" id="3942" />
-<P2 x="321" y="404" id="3949" />
+<P1 x="332" y="361" id="380" />
+<P2 x="321" y="404" id="374" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3953" >
+<CONNECTOR type="115" id="400" >
<cdparam x="497" y="358" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="497" y="358" id="3946" />
-<P2 x="509" y="417" id="3952" />
+<P1 x="497" y="358" id="377" />
+<P2 x="509" y="417" id="372" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1008" id="383" >
+<COMPONENT type="1008" id="403" >
<cdparam x="469" y="113" />
<sizeparam width="68" 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="comm2(x)" />
-<TGConnectingPoint num="0" id="381" />
-<TGConnectingPoint num="1" id="382" />
+<TGConnectingPoint num="0" id="401" />
+<TGConnectingPoint num="1" id="402" />
<extraparam>
<Data eventName="comm2" nbOfParams="5" />
<Param index="0" value="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="385" >
+<COMPONENT type="1001" id="405" >
<cdparam x="500" y="183" />
<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="384" />
+<TGConnectingPoint num="0" id="404" />
</COMPONENT>
-<COMPONENT type="1000" id="387" >
+<COMPONENT type="1000" id="407" >
<cdparam x="473" y="46" />
<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="386" />
+<TGConnectingPoint num="0" id="406" />
</COMPONENT>
-<CONNECTOR type="115" id="388" >
+<CONNECTOR type="115" id="408" >
<cdparam x="480" y="66" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="480" y="66" id="386" />
-<P2 x="503" y="108" id="381" />
+<P1 x="480" y="66" id="406" />
+<P2 x="503" y="108" id="401" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="389" >
+<CONNECTOR type="115" id="409" >
<cdparam x="503" y="138" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="503" y="138" id="382" />
-<P2 x="510" y="178" id="384" />
+<P1 x="503" y="138" id="402" />
+<P2 x="510" y="178" id="404" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1716,96 +1716,96 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="441" >
+<COMPONENT type="1100" id="461" >
<cdparam x="344" y="131" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="417" />
-<TGConnectingPoint num="1" id="418" />
-<TGConnectingPoint num="2" id="419" />
-<TGConnectingPoint num="3" id="420" />
-<TGConnectingPoint num="4" id="421" />
-<TGConnectingPoint num="5" id="422" />
-<TGConnectingPoint num="6" id="423" />
-<TGConnectingPoint num="7" id="424" />
-<TGConnectingPoint num="8" id="425" />
-<TGConnectingPoint num="9" id="426" />
-<TGConnectingPoint num="10" id="427" />
-<TGConnectingPoint num="11" id="428" />
-<TGConnectingPoint num="12" id="429" />
-<TGConnectingPoint num="13" id="430" />
-<TGConnectingPoint num="14" id="431" />
-<TGConnectingPoint num="15" id="432" />
-<TGConnectingPoint num="16" id="433" />
-<TGConnectingPoint num="17" id="434" />
-<TGConnectingPoint num="18" id="435" />
-<TGConnectingPoint num="19" id="436" />
-<TGConnectingPoint num="20" id="437" />
-<TGConnectingPoint num="21" id="438" />
-<TGConnectingPoint num="22" id="439" />
-<TGConnectingPoint num="23" id="440" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="2" id="439" />
+<TGConnectingPoint num="3" id="440" />
+<TGConnectingPoint num="4" id="441" />
+<TGConnectingPoint num="5" id="442" />
+<TGConnectingPoint num="6" id="443" />
+<TGConnectingPoint num="7" id="444" />
+<TGConnectingPoint num="8" id="445" />
+<TGConnectingPoint num="9" id="446" />
+<TGConnectingPoint num="10" id="447" />
+<TGConnectingPoint num="11" id="448" />
+<TGConnectingPoint num="12" id="449" />
+<TGConnectingPoint num="13" id="450" />
+<TGConnectingPoint num="14" id="451" />
+<TGConnectingPoint num="15" id="452" />
+<TGConnectingPoint num="16" id="453" />
+<TGConnectingPoint num="17" id="454" />
+<TGConnectingPoint num="18" id="455" />
+<TGConnectingPoint num="19" id="456" />
+<TGConnectingPoint num="20" id="457" />
+<TGConnectingPoint num="21" id="458" />
+<TGConnectingPoint num="22" id="459" />
+<TGConnectingPoint num="23" id="460" />
<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="398" >
-<father id="441" num="0" />
-<cdparam x="445" y="269" />
+<SUBCOMPONENT type="1101" id="418" >
+<father id="461" num="0" />
+<cdparam x="413" y="213" />
<sizeparam width="109" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="141" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design3::T2" />
-<TGConnectingPoint num="0" id="390" />
-<TGConnectingPoint num="1" id="391" />
-<TGConnectingPoint num="2" id="392" />
-<TGConnectingPoint num="3" id="393" />
-<TGConnectingPoint num="4" id="394" />
-<TGConnectingPoint num="5" id="395" />
-<TGConnectingPoint num="6" id="396" />
-<TGConnectingPoint num="7" id="397" />
+<infoparam name="TGComponent" value="Design3::T1" />
+<TGConnectingPoint num="0" id="410" />
+<TGConnectingPoint num="1" id="411" />
+<TGConnectingPoint num="2" id="412" />
+<TGConnectingPoint num="3" id="413" />
+<TGConnectingPoint num="4" id="414" />
+<TGConnectingPoint num="5" id="415" />
+<TGConnectingPoint num="6" id="416" />
+<TGConnectingPoint num="7" id="417" />
<extraparam>
-<info value="Design3::T2" taskName="T2" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design3::T1" taskName="T1" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="407" >
-<father id="441" num="1" />
+<SUBCOMPONENT type="1101" id="427" >
+<father id="461" num="1" />
<cdparam x="405" y="170" />
<sizeparam width="109" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="141" minY="0" maxY="160" />
<infoparam name="TGComponent" value="Design3::T0" />
-<TGConnectingPoint num="0" id="399" />
-<TGConnectingPoint num="1" id="400" />
-<TGConnectingPoint num="2" id="401" />
-<TGConnectingPoint num="3" id="402" />
-<TGConnectingPoint num="4" id="403" />
-<TGConnectingPoint num="5" id="404" />
-<TGConnectingPoint num="6" id="405" />
-<TGConnectingPoint num="7" id="406" />
+<TGConnectingPoint num="0" id="419" />
+<TGConnectingPoint num="1" id="420" />
+<TGConnectingPoint num="2" id="421" />
+<TGConnectingPoint num="3" id="422" />
+<TGConnectingPoint num="4" id="423" />
+<TGConnectingPoint num="5" id="424" />
+<TGConnectingPoint num="6" id="425" />
+<TGConnectingPoint num="7" id="426" />
<extraparam>
<info value="Design3::T0" taskName="T0" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="416" >
-<father id="441" num="2" />
-<cdparam x="413" y="213" />
+<SUBCOMPONENT type="1101" id="436" >
+<father id="461" num="2" />
+<cdparam x="445" y="269" />
<sizeparam width="109" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="141" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design3::T1" />
-<TGConnectingPoint num="0" id="408" />
-<TGConnectingPoint num="1" id="409" />
-<TGConnectingPoint num="2" id="410" />
-<TGConnectingPoint num="3" id="411" />
-<TGConnectingPoint num="4" id="412" />
-<TGConnectingPoint num="5" id="413" />
-<TGConnectingPoint num="6" id="414" />
-<TGConnectingPoint num="7" id="415" />
+<infoparam name="TGComponent" value="Design3::T2" />
+<TGConnectingPoint num="0" id="428" />
+<TGConnectingPoint num="1" id="429" />
+<TGConnectingPoint num="2" id="430" />
+<TGConnectingPoint num="3" id="431" />
+<TGConnectingPoint num="4" id="432" />
+<TGConnectingPoint num="5" id="433" />
+<TGConnectingPoint num="6" id="434" />
+<TGConnectingPoint num="7" id="435" />
<extraparam>
-<info value="Design3::T1" taskName="T1" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design3::T2" taskName="T2" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -1819,45 +1819,45 @@
<Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
<DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="446" >
+<COMPONENT type="6003" id="466" >
<cdparam x="50" y="150" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
</COMPONENT>
-<COMPONENT type="6006" id="451" >
+<COMPONENT type="6006" id="471" >
<cdparam x="600" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Com. Patterns" />
-<TGConnectingPoint num="0" id="447" />
-<TGConnectingPoint num="1" id="448" />
-<TGConnectingPoint num="2" id="449" />
-<TGConnectingPoint num="3" id="450" />
+<TGConnectingPoint num="0" id="467" />
+<TGConnectingPoint num="1" id="468" />
+<TGConnectingPoint num="2" id="469" />
+<TGConnectingPoint num="3" id="470" />
</COMPONENT>
-<COMPONENT type="6002" id="459" >
+<COMPONENT type="6002" id="479" >
<cdparam x="546" y="298" />
<sizeparam width="304" height="125" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="453" />
-<TGConnectingPoint num="1" id="454" />
-<TGConnectingPoint num="2" id="455" />
-<TGConnectingPoint num="3" id="456" />
-<TGConnectingPoint num="4" id="457" />
-<TGConnectingPoint num="5" id="458" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="452" >
-<father id="459" num="0" />
+<TGConnectingPoint num="0" id="473" />
+<TGConnectingPoint num="1" id="474" />
+<TGConnectingPoint num="2" id="475" />
+<TGConnectingPoint num="3" id="476" />
+<TGConnectingPoint num="4" id="477" />
+<TGConnectingPoint num="5" id="478" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="472" >
+<father id="479" num="0" />
<cdparam x="551" y="338" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1865,31 +1865,31 @@
<infoparam name="value " value="Architecture" />
</SUBCOMPONENT>
-<COMPONENT type="6001" id="464" >
+<COMPONENT type="6001" id="484" >
<cdparam x="850" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Architecture" />
-<TGConnectingPoint num="0" id="460" />
-<TGConnectingPoint num="1" id="461" />
-<TGConnectingPoint num="2" id="462" />
-<TGConnectingPoint num="3" id="463" />
+<TGConnectingPoint num="0" id="480" />
+<TGConnectingPoint num="1" id="481" />
+<TGConnectingPoint num="2" id="482" />
+<TGConnectingPoint num="3" id="483" />
</COMPONENT>
-<COMPONENT type="6000" id="470" >
+<COMPONENT type="6000" id="490" >
<cdparam x="298" y="103" />
<sizeparam width="252" height="117" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<TGConnectingPoint num="3" id="469" />
+<TGConnectingPoint num="0" id="486" />
+<TGConnectingPoint num="1" id="487" />
+<TGConnectingPoint num="2" id="488" />
+<TGConnectingPoint num="3" id="489" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="465" >
-<father id="470" num="0" />
+<SUBCOMPONENT type="6005" id="485" >
+<father id="490" num="0" />
<cdparam x="303" y="143" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1897,31 +1897,31 @@
<infoparam name="value " value="Design3" />
</SUBCOMPONENT>
-<CONNECTOR type="6004" id="472" >
+<CONNECTOR type="6004" id="492" >
<cdparam x="950" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="471" />
-<P1 x="950" y="220" id="460" />
-<P2 x="758" y="298" id="454" />
+<TGConnectingPoint num="0" id="491" />
+<P1 x="950" y="220" id="480" />
+<P2 x="758" y="298" id="474" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="474" >
+<CONNECTOR type="6004" id="494" >
<cdparam x="700" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="473" />
-<P1 x="700" y="220" id="447" />
-<P2 x="698" y="298" id="455" />
+<TGConnectingPoint num="0" id="493" />
+<P1 x="700" y="220" id="467" />
+<P2 x="698" y="298" id="475" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="476" >
+<CONNECTOR type="6004" id="496" >
<cdparam x="450" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="475" />
-<P1 x="424" y="220" id="466" />
-<P2 x="637" y="298" id="453" />
+<TGConnectingPoint num="0" id="495" />
+<P1 x="424" y="220" id="486" />
+<P2 x="637" y="298" id="473" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1934,67 +1934,67 @@
<Modeling type="TML Component Design" nameTab="Design5" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="477" >
+<CONNECTOR type="126" id="497" >
<cdparam x="408" y="185" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="408" y="183" id="494" />
-<P2 x="631" y="177" id="481" />
+<P1 x="408" y="183" id="512" />
+<P2 x="631" y="177" id="499" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="478" >
+<CONNECTOR type="126" id="498" >
<cdparam x="408" y="226" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="408" y="225" id="492" />
-<P2 x="631" y="215" id="479" />
+<P1 x="408" y="225" id="514" />
+<P2 x="631" y="215" id="501" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="491" >
+<COMPONENT type="1202" id="511" >
<cdparam x="644" y="144" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="TMLComp_1" />
-<TGConnectingPoint num="0" id="483" />
-<TGConnectingPoint num="1" id="484" />
-<TGConnectingPoint num="2" id="485" />
-<TGConnectingPoint num="3" id="486" />
-<TGConnectingPoint num="4" id="487" />
-<TGConnectingPoint num="5" id="488" />
-<TGConnectingPoint num="6" id="489" />
-<TGConnectingPoint num="7" id="490" />
+<TGConnectingPoint num="0" id="503" />
+<TGConnectingPoint num="1" id="504" />
+<TGConnectingPoint num="2" id="505" />
+<TGConnectingPoint num="3" id="506" />
+<TGConnectingPoint num="4" id="507" />
+<TGConnectingPoint num="5" id="508" />
+<TGConnectingPoint num="6" id="509" />
+<TGConnectingPoint num="7" id="510" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="480" >
-<father id="491" num="0" />
-<cdparam x="631" y="202" />
+<SUBCOMPONENT type="1203" id="500" >
+<father id="511" num="0" />
+<cdparam x="631" y="164" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="479" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="499" />
<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="482" >
-<father id="491" num="1" />
-<cdparam x="631" y="164" />
+<SUBCOMPONENT type="1203" id="502" >
+<father id="511" num="1" />
+<cdparam x="631" y="202" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evt" />
-<TGConnectingPoint num="0" id="481" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="501" />
<extraparam>
-<Prop commName="evt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2002,51 +2002,51 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="504" >
+<COMPONENT type="1202" id="524" >
<cdparam x="195" y="133" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="TMLComp_0" />
-<TGConnectingPoint num="0" id="496" />
-<TGConnectingPoint num="1" id="497" />
-<TGConnectingPoint num="2" id="498" />
-<TGConnectingPoint num="3" id="499" />
-<TGConnectingPoint num="4" id="500" />
-<TGConnectingPoint num="5" id="501" />
-<TGConnectingPoint num="6" id="502" />
-<TGConnectingPoint num="7" id="503" />
+<TGConnectingPoint num="0" id="516" />
+<TGConnectingPoint num="1" id="517" />
+<TGConnectingPoint num="2" id="518" />
+<TGConnectingPoint num="3" id="519" />
+<TGConnectingPoint num="4" id="520" />
+<TGConnectingPoint num="5" id="521" />
+<TGConnectingPoint num="6" id="522" />
+<TGConnectingPoint num="7" id="523" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="493" >
-<father id="504" num="0" />
-<cdparam x="382" y="212" />
+<SUBCOMPONENT type="1203" id="513" >
+<father id="524" num="0" />
+<cdparam x="382" y="170" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="492" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="512" />
<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="495" >
-<father id="504" num="1" />
-<cdparam x="382" y="170" />
+<SUBCOMPONENT type="1203" id="515" >
+<father id="524" num="1" />
+<cdparam x="382" y="212" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evt" />
-<TGConnectingPoint num="0" id="494" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="514" />
<extraparam>
-<Prop commName="evt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2058,102 +2058,102 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="506" >
+<COMPONENT type="1001" id="526" >
<cdparam x="410" y="154" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="505" />
+<TGConnectingPoint num="0" id="525" />
</COMPONENT>
-<COMPONENT type="1009" id="509" >
+<COMPONENT type="1009" id="529" >
<cdparam x="380" y="100" />
<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="comm(1) " />
-<TGConnectingPoint num="0" id="507" />
-<TGConnectingPoint num="1" id="508" />
+<TGConnectingPoint num="0" id="527" />
+<TGConnectingPoint num="1" id="528" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="511" >
+<COMPONENT type="1000" id="531" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="510" />
+<TGConnectingPoint num="0" id="530" />
</COMPONENT>
-<CONNECTOR type="115" id="512" >
+<CONNECTOR type="115" id="532" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="510" />
-<P2 x="414" y="95" id="507" />
+<P1 x="407" y="70" id="530" />
+<P2 x="414" y="95" id="527" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="513" >
+<CONNECTOR type="115" id="533" >
<cdparam x="414" y="125" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="125" id="508" />
-<P2 x="420" y="149" id="505" />
+<P1 x="414" y="125" id="528" />
+<P2 x="420" y="149" id="525" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="515" >
+<COMPONENT type="1001" id="535" >
<cdparam x="423" y="193" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="514" />
+<TGConnectingPoint num="0" id="534" />
</COMPONENT>
-<COMPONENT type="1006" id="518" >
+<COMPONENT type="1006" id="538" >
<cdparam x="402" y="119" />
<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="comm(1)" />
-<TGConnectingPoint num="0" id="516" />
-<TGConnectingPoint num="1" id="517" />
+<TGConnectingPoint num="0" id="536" />
+<TGConnectingPoint num="1" id="537" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="520" >
+<COMPONENT type="1000" id="540" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="519" />
+<TGConnectingPoint num="0" id="539" />
</COMPONENT>
-<CONNECTOR type="115" id="521" >
+<CONNECTOR type="115" id="541" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="519" />
-<P2 x="434" y="114" id="516" />
+<P1 x="407" y="70" id="539" />
+<P2 x="434" y="114" id="536" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="522" >
+<CONNECTOR type="115" id="542" >
<cdparam x="434" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="434" y="144" id="517" />
-<P2 x="433" y="188" id="514" />
+<P1 x="434" y="144" id="537" />
+<P2 x="433" y="188" id="534" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 1e51458875..ac8e18d0a9 100644
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -2224,8 +2224,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
frame.setTitle("TTool: " + file.getAbsolutePath());
makeLotosFile();
+ if (gtm.getCheckingErrors().size() > 0) {
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+ }
+
} catch (MalformedModelingException mme) {
- JOptionPane.showMessageDialog(frame, "Modeling could not be merged (unsupported selected file) ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
}
dtree.forceUpdate();
}
@@ -2292,9 +2296,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//gtm.saveOperation(tcdp);
frame.setTitle("TTool: " + file.getAbsolutePath());
makeLotosFile();
-
+
+ if (gtm.getCheckingErrors().size() > 0) {
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+
+ }
} catch (MalformedModelingException mme) {
- JOptionPane.showMessageDialog(frame, "Modeling could not be loaded (unsupported file) ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
frame.setTitle("TToolt: unamed project");
}
gtm.enableUndo(true);
@@ -2347,9 +2355,14 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//gtm.saveOperation(tcdp);
frame.setTitle("TTool: " + file.getAbsolutePath());
makeLotosFile();
+
+ if (gtm.getCheckingErrors().size() > 0) {
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+ }
+
} catch (MalformedModelingException mme) {
- JOptionPane.showMessageDialog(frame, "Modeling could not be loaded (unsupported file) ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
frame.setTitle("TTool: unamed project");
}
dtree.forceUpdate();
--
GitLab