diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath
deleted file mode 100644
index 94dc9695ac8543d6cffa1b8ba7faeaebae8d134c..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry combineaccessrules="false" kind="src" path="/src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore
deleted file mode 100644
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project
deleted file mode 100644
index 9bfeeb70e84945f8d76ceac296f407447bd6594a..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>fr.tpt.ttool.tests.diplodocus.simulator</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3a21537071bf4118b9e1ee864cb4bc258aa48211..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml
deleted file mode 100644
index 689eaea3a0de4cdd37f989c3c44150a18ce95a32..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml
+++ /dev/null
@@ -1,697 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<TURTLEGMODELING version="0.98-beta4">
-
-<Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
-<DiplodocusMethodologyDiagramPanel name="Test_CodeGen_HwAccelerator" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="5" >
-<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="1" />
-<TGConnectingPoint num="1" id="2" />
-<TGConnectingPoint num="2" id="3" />
-<TGConnectingPoint num="3" id="4" />
-</COMPONENT>
-
-<COMPONENT type="6006" id="10" >
-<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="6" />
-<TGConnectingPoint num="1" id="7" />
-<TGConnectingPoint num="2" id="8" />
-<TGConnectingPoint num="3" id="9" />
-</COMPONENT>
-
-<COMPONENT type="6002" id="17" >
-<cdparam x="600" y="300" />
-<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="Mapping" />
-<TGConnectingPoint num="0" id="11" />
-<TGConnectingPoint num="1" id="12" />
-<TGConnectingPoint num="2" id="13" />
-<TGConnectingPoint num="3" id="14" />
-<TGConnectingPoint num="4" id="15" />
-<TGConnectingPoint num="5" id="16" />
-</COMPONENT>
-
-<COMPONENT type="6001" id="22" >
-<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="18" />
-<TGConnectingPoint num="1" id="19" />
-<TGConnectingPoint num="2" id="20" />
-<TGConnectingPoint num="3" id="21" />
-</COMPONENT>
-
-<COMPONENT type="6000" id="27" >
-<cdparam x="350" 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="Application" />
-<TGConnectingPoint num="0" id="23" />
-<TGConnectingPoint num="1" id="24" />
-<TGConnectingPoint num="2" id="25" />
-<TGConnectingPoint num="3" id="26" />
-</COMPONENT>
-
-<CONNECTOR type="6004" id="29" >
-<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="28" />
-<P1 x="950" y="220" id="18" />
-<P2 x="740" y="300" id="12" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="31" >
-<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="30" />
-<P1 x="700" y="220" id="6" />
-<P2 x="700" y="300" id="13" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="33" >
-<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="32" />
-<P1 x="450" y="220" id="23" />
-<P2 x="660" y="300" id="11" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</DiplodocusMethodologyDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="TML Component Design" nameTab="DIPLODOCUS_C_Design" >
-<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="34" >
-<cdparam x="502" y="142" />
-<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="489" y="176" id="42" />
-<P2 x="536" y="192" id="56" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="35" >
-<cdparam x="341" y="145" />
-<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="368" y="150" id="76" />
-<P2 x="489" y="150" id="37" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="36" >
-<cdparam x="306" y="221" />
-<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="314" y="181" id="95" />
-<P2 x="368" y="176" id="81" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1200" id="75" >
-<cdparam x="489" y="84" />
-<sizeparam width="205" height="177" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Composite component" value="MyName" />
-<TGConnectingPoint num="0" id="67" />
-<TGConnectingPoint num="1" id="68" />
-<TGConnectingPoint num="2" id="69" />
-<TGConnectingPoint num="3" id="70" />
-<TGConnectingPoint num="4" id="71" />
-<TGConnectingPoint num="5" id="72" />
-<TGConnectingPoint num="6" id="73" />
-<TGConnectingPoint num="7" id="74" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1201" id="55" >
-<father id="75" num="0" />
-<cdparam x="476" y="150" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="192" minY="-13" maxY="164" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="37" />
-<TGConnectingPoint num="1" id="38" />
-<TGConnectingPoint num="2" id="39" />
-<TGConnectingPoint num="3" id="40" />
-<TGConnectingPoint num="4" id="41" />
-<TGConnectingPoint num="5" id="42" />
-<TGConnectingPoint num="6" id="43" />
-<TGConnectingPoint num="7" id="44" />
-<TGConnectingPoint num="8" id="45" />
-<TGConnectingPoint num="9" id="46" />
-<TGConnectingPoint num="10" id="47" />
-<TGConnectingPoint num="11" id="48" />
-<TGConnectingPoint num="12" id="49" />
-<TGConnectingPoint num="13" id="50" />
-<TGConnectingPoint num="14" id="51" />
-<TGConnectingPoint num="15" id="52" />
-<TGConnectingPoint num="16" id="53" />
-<TGConnectingPoint num="17" id="54" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="66" >
-<father id="75" num="1" />
-<cdparam x="536" y="145" />
-<sizeparam width="141" height="98" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="64" minY="0" maxY="79" />
-<infoparam name="Primitive component" value="TMLComp_1" />
-<TGConnectingPoint num="0" id="58" />
-<TGConnectingPoint num="1" id="59" />
-<TGConnectingPoint num="2" id="60" />
-<TGConnectingPoint num="3" id="61" />
-<TGConnectingPoint num="4" id="62" />
-<TGConnectingPoint num="5" id="63" />
-<TGConnectingPoint num="6" id="64" />
-<TGConnectingPoint num="7" id="65" />
-<extraparam>
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="57" >
-<father id="66" num="0" />
-<cdparam x="523" y="192" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="128" minY="-13" maxY="85" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="56" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1200" id="114" >
-<cdparam x="128" y="94" />
-<sizeparam width="240" height="156" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Composite component" value="MyName" />
-<TGConnectingPoint num="0" id="106" />
-<TGConnectingPoint num="1" id="107" />
-<TGConnectingPoint num="2" id="108" />
-<TGConnectingPoint num="3" id="109" />
-<TGConnectingPoint num="4" id="110" />
-<TGConnectingPoint num="5" id="111" />
-<TGConnectingPoint num="6" id="112" />
-<TGConnectingPoint num="7" id="113" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1201" id="94" >
-<father id="114" num="0" />
-<cdparam x="355" y="150" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="143" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="76" />
-<TGConnectingPoint num="1" id="77" />
-<TGConnectingPoint num="2" id="78" />
-<TGConnectingPoint num="3" id="79" />
-<TGConnectingPoint num="4" id="80" />
-<TGConnectingPoint num="5" id="81" />
-<TGConnectingPoint num="6" id="82" />
-<TGConnectingPoint num="7" id="83" />
-<TGConnectingPoint num="8" id="84" />
-<TGConnectingPoint num="9" id="85" />
-<TGConnectingPoint num="10" id="86" />
-<TGConnectingPoint num="11" id="87" />
-<TGConnectingPoint num="12" id="88" />
-<TGConnectingPoint num="13" id="89" />
-<TGConnectingPoint num="14" id="90" />
-<TGConnectingPoint num="15" id="91" />
-<TGConnectingPoint num="16" id="92" />
-<TGConnectingPoint num="17" id="93" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="105" >
-<father id="114" num="1" />
-<cdparam x="145" y="142" />
-<sizeparam width="169" height="89" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="71" minY="0" maxY="67" />
-<infoparam name="Primitive component" value="TMLComp_0" />
-<TGConnectingPoint num="0" id="97" />
-<TGConnectingPoint num="1" id="98" />
-<TGConnectingPoint num="2" id="99" />
-<TGConnectingPoint num="3" id="100" />
-<TGConnectingPoint num="4" id="101" />
-<TGConnectingPoint num="5" id="102" />
-<TGConnectingPoint num="6" id="103" />
-<TGConnectingPoint num="7" id="104" />
-<extraparam>
-<Attribute access="2" id="cpt" value="0" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="96" >
-<father id="105" num="0" />
-<cdparam x="301" y="181" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="76" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="95" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1000" id="116" >
-<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="115" />
-</COMPONENT>
-
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="118" >
-<cdparam x="599" y="396" />
-<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="117" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="120" >
-<cdparam x="411" y="486" />
-<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="119" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="123" >
-<cdparam x="375" y="424" />
-<sizeparam width="81" 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(100)" />
-<TGConnectingPoint num="0" id="121" />
-<TGConnectingPoint num="1" id="122" />
-<extraparam>
-<Data channelName="comm" nbOfSamples="100" secPattern="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1013" id="127" >
-<cdparam x="602" y="335" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="124" >
-<father id="127" num="0" />
-<cdparam x="617" y="355" />
-<sizeparam width="16" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="10" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1020" id="131" >
-<cdparam x="368" y="303" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="128" />
-<TGConnectingPoint num="1" id="129" />
-<TGConnectingPoint num="2" id="130" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="134" >
-<cdparam x="368" y="219" />
-<sizeparam width="94" 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="action state" value="cpt = cpt + 1" />
-<TGConnectingPoint num="0" id="132" />
-<TGConnectingPoint num="1" id="133" />
-</COMPONENT>
-
-<COMPONENT type="1013" id="138" >
-<cdparam x="403" y="124" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="136" />
-<TGConnectingPoint num="1" id="137" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="135" >
-<father id="138" num="0" />
-<cdparam x="418" y="144" />
-<sizeparam width="24" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="100" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="140" >
-<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="139" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="141" >
-<cdparam x="417" y="328" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="417" y="328" id="130" />
-<P2 x="415" y="419" id="121" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="142" >
-<cdparam x="466" y="317" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="466" y="317" id="129" />
-<P2 x="607" y="330" id="125" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="143" >
-<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="139" />
-<P2 x="408" y="119" id="136" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="144" >
-<cdparam x="408" y="159" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="408" y="159" id="137" />
-<P2 x="415" y="214" id="132" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="145" >
-<cdparam x="415" y="244" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="415" y="244" id="133" />
-<P2 x="417" y="298" id="128" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="146" >
-<cdparam x="415" y="449" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="415" y="449" id="122" />
-<P2 x="421" y="481" id="119" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="147" >
-<cdparam x="607" y="370" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="607" y="370" id="126" />
-<P2 x="609" y="391" id="117" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-</Modeling>
-
-
-
-
-<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="1105" id="172" >
-<cdparam x="678" y="120" />
-<sizeparam width="128" height="76" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="148" />
-<TGConnectingPoint num="1" id="149" />
-<TGConnectingPoint num="2" id="150" />
-<TGConnectingPoint num="3" id="151" />
-<TGConnectingPoint num="4" id="152" />
-<TGConnectingPoint num="5" id="153" />
-<TGConnectingPoint num="6" id="154" />
-<TGConnectingPoint num="7" id="155" />
-<TGConnectingPoint num="8" id="156" />
-<TGConnectingPoint num="9" id="157" />
-<TGConnectingPoint num="10" id="158" />
-<TGConnectingPoint num="11" id="159" />
-<TGConnectingPoint num="12" id="160" />
-<TGConnectingPoint num="13" id="161" />
-<TGConnectingPoint num="14" id="162" />
-<TGConnectingPoint num="15" id="163" />
-<TGConnectingPoint num="16" id="164" />
-<TGConnectingPoint num="17" id="165" />
-<TGConnectingPoint num="18" id="166" />
-<TGConnectingPoint num="19" id="167" />
-<TGConnectingPoint num="20" id="168" />
-<TGConnectingPoint num="21" id="169" />
-<TGConnectingPoint num="22" id="170" />
-<TGConnectingPoint num="23" id="171" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1100" id="206" >
-<cdparam x="232" y="511" />
-<sizeparam width="302" height="110" 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="182" />
-<TGConnectingPoint num="1" id="183" />
-<TGConnectingPoint num="2" id="184" />
-<TGConnectingPoint num="3" id="185" />
-<TGConnectingPoint num="4" id="186" />
-<TGConnectingPoint num="5" id="187" />
-<TGConnectingPoint num="6" id="188" />
-<TGConnectingPoint num="7" id="189" />
-<TGConnectingPoint num="8" id="190" />
-<TGConnectingPoint num="9" id="191" />
-<TGConnectingPoint num="10" id="192" />
-<TGConnectingPoint num="11" id="193" />
-<TGConnectingPoint num="12" id="194" />
-<TGConnectingPoint num="13" id="195" />
-<TGConnectingPoint num="14" id="196" />
-<TGConnectingPoint num="15" id="197" />
-<TGConnectingPoint num="16" id="198" />
-<TGConnectingPoint num="17" id="199" />
-<TGConnectingPoint num="18" id="200" />
-<TGConnectingPoint num="19" id="201" />
-<TGConnectingPoint num="20" id="202" />
-<TGConnectingPoint num="21" id="203" />
-<TGConnectingPoint num="22" id="204" />
-<TGConnectingPoint num="23" id="205" />
-<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="181" >
-<father id="206" num="0" />
-<cdparam x="254" y="564" />
-<sizeparam width="256" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="46" minY="0" maxY="70" />
-<infoparam name="TGComponent" value="DIPLODOCUS_C_Design::TMLComp_1" />
-<TGConnectingPoint num="0" id="173" />
-<TGConnectingPoint num="1" id="174" />
-<TGConnectingPoint num="2" id="175" />
-<TGConnectingPoint num="3" id="176" />
-<TGConnectingPoint num="4" id="177" />
-<TGConnectingPoint num="5" id="178" />
-<TGConnectingPoint num="6" id="179" />
-<TGConnectingPoint num="7" id="180" />
-<extraparam>
-<info value="DIPLODOCUS_C_Design::TMLComp_1" taskName="TMLComp_1" referenceTaskName="DIPLODOCUS_C_Design" priority="0" operation="TMLComp_1" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1102" id="231" >
-<cdparam x="449" y="311" />
-<sizeparam width="162" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="207" />
-<TGConnectingPoint num="1" id="208" />
-<TGConnectingPoint num="2" id="209" />
-<TGConnectingPoint num="3" id="210" />
-<TGConnectingPoint num="4" id="211" />
-<TGConnectingPoint num="5" id="212" />
-<TGConnectingPoint num="6" id="213" />
-<TGConnectingPoint num="7" id="214" />
-<TGConnectingPoint num="8" id="215" />
-<TGConnectingPoint num="9" id="216" />
-<TGConnectingPoint num="10" id="217" />
-<TGConnectingPoint num="11" id="218" />
-<TGConnectingPoint num="12" id="219" />
-<TGConnectingPoint num="13" id="220" />
-<TGConnectingPoint num="14" id="221" />
-<TGConnectingPoint num="15" id="222" />
-<TGConnectingPoint num="16" id="223" />
-<TGConnectingPoint num="17" id="224" />
-<TGConnectingPoint num="18" id="225" />
-<TGConnectingPoint num="19" id="226" />
-<TGConnectingPoint num="20" id="227" />
-<TGConnectingPoint num="21" id="228" />
-<TGConnectingPoint num="22" id="229" />
-<TGConnectingPoint num="23" id="230" />
-<extraparam>
-<info stereotype="BUS" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1104" id="265" >
-<cdparam x="199" y="80" />
-<sizeparam width="278" height="114" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="HWA" value="name" />
-<TGConnectingPoint num="0" id="241" />
-<TGConnectingPoint num="1" id="242" />
-<TGConnectingPoint num="2" id="243" />
-<TGConnectingPoint num="3" id="244" />
-<TGConnectingPoint num="4" id="245" />
-<TGConnectingPoint num="5" id="246" />
-<TGConnectingPoint num="6" id="247" />
-<TGConnectingPoint num="7" id="248" />
-<TGConnectingPoint num="8" id="249" />
-<TGConnectingPoint num="9" id="250" />
-<TGConnectingPoint num="10" id="251" />
-<TGConnectingPoint num="11" id="252" />
-<TGConnectingPoint num="12" id="253" />
-<TGConnectingPoint num="13" id="254" />
-<TGConnectingPoint num="14" id="255" />
-<TGConnectingPoint num="15" id="256" />
-<TGConnectingPoint num="16" id="257" />
-<TGConnectingPoint num="17" id="258" />
-<TGConnectingPoint num="18" id="259" />
-<TGConnectingPoint num="19" id="260" />
-<TGConnectingPoint num="20" id="261" />
-<TGConnectingPoint num="21" id="262" />
-<TGConnectingPoint num="22" id="263" />
-<TGConnectingPoint num="23" id="264" />
-<extraparam>
-<info stereotype="HWA" nodeName="HWA" />
-<attributes byteDataSize="4" execiTime="1" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="240" >
-<father id="265" num="0" />
-<cdparam x="209" y="124" />
-<sizeparam width="256" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="22" minY="0" maxY="74" />
-<infoparam name="TGComponent" value="DIPLODOCUS_C_Design::TMLComp_0" />
-<TGConnectingPoint num="0" id="232" />
-<TGConnectingPoint num="1" id="233" />
-<TGConnectingPoint num="2" id="234" />
-<TGConnectingPoint num="3" id="235" />
-<TGConnectingPoint num="4" id="236" />
-<TGConnectingPoint num="5" id="237" />
-<TGConnectingPoint num="6" id="238" />
-<TGConnectingPoint num="7" id="239" />
-<extraparam>
-<info value="DIPLODOCUS_C_Design::TMLComp_0" taskName="TMLComp_0" referenceTaskName="DIPLODOCUS_C_Design" priority="0" operation="TMLComp_1" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="266" >
-<cdparam x="650" y="170" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="678" y="196" id="153" />
-<P2 x="611" y="311" id="209" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="267" >
-<cdparam x="383" y="511" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="383" y="511" id="183" />
-<P2 x="449" y="361" id="212" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="268" >
-<cdparam x="338" y="194" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="338" y="194" id="247" />
-<P2 x="449" y="311" id="207" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml
deleted file mode 100755
index 09177251ffa6da9b7a20715f97d42b43e635f6f2..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml
+++ /dev/null
@@ -1,615 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<TURTLEGMODELING version="0.98-beta4">
-
-<Modeling type="TML Component Design" nameTab="DIPLODOCUS_C_Design" >
-<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="1" >
-<cdparam x="403" y="225" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="390" y="212" id="13" />
-<P2 x="496" y="216" id="2" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1202" id="12" >
-<cdparam x="496" y="143" />
-<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="4" />
-<TGConnectingPoint num="1" id="5" />
-<TGConnectingPoint num="2" id="6" />
-<TGConnectingPoint num="3" id="7" />
-<TGConnectingPoint num="4" id="8" />
-<TGConnectingPoint num="5" id="9" />
-<TGConnectingPoint num="6" id="10" />
-<TGConnectingPoint num="7" id="11" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="3" >
-<father id="12" num="0" />
-<cdparam x="483" y="216" />
-<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="2" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="23" >
-<cdparam x="190" y="139" />
-<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="15" />
-<TGConnectingPoint num="1" id="16" />
-<TGConnectingPoint num="2" id="17" />
-<TGConnectingPoint num="3" id="18" />
-<TGConnectingPoint num="4" id="19" />
-<TGConnectingPoint num="5" id="20" />
-<TGConnectingPoint num="6" id="21" />
-<TGConnectingPoint num="7" id="22" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="14" >
-<father id="23" num="0" />
-<cdparam x="377" 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="Channel comm" />
-<TGConnectingPoint num="0" id="13" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="25" >
-<cdparam x="417" y="155" />
-<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="24" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="28" >
-<cdparam x="382" 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="26" />
-<TGConnectingPoint num="1" id="27" />
-<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="30" >
-<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="29" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="31" >
-<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="29" />
-<P2 x="416" y="95" id="26" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="32" >
-<cdparam x="416" 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="416" y="125" id="27" />
-<P2 x="427" y="150" id="24" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="34" >
-<cdparam x="402" y="166" />
-<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="33" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="37" >
-<cdparam x="373" y="113" />
-<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="35" />
-<TGConnectingPoint num="1" id="36" />
-<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="39" >
-<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="38" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="40" >
-<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="38" />
-<P2 x="405" y="108" id="35" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="41" >
-<cdparam x="405" 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="405" y="138" id="36" />
-<P2 x="412" y="161" id="33" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-</Modeling>
-
-
-
-
-<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" >
-<CONNECTOR type="125" id="318" >
-<cdparam x="843" y="527" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="843" y="527" id="295" />
-<P2 x="840" y="466" id="48" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1104" id="293" >
-<cdparam x="743" y="527" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="HWA0" value="name" />
-<TGConnectingPoint num="0" id="294" />
-<TGConnectingPoint num="1" id="295" />
-<TGConnectingPoint num="2" id="296" />
-<TGConnectingPoint num="3" id="297" />
-<TGConnectingPoint num="4" id="298" />
-<TGConnectingPoint num="5" id="299" />
-<TGConnectingPoint num="6" id="300" />
-<TGConnectingPoint num="7" id="301" />
-<TGConnectingPoint num="8" id="302" />
-<TGConnectingPoint num="9" id="303" />
-<TGConnectingPoint num="10" id="304" />
-<TGConnectingPoint num="11" id="305" />
-<TGConnectingPoint num="12" id="306" />
-<TGConnectingPoint num="13" id="307" />
-<TGConnectingPoint num="14" id="308" />
-<TGConnectingPoint num="15" id="309" />
-<TGConnectingPoint num="16" id="310" />
-<TGConnectingPoint num="17" id="311" />
-<TGConnectingPoint num="18" id="312" />
-<TGConnectingPoint num="19" id="313" />
-<TGConnectingPoint num="20" id="314" />
-<TGConnectingPoint num="21" id="315" />
-<TGConnectingPoint num="22" id="316" />
-<TGConnectingPoint num="23" id="317" />
-<extraparam>
-<info stereotype="HWA" nodeName="HWA0" />
-<attributes byteDataSize="4" execiTime="1" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="292" >
-<cdparam x="281" y="520" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="281" y="520" id="269" />
-<P2 x="241" y="454" id="98" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1107" id="267" >
-<cdparam x="181" y="520" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="DMA0" value="name" />
-<TGConnectingPoint num="0" id="268" />
-<TGConnectingPoint num="1" id="269" />
-<TGConnectingPoint num="2" id="270" />
-<TGConnectingPoint num="3" id="271" />
-<TGConnectingPoint num="4" id="272" />
-<TGConnectingPoint num="5" id="273" />
-<TGConnectingPoint num="6" id="274" />
-<TGConnectingPoint num="7" id="275" />
-<TGConnectingPoint num="8" id="276" />
-<TGConnectingPoint num="9" id="277" />
-<TGConnectingPoint num="10" id="278" />
-<TGConnectingPoint num="11" id="279" />
-<TGConnectingPoint num="12" id="280" />
-<TGConnectingPoint num="13" id="281" />
-<TGConnectingPoint num="14" id="282" />
-<TGConnectingPoint num="15" id="283" />
-<TGConnectingPoint num="16" id="284" />
-<TGConnectingPoint num="17" id="285" />
-<TGConnectingPoint num="18" id="286" />
-<TGConnectingPoint num="19" id="287" />
-<TGConnectingPoint num="20" id="288" />
-<TGConnectingPoint num="21" id="289" />
-<TGConnectingPoint num="22" id="290" />
-<TGConnectingPoint num="23" id="291" />
-<extraparam>
-<info stereotype="DMA" nodeName="DMA0" />
-<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="241" >
-<cdparam x="506" y="288" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="506" y="288" id="231" />
-<P2 x="366" y="404" id="94" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1105" id="216" >
-<cdparam x="456" y="88" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="217" />
-<TGConnectingPoint num="1" id="218" />
-<TGConnectingPoint num="2" id="219" />
-<TGConnectingPoint num="3" id="220" />
-<TGConnectingPoint num="4" id="221" />
-<TGConnectingPoint num="5" id="222" />
-<TGConnectingPoint num="6" id="223" />
-<TGConnectingPoint num="7" id="224" />
-<TGConnectingPoint num="8" id="225" />
-<TGConnectingPoint num="9" id="226" />
-<TGConnectingPoint num="10" id="227" />
-<TGConnectingPoint num="11" id="228" />
-<TGConnectingPoint num="12" id="229" />
-<TGConnectingPoint num="13" id="230" />
-<TGConnectingPoint num="14" id="231" />
-<TGConnectingPoint num="15" id="232" />
-<TGConnectingPoint num="16" id="233" />
-<TGConnectingPoint num="17" id="234" />
-<TGConnectingPoint num="18" id="235" />
-<TGConnectingPoint num="19" id="236" />
-<TGConnectingPoint num="20" id="237" />
-<TGConnectingPoint num="21" id="238" />
-<TGConnectingPoint num="22" id="239" />
-<TGConnectingPoint num="23" id="240" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="66" >
-<cdparam x="715" y="416" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="42" />
-<TGConnectingPoint num="1" id="43" />
-<TGConnectingPoint num="2" id="44" />
-<TGConnectingPoint num="3" id="45" />
-<TGConnectingPoint num="4" id="46" />
-<TGConnectingPoint num="5" id="47" />
-<TGConnectingPoint num="6" id="48" />
-<TGConnectingPoint num="7" id="49" />
-<TGConnectingPoint num="8" id="50" />
-<TGConnectingPoint num="9" id="51" />
-<TGConnectingPoint num="10" id="52" />
-<TGConnectingPoint num="11" id="53" />
-<TGConnectingPoint num="12" id="54" />
-<TGConnectingPoint num="13" id="55" />
-<TGConnectingPoint num="14" id="56" />
-<TGConnectingPoint num="15" id="57" />
-<TGConnectingPoint num="16" id="58" />
-<TGConnectingPoint num="17" id="59" />
-<TGConnectingPoint num="18" id="60" />
-<TGConnectingPoint num="19" id="61" />
-<TGConnectingPoint num="20" id="62" />
-<TGConnectingPoint num="21" id="63" />
-<TGConnectingPoint num="22" id="64" />
-<TGConnectingPoint num="23" id="65" />
-<extraparam>
-<info stereotype="BUS" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1106" id="91" >
-<cdparam x="420" y="391" />
-<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bridge0" value="name" />
-<TGConnectingPoint num="0" id="67" />
-<TGConnectingPoint num="1" id="68" />
-<TGConnectingPoint num="2" id="69" />
-<TGConnectingPoint num="3" id="70" />
-<TGConnectingPoint num="4" id="71" />
-<TGConnectingPoint num="5" id="72" />
-<TGConnectingPoint num="6" id="73" />
-<TGConnectingPoint num="7" id="74" />
-<TGConnectingPoint num="8" id="75" />
-<TGConnectingPoint num="9" id="76" />
-<TGConnectingPoint num="10" id="77" />
-<TGConnectingPoint num="11" id="78" />
-<TGConnectingPoint num="12" id="79" />
-<TGConnectingPoint num="13" id="80" />
-<TGConnectingPoint num="14" id="81" />
-<TGConnectingPoint num="15" id="82" />
-<TGConnectingPoint num="16" id="83" />
-<TGConnectingPoint num="17" id="84" />
-<TGConnectingPoint num="18" id="85" />
-<TGConnectingPoint num="19" id="86" />
-<TGConnectingPoint num="20" id="87" />
-<TGConnectingPoint num="21" id="88" />
-<TGConnectingPoint num="22" id="89" />
-<TGConnectingPoint num="23" id="90" />
-<extraparam>
-<info stereotype="BRIDGE" nodeName="Bridge0" />
-<attributes bufferByteDataSize="4" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="116" >
-<cdparam x="116" y="404" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus" value="name" />
-<TGConnectingPoint num="0" id="92" />
-<TGConnectingPoint num="1" id="93" />
-<TGConnectingPoint num="2" id="94" />
-<TGConnectingPoint num="3" id="95" />
-<TGConnectingPoint num="4" id="96" />
-<TGConnectingPoint num="5" id="97" />
-<TGConnectingPoint num="6" id="98" />
-<TGConnectingPoint num="7" id="99" />
-<TGConnectingPoint num="8" id="100" />
-<TGConnectingPoint num="9" id="101" />
-<TGConnectingPoint num="10" id="102" />
-<TGConnectingPoint num="11" id="103" />
-<TGConnectingPoint num="12" id="104" />
-<TGConnectingPoint num="13" id="105" />
-<TGConnectingPoint num="14" id="106" />
-<TGConnectingPoint num="15" id="107" />
-<TGConnectingPoint num="16" id="108" />
-<TGConnectingPoint num="17" id="109" />
-<TGConnectingPoint num="18" id="110" />
-<TGConnectingPoint num="19" id="111" />
-<TGConnectingPoint num="20" id="112" />
-<TGConnectingPoint num="21" id="113" />
-<TGConnectingPoint num="22" id="114" />
-<TGConnectingPoint num="23" id="115" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1100" id="150" >
-<cdparam x="748" y="102" />
-<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="126" />
-<TGConnectingPoint num="1" id="127" />
-<TGConnectingPoint num="2" id="128" />
-<TGConnectingPoint num="3" id="129" />
-<TGConnectingPoint num="4" id="130" />
-<TGConnectingPoint num="5" id="131" />
-<TGConnectingPoint num="6" id="132" />
-<TGConnectingPoint num="7" id="133" />
-<TGConnectingPoint num="8" id="134" />
-<TGConnectingPoint num="9" id="135" />
-<TGConnectingPoint num="10" id="136" />
-<TGConnectingPoint num="11" id="137" />
-<TGConnectingPoint num="12" id="138" />
-<TGConnectingPoint num="13" id="139" />
-<TGConnectingPoint num="14" id="140" />
-<TGConnectingPoint num="15" id="141" />
-<TGConnectingPoint num="16" id="142" />
-<TGConnectingPoint num="17" id="143" />
-<TGConnectingPoint num="18" id="144" />
-<TGConnectingPoint num="19" id="145" />
-<TGConnectingPoint num="20" id="146" />
-<TGConnectingPoint num="21" id="147" />
-<TGConnectingPoint num="22" id="148" />
-<TGConnectingPoint num="23" id="149" />
-<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" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="125" >
-<father id="150" num="0" />
-<cdparam x="742" y="180" />
-<sizeparam width="256" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="-6" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="DIPLODOCUS_C_Design::TMLComp_0" />
-<TGConnectingPoint num="0" id="117" />
-<TGConnectingPoint num="1" id="118" />
-<TGConnectingPoint num="2" id="119" />
-<TGConnectingPoint num="3" id="120" />
-<TGConnectingPoint num="4" id="121" />
-<TGConnectingPoint num="5" id="122" />
-<TGConnectingPoint num="6" id="123" />
-<TGConnectingPoint num="7" id="124" />
-<extraparam>
-<info value="DIPLODOCUS_C_Design::TMLComp_0" taskName="TMLComp_0" referenceTaskName="DIPLODOCUS_C_Design" priority="0" HALMappedOperationName="No HAL file found" HALUnitName="EMPTY" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="184" >
-<cdparam x="94" y="93" />
-<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="CPU" value="name" />
-<TGConnectingPoint num="0" id="160" />
-<TGConnectingPoint num="1" id="161" />
-<TGConnectingPoint num="2" id="162" />
-<TGConnectingPoint num="3" id="163" />
-<TGConnectingPoint num="4" id="164" />
-<TGConnectingPoint num="5" id="165" />
-<TGConnectingPoint num="6" id="166" />
-<TGConnectingPoint num="7" id="167" />
-<TGConnectingPoint num="8" id="168" />
-<TGConnectingPoint num="9" id="169" />
-<TGConnectingPoint num="10" id="170" />
-<TGConnectingPoint num="11" id="171" />
-<TGConnectingPoint num="12" id="172" />
-<TGConnectingPoint num="13" id="173" />
-<TGConnectingPoint num="14" id="174" />
-<TGConnectingPoint num="15" id="175" />
-<TGConnectingPoint num="16" id="176" />
-<TGConnectingPoint num="17" id="177" />
-<TGConnectingPoint num="18" id="178" />
-<TGConnectingPoint num="19" id="179" />
-<TGConnectingPoint num="20" id="180" />
-<TGConnectingPoint num="21" id="181" />
-<TGConnectingPoint num="22" id="182" />
-<TGConnectingPoint num="23" id="183" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU" />
-<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" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="159" >
-<father id="184" num="0" />
-<cdparam x="88" y="143" />
-<sizeparam width="256" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="-6" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="DIPLODOCUS_C_Design::TMLComp_1" />
-<TGConnectingPoint num="0" id="151" />
-<TGConnectingPoint num="1" id="152" />
-<TGConnectingPoint num="2" id="153" />
-<TGConnectingPoint num="3" id="154" />
-<TGConnectingPoint num="4" id="155" />
-<TGConnectingPoint num="5" id="156" />
-<TGConnectingPoint num="6" id="157" />
-<TGConnectingPoint num="7" id="158" />
-<extraparam>
-<info value="DIPLODOCUS_C_Design::TMLComp_1" taskName="TMLComp_1" referenceTaskName="DIPLODOCUS_C_Design" priority="0" HALMappedOperationName="No HAL file found" HALUnitName="EMPTY" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="185" >
-<cdparam x="670" y="441" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="670" y="441" id="71" />
-<P2 x="715" y="441" id="45" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="186" >
-<cdparam x="420" y="441" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="420" y="441" id="70" />
-<P2 x="366" y="429" id="96" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="187" >
-<cdparam x="873" y="302" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="873" y="302" id="132" />
-<P2 x="840" y="416" id="43" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="188" >
-<cdparam x="219" y="293" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="219" y="293" id="166" />
-<P2 x="241" y="404" id="93" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.classpath b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.classpath
deleted file mode 100644
index 028b2cc284deb52374a491f91e1b8d45098f1c18..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="src" path="/src"/>
- <classpathentry kind="lib" path="assertj-swing-3.8.0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.gitignore b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.gitignore
deleted file mode 100644
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.project b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.project
deleted file mode 100644
index 94579664dfb7dbfdb555c5e4a50c7dee392d54a3..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>fr.tpt.ttool.tests.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar
deleted file mode 100644
index a86a1f2266f245c15266c05decc9829b721f19ea..0000000000000000000000000000000000000000
Binary files a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar and /dev/null differ
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.classpath b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.classpath
deleted file mode 100644
index ac3a9c3963c0f22b1cdd2a92155880f908436418..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry combineaccessrules="false" kind="src" path="/src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.gitignore b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.gitignore
deleted file mode 100644
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.project b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.project
deleted file mode 100644
index 7a3d164b32e075ae22952325540c1004151363e2..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>fr.tpt.ttool.tests.util</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3a21537071bf4118b9e1ee864cb4bc258aa48211..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch
deleted file mode 100644
index 479b2cb67a2ffcc0e947344178630510c627fb13..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="fr.tpt.ttool.tests.util.TToolUtilTestsRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fr.tpt.ttool.tests.util"/>
-</launchConfiguration>
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java
deleted file mode 100644
index 5df8a014a1f7b54187b14bba6bca36c8768795a1..0000000000000000000000000000000000000000
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.tpt.ttool.tests.util;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-import fr.tpt.ttool.tests.util.remote.TestRshClient;
-
-public class TToolUtilTestsRunner {
-
- public static void main(String[] args) {
- Result result = JUnitCore.runClasses( TestRshClient.class );
-
- for ( final Failure failure : result.getFailures() ) {
- System.err.println( "Test failed : " + failure.toString() );
- }
-
- if ( result.wasSuccessful() ) {
- System.out.println( "All tests passed." );
- }
- else {
- System.err.println( "Some of the tests failed!" );
- }
-
- System.exit( 0 );
- }
-}
diff --git a/ttool/launch_configurations/test/TestGTURTLEModeling.launch b/ttool/launch_configurations/test/TestGTURTLEModeling.launch
new file mode 100644
index 0000000000000000000000000000000000000000..d7f0ff9e7c8b50ad2d2f46afe2c72fdd7b27257d
--- /dev/null
+++ b/ttool/launch_configurations/test/TestGTURTLEModeling.launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/ttool/src/test/java/ui/TestGTURTLEModeling.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ui.TestGTURTLEModeling"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ttool"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:ttool/src/test}"/>
+</launchConfiguration>
diff --git a/ttool/launch_configurations/test/TestRshClient.launch b/ttool/launch_configurations/test/TestRshClient.launch
new file mode 100644
index 0000000000000000000000000000000000000000..cf13d1ea207e2f079ac63984a255d3e51f2feb98
--- /dev/null
+++ b/ttool/launch_configurations/test/TestRshClient.launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/ttool/src/test/java/launcher/TestRshClient.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="launcher.TestRshClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ttool"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:ttool/src/test}"/>
+</launchConfiguration>
diff --git a/ttool/launch_configurations/test/TestTDiagramPanel.launch b/ttool/launch_configurations/test/TestTDiagramPanel.launch
new file mode 100644
index 0000000000000000000000000000000000000000..6f00f9fc6bc7bc897dcaed3f548f715c03fd9d76
--- /dev/null
+++ b/ttool/launch_configurations/test/TestTDiagramPanel.launch
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/ttool/src/test/java/ui/tmldd/TestTDiagramPanel.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ui.tmldd.TestTDiagramPanel"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ttool"/>
+</launchConfiguration>
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch b/ttool/launch_configurations/test/TestTtoolAll.launch
similarity index 74%
rename from oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch
rename to ttool/launch_configurations/test/TestTtoolAll.launch
index be994b10555a84a3406900b134ff625d40877d85..f3e65268536a5d4e74e1cc5742efebbc495f2bfa 100644
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch
+++ b/ttool/launch_configurations/test/TestTtoolAll.launch
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java"/>
+<listEntry value="/ttool"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=ttool"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="fr.tpt.ttool.tests.util.remote.TestRshClient"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fr.tpt.ttool.tests.util"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ttool"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:ttool/src/test}"/>
</launchConfiguration>
diff --git a/ttool/src/test/java/avatartranslator/AvatarSafetyTests.java b/ttool/src/test/java/avatartranslator/AvatarSafetyTests.java
index cbacd1009e726e4381eef9faac0d75f29cd256a4..829f0ec875635e0fd53ab2ac522857c73643107d 100644
--- a/ttool/src/test/java/avatartranslator/AvatarSafetyTests.java
+++ b/ttool/src/test/java/avatartranslator/AvatarSafetyTests.java
@@ -42,25 +42,19 @@
* @author Letitia LI
*/
+package avatartranslator;
//I am adding safety tests because Ludovic said to
import org.junit.Test;
import org.junit.*;
import static org.junit.Assert.*;
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.Vector;
import java.util.List;
import java.util.ArrayList;
-import ui.TAttribute;
-import avatartranslator.*;
import ui.*;
import ui.avatarbd.*;
-import myutil.*;
-
public class AvatarSafetyTests {
List<AvatarBDBlock> blocks;
diff --git a/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java b/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
index c58a2ade6c12b626938be4ddc110e498bb8bab32..923af87c77617a5fa3f969d363b0d7cd1809fecc 100644
--- a/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
+++ b/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
@@ -45,28 +45,34 @@
package avatartranslator;
-import org.junit.Test;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import ui.*;
-import ui.tmlcompd.*;
-
import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-import ui.tree.*;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ToolTipManager;
-import javax.swing.*;
+import org.junit.Before;
+import org.junit.Test;
-import tmltranslator.*;
+import tmltranslator.SecurityPattern;
+import tmltranslator.TMLArchitecture;
+import tmltranslator.TMLExecC;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLStartState;
+import tmltranslator.TMLTask;
import tmltranslator.toavatar.TML2Avatar;
+import ui.MainGUI;
+import ui.TGComponent;
+import ui.TMLComponentDesignPanel;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tree.DiagramTreeRenderer;
+import ui.tree.JDiagramTree;
public class AvatarSecurityTranslationTests {
TMLMapping<TGComponent> map;
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
similarity index 97%
rename from oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java
rename to ttool/src/test/java/launcher/TestRshClient.java
index c7fac835ec5b1d63335268a44b542dfa876a021b..a6ab1e75a866c58b0bdf7609523e570311a6502f 100644
--- a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java
+++ b/ttool/src/test/java/launcher/TestRshClient.java
@@ -1,4 +1,4 @@
-package fr.tpt.ttool.tests.util.remote;
+package launcher;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -24,9 +24,9 @@ public class TestRshClient {
private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator();
private static final String TEST_PROGRAM_NAME = "helloWorld";
- private static final String TEST_COMMAND = "./resources/" + TEST_PROGRAM_NAME;
- private static final String TEST_COMMAND_NON_STOP = "./resources/helloWorldNonStop";
- private static final String TEST_FILE_NAME = "./resources/test.txt";
+ private static final String TEST_COMMAND = "./resources/launcher/" + TEST_PROGRAM_NAME;
+ private static final String TEST_COMMAND_NON_STOP = "./resources/launcher/helloWorldNonStop";
+ private static final String TEST_FILE_NAME = "./resources/launcher/test.txt";
private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o";
diff --git a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java b/ttool/src/test/java/ui/tmldd/TestTDiagramPanel.java
similarity index 66%
rename from oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java
rename to ttool/src/test/java/ui/tmldd/TestTDiagramPanel.java
index 74fd59dc3cf30d9b0871ce34f5375776577a4c15..b30d3df2da78d23ca66077a839a2740db42f8f58 100644
--- a/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java
+++ b/ttool/src/test/java/ui/tmldd/TestTDiagramPanel.java
@@ -1,26 +1,29 @@
-package fr.tpt.ttool.tests.ui;
+package ui.tmldd;
-import org.junit.*;
-import ui.MainGUI;
-import ui.tmldd.TMLArchiBUSNode;
-import ui.tmldd.TMLArchiDiagramPanel;
-import ui.tmldd.TMLArchiDiagramToolBar;
-import junit.framework.TestCase;
-import myutil.PluginManager;
+import static org.junit.Assert.assertTrue;
-public class MoveComponentTest extends TestCase {
- static MainGUI mgui;
+import org.junit.Before;
+import org.junit.Test;
+
+import ui.AbstractUITest;
+
+public class TestTDiagramPanel extends AbstractUITest {
+// static MainGUI mgui;
static TMLArchiDiagramToolBar tb;
static TMLArchiDiagramPanel tdp;
static TMLArchiBUSNode tgc;
+ public TestTDiagramPanel() {
+ super();
+ }
+
@Before
public void setUp() throws Exception {
- mgui = new MainGUI(false, false, false, false, false, false, false, false, false, false, false, true);
- mgui.build();
- PluginManager.pluginManager = new PluginManager();
- tb = new TMLArchiDiagramToolBar(mgui);
- tdp = new TMLArchiDiagramPanel(mgui, tb);
+// mgui = new MainGUI(false, false, false, false, false, false, false, false, false, false, false, true);
+// mgui.build();
+ //PluginManager.pluginManager = new PluginManager();
+ tb = new TMLArchiDiagramToolBar( mainGui );
+ tdp = new TMLArchiDiagramPanel( mainGui, tb);
tgc = new TMLArchiBUSNode(500, 500, 0, 1400, 0, 1900, true, null, tdp);
tdp.setComponentPointed(null);
}
@@ -61,4 +64,4 @@ public class MoveComponentTest extends TestCase {
assertTrue(tgc.getY() == 500);
}
-}
\ No newline at end of file
+}
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorld b/ttool/src/test/resources/launcher/helloWorld
similarity index 100%
rename from oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorld
rename to ttool/src/test/resources/launcher/helloWorld
diff --git a/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop b/ttool/src/test/resources/launcher/helloWorldNonStop
similarity index 100%
rename from oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop
rename to ttool/src/test/resources/launcher/helloWorldNonStop