diff --git a/src/main/java/syscamstranslator/SysCAMSSpecification.java b/src/main/java/syscamstranslator/SysCAMSSpecification.java
index e188ae7d110f1bf41f36e040dccb8c3d1ac56e2d..2446a30ac7368823e907687d8f4d8a656631afda 100644
--- a/src/main/java/syscamstranslator/SysCAMSSpecification.java
+++ b/src/main/java/syscamstranslator/SysCAMSSpecification.java
@@ -42,9 +42,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * Creation: 07/05/2018
- * @version 1.0 07/05/2018
- * @author Irina Kit Yan LEE
+* Creation: 14/05/2018
+* @version 1.0 14/05/2018
+* @author Irina Kit Yan LEE
 */
 
 public class SysCAMSSpecification{
@@ -128,7 +128,7 @@ public class SysCAMSSpecification{
       return (getAllBlockTDF()).size();
     }
 
-    public int getNbBlocDE(){
+    public int getNbBlockDE(){
       return (getAllBlockDE()).size();
     }
 
diff --git a/src/main/java/syscamstranslator/SysCAMSTBlockDE.java b/src/main/java/syscamstranslator/SysCAMSTBlockDE.java
index 6696aa5d1f6f9e2505f856c9c745accae0e75085..35fa014078550eb5272727392b6262df4aa9f44b 100644
--- a/src/main/java/syscamstranslator/SysCAMSTBlockDE.java
+++ b/src/main/java/syscamstranslator/SysCAMSTBlockDE.java
@@ -38,9 +38,11 @@
 
 package syscamstranslator;
 
+import java.util.LinkedList;
+
 /**
- * Creation: 07/05/2018
- * @version 1.0 07/05/2018
+ * Creation: 19/05/2018
+ * @version 1.0 19/05/2018
  * @author Irina Kit Yan LEE
 */
 
@@ -49,6 +51,8 @@ public class SysCAMSTBlockDE extends SysCAMSTComponent {
 	private String blockDEName;
 	private int period;
 	
+	private LinkedList<SysCAMSTPortDE> portDE;
+	
 	public SysCAMSTBlockDE(String _blockDEName, int _period) {
 		blockDEName = _blockDEName;
 		period = _period;
@@ -69,4 +73,12 @@ public class SysCAMSTBlockDE extends SysCAMSTComponent {
 	public void setBlockDEName(String _blockDEName) {
 		blockDEName = _blockDEName;
 	}
-}
\ No newline at end of file
+
+    public LinkedList<SysCAMSTPortDE> getPortDE(){
+    	return portDE;
+    }
+
+    public void addPortDE(SysCAMSTPortDE de){
+    	portDE.add(de);
+    }
+}
diff --git a/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java b/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
index d7d449fd1d1dedb961b3026ae9adc910db3d8edc..c2ea9fb864109ee2239550327bf5c8c4cf5d0c94 100644
--- a/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
+++ b/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
@@ -38,9 +38,11 @@
 
 package syscamstranslator;
 
+import java.util.LinkedList;
+
 /**
- * Creation: 07/05/2018
- * @version 1.0 07/05/2018
+ * Creation: 19/05/2018
+ * @version 1.0 19/05/2018
  * @author Irina Kit Yan LEE
 */
 
@@ -50,10 +52,16 @@ public class SysCAMSTBlockTDF extends SysCAMSTComponent {
 	private int period;
 	private String processCode;
 	
-	public SysCAMSTBlockTDF(String _blockTDFName, int _period, String _processCode) {
+	private SysCAMSTCluster cluster;
+	
+	private LinkedList<SysCAMSTPortTDF> portTDF;
+	private LinkedList<SysCAMSTPortConverter> portConverter;
+	
+	public SysCAMSTBlockTDF(String _blockTDFName, int _period, String _processCode, SysCAMSTCluster _cluster) {
 		blockTDFName = _blockTDFName;
 		period = _period;
 		processCode = _processCode;
+		cluster = _cluster;
 	}
 
 	public int getPeriod() {
@@ -79,4 +87,28 @@ public class SysCAMSTBlockTDF extends SysCAMSTComponent {
 	public void setBlockTDFName(String _blockTDFName) {
 		blockTDFName = _blockTDFName;
 	}
-}
\ No newline at end of file
+
+	public SysCAMSTCluster getCluster() {
+		return cluster;
+	}
+
+	public void setCluster(SysCAMSTCluster _cluster) {
+		cluster = _cluster;
+	}
+
+    public LinkedList<SysCAMSTPortTDF> getPortTDF(){
+    	return portTDF;
+    }
+
+    public void addPortTDF(SysCAMSTPortTDF tdf){
+    	portTDF.add(tdf);
+    }
+    
+    public LinkedList<SysCAMSTPortConverter> getPortConverter(){
+    	return portConverter;
+    }
+
+    public void addPortConverter(SysCAMSTPortConverter converter){
+    	portConverter.add(converter);
+    }
+}
diff --git a/src/main/java/syscamstranslator/SysCAMSTCluster.java b/src/main/java/syscamstranslator/SysCAMSTCluster.java
index 0d82f3673e359784eab9c500d153445474827fb9..29c1a8a45e798e781a1886d998921aa8d96bb6af 100644
--- a/src/main/java/syscamstranslator/SysCAMSTCluster.java
+++ b/src/main/java/syscamstranslator/SysCAMSTCluster.java
@@ -38,9 +38,11 @@
 
 package syscamstranslator;
 
+import java.util.LinkedList;
+
 /**
- * Creation: 07/05/2018
- * @version 1.0 07/05/2018
+ * Creation: 19/05/2018
+ * @version 1.0 19/05/2018
  * @author Irina Kit Yan LEE
 */
 
@@ -48,6 +50,8 @@ public class SysCAMSTCluster extends SysCAMSTComponent {
 
 	private String clusterName;
 	
+	private LinkedList<SysCAMSTBlockTDF> blocks;
+	
 	public SysCAMSTCluster(String _clusterName) {
 		super();
 		clusterName = _clusterName;
@@ -60,4 +64,12 @@ public class SysCAMSTCluster extends SysCAMSTComponent {
 	public void setClusterName(String _clusterName) {
 		clusterName = _clusterName;
 	}
-}
\ No newline at end of file
+
+    public LinkedList<SysCAMSTBlockTDF> getBlockTDF(){
+    	return blocks;
+    }
+
+    public void addBlockTDF(SysCAMSTBlockTDF tdf){
+    	blocks.add(tdf);
+    }
+}
diff --git a/src/main/java/syscamstranslator/SysCAMSTPortConverter.java b/src/main/java/syscamstranslator/SysCAMSTPortConverter.java
index a367d8cfa02e93208c359a2c2128db4348ab1ab3..74f42609c25a4365eab37cc101bddaa8bceda68a 100644
--- a/src/main/java/syscamstranslator/SysCAMSTPortConverter.java
+++ b/src/main/java/syscamstranslator/SysCAMSTPortConverter.java
@@ -39,8 +39,8 @@
 package syscamstranslator;
 
 /**
- * Creation: 07/05/2018
- * @version 1.0 07/05/2018
+ * Creation: 19/05/2018
+ * @version 1.0 19/05/2018
  * @author Irina Kit Yan LEE
 */
 
@@ -50,16 +50,19 @@ public class SysCAMSTPortConverter extends SysCAMSTComponent {
 	private int period;
 	private int rate;
 	private int delay;
-	private String origin;
+	private int origin;
 	private String ConvType;
 	
-	public SysCAMSTPortConverter(String _name, int _period, int _rate, int _delay, String _origin, String _ConvType) {
+	private SysCAMSTBlockTDF blockTDF;
+	
+	public SysCAMSTPortConverter(String _name, int _period, int _rate, int _delay, int _origin, String _ConvType, SysCAMSTBlockTDF _blockTDF) {
 		name = _name;
 		period = _period;
 		rate = _rate;
 		delay = _delay;
 		origin = _origin;
 		ConvType = _ConvType;
+		blockTDF = _blockTDF;
 	}
 
 	public String getName() {
@@ -94,12 +97,12 @@ public class SysCAMSTPortConverter extends SysCAMSTComponent {
 		delay = _delay;
 	}
 
-	public String getOrigin() {
+	public int getOrigin() {
 		return origin;
 	}
 
-	public void setOrigin(String _origin) {
-		origin = _origin;
+	public void setOrigin(int origin) {
+		this.origin = origin;
 	}
 
 	public String getConvType() {
@@ -109,4 +112,12 @@ public class SysCAMSTPortConverter extends SysCAMSTComponent {
 	public void setConvType(String _ConvType) {
 		ConvType = _ConvType;
 	}
-}
\ No newline at end of file
+
+	public SysCAMSTBlockTDF getBlockTDF() {
+		return blockTDF;
+	}
+
+	public void setBlockTDF(SysCAMSTBlockTDF _blockTDF) {
+		blockTDF = _blockTDF;
+	}
+}
diff --git a/src/main/java/syscamstranslator/SysCAMSTPortDE.java b/src/main/java/syscamstranslator/SysCAMSTPortDE.java
index f1ec45a4f71c064059a6345ea08a3f9a6dd325fa..34acd91d9e5084478f1b79e2ce901aef6491e4ca 100644
--- a/src/main/java/syscamstranslator/SysCAMSTPortDE.java
+++ b/src/main/java/syscamstranslator/SysCAMSTPortDE.java
@@ -50,16 +50,19 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
 	private int period;
 	private int rate;
 	private int delay;
-	private String origin;
+	private int origin;
 	private String DEType;
 	
-	public SysCAMSTPortDE(String _name, int _period, int _rate, int _delay, String _origin, String _DEType) {
+	private SysCAMSTBlockDE blockDE;
+	
+	public SysCAMSTPortDE(String _name, int _period, int _rate, int _delay, int _origin, String _DEType, SysCAMSTBlockDE _blockDE) {
 		name = _name;
 		period = _period;
 		rate = _rate;
 		delay = _delay;
 		origin = _origin;
 		DEType = _DEType;
+		blockDE = _blockDE;
 	}
 
 	public String getName() {
@@ -94,11 +97,11 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
 		delay = _delay;
 	}
 
-	public String getOrigin() {
+	public int getOrigin() {
 		return origin;
 	}
 
-	public void setOrigin(String _origin) {
+	public void setOrigin(int _origin) {
 		origin = _origin;
 	}
 
@@ -109,4 +112,12 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
 	public void setDEType(String _DEType) {
 		DEType = _DEType;
 	}
-}
\ No newline at end of file
+
+	public SysCAMSTBlockDE getBlockTDF() {
+		return blockDE;
+	}
+
+	public void setBlockDE(SysCAMSTBlockDE _blockDE) {
+		blockDE = _blockDE;
+	}
+}
diff --git a/src/main/java/syscamstranslator/SysCAMSTPortTDF.java b/src/main/java/syscamstranslator/SysCAMSTPortTDF.java
index 03145f137b9c8ceb910a4690ffd400694da8bcae..1cbe9b6674bd21f26dcc892c5340a5e56ff0a2c8 100644
--- a/src/main/java/syscamstranslator/SysCAMSTPortTDF.java
+++ b/src/main/java/syscamstranslator/SysCAMSTPortTDF.java
@@ -50,16 +50,19 @@ public class SysCAMSTPortTDF extends SysCAMSTComponent {
 	private int period;
 	private int rate;
 	private int delay;
-	private String origin;
+	private int origin;
 	private String TDFType;
 	
-	public SysCAMSTPortTDF(String _name, int _period, int _rate, int _delay, String _origin, String _TDFType) {
+	private SysCAMSTBlockTDF blockTDF;
+	
+	public SysCAMSTPortTDF(String _name, int _period, int _rate, int _delay, int _origin, String _TDFType, SysCAMSTBlockTDF _blockTDF) {
 		name = _name;
 		period = _period;
 		rate = _rate;
 		delay = _delay;
 		origin = _origin;
 		TDFType = _TDFType;
+		blockTDF = _blockTDF;
 	}
 
 	public String getName() {
@@ -94,11 +97,11 @@ public class SysCAMSTPortTDF extends SysCAMSTComponent {
 		delay = _delay;
 	}
 
-	public String getOrigin() {
+	public int getOrigin() {
 		return origin;
 	}
 
-	public void setOrigin(String _origin) {
+	public void setOrigin(int _origin) {
 		origin = _origin;
 	}
 
@@ -109,4 +112,12 @@ public class SysCAMSTPortTDF extends SysCAMSTComponent {
 	public void setTDFType(String _TDFType) {
 		TDFType = _TDFType;
 	}
+
+	public synchronized SysCAMSTBlockTDF getBlockTDF() {
+		return blockTDF;
+	}
+
+	public synchronized void setBlockTDF(SysCAMSTBlockTDF _blockTDF) {
+		blockTDF = _blockTDF;
+	}
 }
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Code.java b/src/main/java/syscamstranslator/toSysCAMS/Code.java
new file mode 100644
index 0000000000000000000000000000000000000000..24eb31dab7a7a2346f58876b6eb3e99339575741
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Code.java
@@ -0,0 +1,169 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import ddtranslatorSoclib.AvatarCPU;
+import common.ConfigurationTTool;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class Code {
+
+	static private String creation;
+	static private String creation2;
+
+	private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+	private final static String GENERATED_PATH = "generated_topcell" + File.separator;
+
+	public static String getCode() {
+
+		creation = CR + "//**********************************************************************" + CR
+				+ "//               Processor entry and connection code" + CR
+				+ "//**********************************************************************" + CR2 +
+
+				"#define CPU_CONNECT(n) void (n)(CpuEntry *e, sc_core::sc_clock &clk, \\" + CR
+				+ "sc_core::sc_signal<bool> &rstn, caba::VciSignals<vci_param> &m)" + CR2
+				+ "#define INIT_TOOLS(n) void (n)(const common::Loader &ldr)" + CR2
+				+ "#define NEW_CPU(n) caba::BaseModule * (n)(CpuEntry *e)" + CR2 + "struct CpuEntry { " + CR
+				+ "  caba::BaseModule *cpu; " + CR + "  common::Loader *text_ldr;" + CR
+				+ "  sc_core::sc_signal<bool> *irq_sig;" + CR + "  size_t irq_sig_count;" + CR + "  std::string type;"
+				+ CR + "  std::string name;" + CR + "  int id;" + CR + "  CPU_CONNECT(*connect);" + CR
+				+ "  INIT_TOOLS(*init_tools);" + CR + "  NEW_CPU(*new_cpu);" + CR + "};" + CR2
+				+ " template <class Iss_>" + CR + " CPU_CONNECT(cpu_connect){" + CR + "   typedef ISS_NEST(Iss_) Iss;"
+				+ CR
+				+ "   caba::VciXcacheWrapper<vci_param, Iss> *cpu = static_cast<caba::VciXcacheWrapper<vci_param, Iss> *>(e->cpu);"
+				+ CR + "   cpu->p_clk(clk);" + CR + "   cpu->p_resetn(rstn);" + CR
+				+ "   e->irq_sig_count = Iss::n_irq; " + CR
+				+ "   e->irq_sig = new sc_core::sc_signal<bool>[Iss::n_irq];" + CR +
+
+				"  for ( size_t irq = 0; irq < (size_t)Iss::n_irq; ++irq )" + CR
+				+ "     cpu->p_irq[irq](e->irq_sig[irq]); " + CR + "     cpu->p_vci(m);" + CR + "  }" + CR2;
+
+		creation = creation + "template <class Iss>" + CR + "INIT_TOOLS(initialize_tools){" + CR;
+
+		// Mips based platform requires a special bootstrap where only cpu 0 starts
+		// first
+
+		int isMipsArchitecture = 0;
+
+		try {
+			String path = ConfigurationTTool.AVATARMPSoCCodeDirectory;
+			BufferedReader in = new BufferedReader(new FileReader(path + "/Makefile.forsoclib"));
+			String line = null;
+			while ((line = in.readLine()) != null) {
+
+				if (line.equals("SOCLIB_CPU=mips32el")) {
+					isMipsArchitecture = 1;
+				}
+			}
+			in.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		if (isMipsArchitecture == 1) {
+			creation = creation + "Iss::setBoostrapCpuId(0);" + CR + "/* Only processor 0 starts execution on reset */"
+					+ CR;
+		}
+		creation = creation + "#if defined(CONFIG_GDB_SERVER)" + CR + "ISS_NEST(Iss)::set_loader(ldr);" + CR + "#endif"
+				+ CR + "#if defined(CONFIG_SOCLIB_MEMCHECK)" + CR
+				+ " common::IssMemchecker<Iss>::init(maptab, ldr, \"vci_multi_tty0,vci_xicu,vci_block_device,vci_fd_acccess,vci_ethernet,vci_fdt_rom,vci_rttimer\");"
+				+ CR + "#endif" + CR + "}" + CR2;
+
+		// currently, all caches must have the same parameters : take one
+		AvatarCPU cpu = TopCellGenerator.syscams.getAllCPU().getFirst();
+
+		int nb_clusters = TopCellGenerator.syscams.getAllCrossbar().size();
+
+		if (nb_clusters == 0) {
+			creation = creation + "template <class Iss>" + CR + "NEW_CPU(new_cpu){" + CR
+					+ "return new caba::VciXcacheWrapper<vci_param, ISS_NEST(Iss)>(e->name.c_str(), e->id, maptab, IntTab(e->id),"
+					+ cpu.getICacheWays() + "," + cpu.getICacheSets() + "," + cpu.getICacheWords() + ","
+					+ cpu.getDCacheWays() + "," + cpu.getDCacheSets() + "," + cpu.getDCacheWords() + ")" + ";" + CR
+					+ "}" + CR2;
+		} else {
+			creation = creation + "template <class Iss>" + CR + "NEW_CPU(new_cpu){" + CR
+					+ "return new caba::VciXcacheWrapper<vci_param, ISS_NEST(Iss)>(e->name.c_str(), e->id, maptab, IntTab(e->id,e->id),"
+					+ cpu.getICacheWays() + "," + cpu.getICacheSets() + "," + cpu.getICacheWords() + ","
+					+ cpu.getDCacheWays() + "," + cpu.getDCacheSets() + "," + cpu.getDCacheWords() + ")" + ";" + CR
+					+ "}" + CR2;
+		}
+
+		creation = creation + "/***************************************************************************" + CR
+				+ "--------------------Processor creation code-------------------------" + CR
+				+ "***************************************************************************/" + CR2 +
+
+				"template <class Iss> " + CR + "  CpuEntry * newCpuEntry_(CpuEntry *e){" + CR
+				+ "  e->new_cpu = new_cpu<Iss>;" + CR + "  e->connect = cpu_connect<Iss>;" + CR
+				+ "  e->init_tools = initialize_tools<Iss>;" + CR + "  return e;" + CR + "}" + CR2 +
+
+				" struct CpuEntry * newCpuEntry(const std::string &type, int id, common::Loader *ldr) {" + CR
+				+ "  CpuEntry *e = new CpuEntry;" + CR + "  std::ostringstream o;" + CR + "  o << type << \"_\" << id; "
+				+ CR2 + "  e->cpu = 0;" + CR + "  e->text_ldr = ldr;" + CR + "  e->type = type;" + CR
+				+ "  e->name = o.str();" + CR + "  e->id = id; " + CR2 + "  switch (type[0]) {" + CR + "    case 'm':"
+				+ CR + "      if (type == \"mips32el\")" + CR + "      return newCpuEntry_<common::Mips32ElIss>(e);"
+				+ CR + "      else if (type == \"mips32eb\")" + CR
+				+ "      return newCpuEntry_<common::Mips32EbIss>(e);" + CR2 + "    case 'a':" + CR
+				+ "      if (type == \"arm\")" + CR + "	     return newCpuEntry_<common::ArmIss>(e);" + CR
+				+ "   case 'n':" + CR + "     if (type == \"nios2\")" + CR
+				+ "	    return newCpuEntry_<common::Nios2fIss>(e);" + CR2 + "   case \'p\':" + CR
+				+ "     if (type == \"ppc\")return newCpuEntry_<common::Ppc405Iss>(e);" + CR2 + "    case 's':" + CR
+				+ "      if (type == \"sparc\")" + CR + "	     return newCpuEntry_<common::Sparcv8Iss<8> >(e);" + CR
+				+ "      else if (type == \"sparc_2wins\")" + CR
+				+ "	     return newCpuEntry_<common::Sparcv8Iss<2> >(e);" + CR2 + "    case 'l':" + CR
+				+ "      if (type == \"lm32\")" + CR + "	     return newCpuEntry_<common::LM32Iss<true> >(e);" + CR
+				+ " } " + CR2 + " throw std::runtime_error(type + \": wrong processor type\"); " + CR + "}" + CR2
+				+ "//**********************************************************************" + CR
+				+ "//                     Args parsing and netlist" + CR2
+				+ "//**********************************************************************" + CR2
+				+ "int _main(int argc, char **argv)" + CR + "{" + CR2 + " // Avoid repeating these everywhere" + CR
+				+ "  std::vector<CpuEntry*> cpus;" + CR + "  common::Loader data_ldr;" + CR
+				+ "  data_ldr.memory_default(0x5a);" + CR;
+		return creation;
+	}
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Corps.java b/src/main/java/syscamstranslator/toSysCAMS/Corps.java
new file mode 100644
index 0000000000000000000000000000000000000000..24db0e41ad618a969b8c6ff991992f06b3d78147
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Corps.java
@@ -0,0 +1,159 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* this class produces the lines containing essentially the initial #includes; we include all potential components event if they are not used in the deployment diagram*/
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import java.util.List;
+
+import syscamstranslator.*;
+import ui.syscams.SysCAMSBlockTDF;
+import ui.syscams.SysCAMSPortConverter;
+import ui.syscams.SysCAMSPortTDF;
+
+/**
+ * Class Header
+ * En-tête des fichiers .h et .cpp
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class Corps {
+	static private String corpsPrimitive;
+	static private String corpsCluster;
+	private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+
+	Corps() {}
+
+	public static String getPrimitiveCorps(SysCAMSTBlockTDF tdf) {
+		if (tdf != null) {
+			List<SysCAMSPortTDF> tdfports = tdf.getTdfports();
+			List<SysCAMSPortConverter> convports = tdf.getConvports();
+			
+			corpsPrimitive = "//-------------------------------Corps------------------------------------" + CR2
+					+ "SCA_TDF_MODULE(" + tdf.getBlockTDFName() + ") {" + CR2;
+			
+			if (!tdfports.isEmpty()) {
+				corpsPrimitive = corpsPrimitive + "\t// TDF port declarations" + CR;
+				for (SysCAMSPortTDF t : tdfports) {
+					if (t.getOrigin() == 0) {
+						corpsPrimitive = corpsPrimitive + "\tsca_tdf::sca_in<" + t.getTDFType() + "> " + t.getPortName() + CR;
+					} else if (t.getOrigin() == 1) {
+						corpsPrimitive = corpsPrimitive + "\tsca_tdf::sca_out<" + t.getTDFType() + "> " + t.getPortName() + CR;
+					}
+				}
+			}
+			if (!convports.isEmpty()) {
+				corpsPrimitive = corpsPrimitive + "\t// Converter port declarations" + CR;
+				for (SysCAMSPortConverter conv : convports) {
+					if (conv.getOrigin() == 0) {
+						corpsPrimitive = corpsPrimitive + "\tsca_tdf::sca_de::sca_in<" + conv.getConvType() + "> " + conv.getPortName() + CR;
+					} else if (conv.getOrigin() == 1) {
+						corpsPrimitive = corpsPrimitive + "\tsca_tdf::sca_de::out<" + conv.getConvType() + "> " + conv.getPortName() + CR;
+					}
+				}
+			}
+			
+			corpsPrimitive = corpsPrimitive + CR + "\t// Constructor" + CR + "\tSCA_CTOR(" + tdf.getBlockTDFName() + ")" + CR;
+		
+			if (!tdfports.isEmpty() || !convports.isEmpty()) {
+				corpsPrimitive = corpsPrimitive + ": ";
+				if (!tdfports.isEmpty()) {
+					for (SysCAMSPortTDF t : tdfports) {
+						corpsPrimitive = corpsPrimitive + "\t" + t.getPortName() + "(\"" + t.getPortName() + "\")"+ CR;
+					}
+				}
+				if (!convports.isEmpty()) {
+					for (SysCAMSPortConverter conv : convports) {
+						corpsPrimitive = corpsPrimitive + "\t" + conv.getPortName() + "(\"" + conv.getPortName() + "\")"+ CR;
+					}
+				}
+				corpsPrimitive = corpsPrimitive + "\t{}" + CR2;
+			}
+			
+			corpsPrimitive = corpsPrimitive + "\tvoid set_attributes() {" + CR;
+			
+			// Block period 
+			if (tdf.getPeriod() != 0) {
+				corpsPrimitive = corpsPrimitive + "\t\t" + "set_timestep(" + tdf.getPeriod() + ", sc_core::SC_MS);" + CR;
+			}	
+			for (SysCAMSPortTDF t : tdfports) {
+				if (t.getPeriod() != 0) {
+					corpsPrimitive = corpsPrimitive + "\t\t" + t.getPortName() + ".set_timestep(" + t.getPeriod() + ", sc_core::SC_US);" + CR;
+				} 
+				if (t.getRate() != 0) {
+					corpsPrimitive = corpsPrimitive + "\t\t" + t.getPortName() + ".set_rate(" + t.getRate() + ");" + CR;
+				} 
+				if (t.getDelay() != 0) {
+					corpsPrimitive = corpsPrimitive + "\t\t" + t.getPortName() + ".set_delay(" + t.getDelay() + ");" + CR;
+				} 
+			}
+			// Block processCode
+			corpsPrimitive = corpsPrimitive + "\t}" + CR2 + "\t" + tdf.getProcessCode() + CR2 + "};" + CR2 + "# endif"
+					+ " // " + tdf.getBlockTDFName().toUpperCase() + "_H";
+		} else {
+			corpsPrimitive = "";
+		}
+		return corpsPrimitive;
+	}
+	
+	public static String getClusterCorps(SysCAMSTCluster cluster) {
+		 if (cluster != null) {
+			 List<SysCAMSBlockTDF> blocks = cluster.getBlocks();
+			 
+			 corpsCluster = "//-------------------------------Header------------------------------------" + CR2
+						+ "#include <systemc-ams>" + CR2;
+			 
+			 for (SysCAMSBlockTDF b : blocks) {
+				 corpsCluster = corpsCluster + "#include \"" + b.getValue() + ".h\"" + CR;
+			 }
+			 corpsCluster = corpsCluster + CR;
+		 } else {
+			 corpsCluster = "";
+		 }
+		 return corpsCluster;
+	} 
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Declaration.java b/src/main/java/syscamstranslator/toSysCAMS/Declaration.java
new file mode 100644
index 0000000000000000000000000000000000000000..b4581dbbefdfb591dd25531b394d405a65dd3bcf
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Declaration.java
@@ -0,0 +1,395 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 
+	    v2.1 Daniela GENIUS, 2016, 2017 */
+
+package ddtranslatorSoclib.toTopCell;
+
+import ddtranslatorSoclib.*;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSignal;
+import avatartranslator.AvatarSpecification;
+
+public class Declaration {
+	public static AvatarSpecification avspec;
+	private static String CR = "\n";
+	private static String CR2 = "\n\n";
+
+	public static String generateName(AvatarRelation _ar, int _index) {
+		return _ar.block1.getName() + "_" + _ar.getSignal1(_index).getName() + "__" + _ar.block2.getName() + "_"
+				+ _ar.getSignal2(_index).getName();
+	}
+
+	public static String getDeclarations(AvatarSpecification _avspec) {
+		avspec = _avspec;
+
+		String declaration = "//----------------------------Instantiation-------------------------------" + CR2;
+
+		int nb_clusters = TopCellGenerator.syscams.getAllCrossbar().size();
+
+		boolean trace_caba = true;
+
+		if (nb_clusters == 0) {
+			declaration += CR + "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\",  IntTab(0), maptab);"
+					+ CR;
+		} else {
+			declaration += CR + "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\",  IntTab(0,0), maptab);"
+					+ CR;
+		}
+		if (nb_clusters == 0) {
+			declaration += "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(1), maptab, data_ldr);" + CR;
+		} else {
+			declaration += "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(0,1), maptab, data_ldr);" + CR;
+		}
+
+		if (nb_clusters == 0) {
+			declaration += " caba::VciSimhelper<vci_param> vcisimhelper    (\"vcisimhelper\", IntTab(3), maptab);" + CR;
+		} else {
+			declaration += " caba::VciSimhelper<vci_param> vcisimhelper    (\"vcisimhelper\", IntTab(0,3), maptab);"
+					+ CR;
+		}
+
+		if (nb_clusters == 0) {
+			declaration = declaration
+					+ "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(4), 1, xicu_n_irq, cpus.size(), cpus.size());"
+					+ CR;
+		} else {
+			declaration = declaration
+					+ "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(0,4), 1, xicu_n_irq, cpus.size(), cpus.size());"
+					+ CR;
+		}
+
+		if (nb_clusters == 0) {
+			declaration = declaration
+					+ "caba::VciRtTimer<vci_param> vcirttimer    (\"vcirttimer\", IntTab(5), maptab, 1, true);" + CR2;
+		} else {
+			declaration = declaration
+					+ "caba::VciRtTimer<vci_param> vcirttimer    (\"vcirttimer\", IntTab(0,5), maptab, 1, true);" + CR2;
+		}
+
+		if (nb_clusters == 0) {
+			declaration += "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(6), maptab);" + CR;
+		} else {
+			declaration += "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(0,6), maptab);" + CR;
+		}
+
+		int last_tty = 0;
+		if (nb_clusters == 0) {
+			int i = 0;
+			for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()) {
+				declaration += "caba::VciMultiTty<vci_param> " + tty.getTTYName() + "(\"" + tty.getTTYName()
+						+ "\", IntTab(" + tty.getNo_target() + "), maptab, \"vci_multi_tty" + i + "\", NULL);" + CR;
+				i++;
+				last_tty = tty.getNo_target() + 1;
+			}
+
+			// target address depends on number of TTYs and RAMs
+
+			if (nb_clusters == 0) {
+				// declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\",
+				// IntTab("+(TopCellGenerator.avatardd.getNb_target()+3)+"), maptab);" + CR;
+				declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\", IntTab(" + (last_tty + 3)
+						+ "), maptab);" + CR;
+			} else {
+				declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\", IntTab(0,8), maptab);" + CR;
+			}
+
+			for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM())
+				if (ram.getIndex() == 0) {
+					declaration += "soclib::caba::VciRam<vci_param>" + ram.getMemoryName() + "(\"" + ram.getMemoryName()
+							+ "\"" + ", IntTab(2), maptab);" + CR;
+				} else {
+					declaration += "soclib::caba::VciRam<vci_param>" + ram.getMemoryName() + "(\"" + ram.getMemoryName()
+							+ "\"" + ", IntTab(" + ram.getNo_target() + "), maptab);" + CR;
+				}
+		} else {
+			int i = 0;
+			for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()) {
+				declaration += "caba::VciMultiTty<vci_param> " + tty.getTTYName() + "(\"" + tty.getTTYName()
+						+ "\", IntTab(" + tty.getNo_cluster() + "," + tty.getNo_target() + "), maptab, \"vci_multi_tty"
+						+ i + "\", NULL);" + CR;
+				i++;
+			}
+
+			for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM())
+				declaration += "soclib::caba::VciRam<vci_param>" + ram.getMemoryName() + "(\"" + ram.getMemoryName()
+						+ "\"" + ", IntTab(" + ram.getNo_cluster() + "," + ram.getNo_target() + "), maptab);" + CR2;
+		}
+		if (nb_clusters == 0) {
+			/*
+			 * declaration +=
+			 * "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(cpus.size()+1), IntTab("
+			 * +(TopCellGenerator.avatardd.getNb_target())+"));" + CR; declaration +=
+			 * "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(cpus.size()+2), IntTab("
+			 * +(TopCellGenerator.avatardd.getNb_target()+1)+"), \"soclib0\");" + CR;
+			 * declaration +=
+			 * "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(cpus.size()), IntTab("
+			 * +(TopCellGenerator.avatardd.getNb_target()+2)+"),\"block0.iso\", 2048);" +
+			 * CR;
+			 */
+
+			declaration += "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(cpus.size()+1), IntTab("
+					+ last_tty + "));" + CR;
+			declaration += "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(cpus.size()+2), IntTab("
+					+ (last_tty + 1) + "), \"soclib0\");" + CR;
+			declaration += "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(cpus.size()), IntTab("
+					+ (last_tty + 2) + "),\"block0.iso\", 2048);" + CR;
+
+			// only non-clustered version
+			int hwa_no = 0;
+			// int target_no = TopCellGenerator.avatardd.getNb_target();
+			int target_no = (last_tty + 4);// DG 5.9.
+			int init_no = TopCellGenerator.syscams.getNb_init();
+			for (AvatarCoproMWMR copro : TopCellGenerator.syscams.getAllCoproMWMR()) {
+				// declaration += "caba::VciMwmrController<vci_param> " + copro.getCoprocName()+
+				// "(\"" + copro.getCoprocName()+ "\", maptab, IntTab("+copro.getSrcid() + "),
+				// IntTab("+copro.getTgtid() +
+				// "),copro.getPlaps(),copro.getFifoToCoProcDepth(),copro.getNToCopro(),copro.getNFromCopro(),copro.getNConfig(),copro.getNStatus(),
+				// copro.getUseLLSC());"+ CR;
+
+				declaration += "caba::VciMwmrController<vci_param> " + copro.getCoprocName() + "(\""
+						+ copro.getCoprocName() + "\", maptab, IntTab(" + (init_no - 1) + "), IntTab(" + target_no
+						+ ")," + copro.getPlaps() + "," + copro.getFifoToCoprocDepth() + ","
+						+ copro.getFifoFromCoprocDepth() + "," + copro.getNToCopro() + "," + copro.getNFromCopro() + ","
+						+ copro.getNConfig() + "," + copro.getNStatus() + "," + copro.getUseLLSC() + ");" + CR2;
+
+				// one virtual component for each hardware accellerator, info from diplodocus
+				// (not yet implemented)
+
+				// DG 28.08.
+				// declaration += "soclib::caba::FifoVirtualCoprocessorWrapper
+				// hwa"+hwa_no+"(\"hwa"+hwa_no+"\",1,1,1,1);"+ CR2;
+
+				declaration += "dsx::caba::MyHWA" + hwa_no + " hwa" + hwa_no + "(\"hwa" + hwa_no + "\");" + CR2;
+				target_no++;
+				init_no++;
+				hwa_no++;
+			}
+
+		} else {
+			declaration += "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(0,cpus.size()+1), IntTab(0,7));"
+					+ CR;
+			declaration += "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(0,cpus.size()+2), IntTab(0,8), \"soclib0\");"
+					+ CR;
+			declaration += "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(0,cpus.size()), IntTab(0,9),\"block0.iso\", 2048);"
+					+ CR;
+		}
+
+		if (nb_clusters == 0) {
+
+			for (AvatarBus bus : TopCellGenerator.syscams.getAllBus()) {
+				System.out.println("initiators: " + TopCellGenerator.syscams.getNb_init());
+				System.out.println("targets: " + TopCellGenerator.syscams.getNb_target());
+
+				// declaration += "soclib::caba::VciVgsb<vci_param> vgsb(\"" + bus.getBusName()
+				// + "\"" + " , maptab, cpus.size()+3," +
+				// (TopCellGenerator.avatardd.getNb_target()+4)+");" + CR2;
+				// declaration += "soclib::caba::VciVgsb<vci_param> vgsb(\"" + bus.getBusName()
+				// + "\"" + " , maptab, cpus.size()+3," +
+				// (TopCellGenerator.avatardd.getNb_target()+4)+ ");" + CR2;
+
+				declaration += "soclib::caba::VciVgsb<vci_param> vgsb(\"" + bus.getBusName() + "\"" + " , maptab,"
+						+ (3 + TopCellGenerator.syscams.getNb_init()) + ","
+						+ (TopCellGenerator.syscams.getNb_target() + 4) + ");" + CR2;// DG 28.08.
+				int i = 0;
+
+				// if BUS was not last in input file, update here
+
+				bus.setNbOfAttachedInitiators(TopCellGenerator.syscams.getNb_init());
+				bus.setnbOfAttachedTargets(TopCellGenerator.syscams.getNb_target());
+			}
+
+			for (AvatarVgmn vgmn : TopCellGenerator.syscams.getAllVgmn()) {
+				// System.out.println("initiators: "+TopCellGenerator.avatardd.getNb_init());
+				// System.out.println("targets: "+TopCellGenerator.avatardd.getNb_target());
+				/*
+				 * The user might have forgotten to specify the following, thus set default
+				 * values
+				 */
+
+				if (vgmn.getMinLatency() < 2)
+					vgmn.setMinLatency(10); // default value; must be > 2
+				if (vgmn.getFifoDepth() < 2)
+					vgmn.setFifoDepth(8); // default value; must be > 2
+
+				// declaration += "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
+				// vgmn.getVgmnName() + "\"" + " , maptab, cpus.size()+3," +
+				// (TopCellGenerator.avatardd.getNb_target()+4)+ "," + vgmn.getMinLatency() +
+				// "," + vgmn.getFifoDepth() + ");" + CR2;
+				// declaration += "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
+				// vgmn.getVgmnName() + "\"" + " , maptab, "
+				// +(3+TopCellGenerator.avatardd.getNb_init())+"," +
+				// (TopCellGenerator.avatardd.getNb_target()+4)+ "," + vgmn.getMinLatency() +
+				// "," + vgmn.getFifoDepth() + ");" + CR2;//DG 28.08.
+
+				declaration += "soclib::caba::VciVgmn<vci_param> vgmn(\"" + vgmn.getVgmnName() + "\"" + " , maptab, "
+						+ (3 + TopCellGenerator.syscams.getNb_init()) + ","
+						+ (TopCellGenerator.syscams.getNb_target() + 3) + "," + vgmn.getMinLatency() + ","
+						+ vgmn.getFifoDepth() + ");" + CR2;// DG 5.9.
+
+				// declaration += "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
+				// vgmn.getVgmnName() + "\"" + " , maptab, cpus.size()+3," +
+				// (TopCellGenerator.avatardd.getNbRAM()+TopCellGenerator.avatardd.getNbTTY()+4)+
+				// "," + vgmn.getMinLatency() + "," + vgmn.getFifoDepth() + ");" + CR2;
+
+				// if VGMN was not last in input file, update here
+				vgmn.setNbOfAttachedInitiators(TopCellGenerator.syscams.getNb_init());
+				vgmn.setnbOfAttachedTargets(TopCellGenerator.syscams.getNb_target() + 4);
+
+			}
+
+			/*
+			 * VciMwmrController( sc_module_name name, const MappingTable &mt, const IntTab
+			 * &srcid, const IntTab &tgtid, const size_t plaps, const size_t
+			 * fifo_to_coproc_depth, const size_t fifo_from_coproc_depth, const size_t
+			 * n_to_coproc, const size_t n_from_coproc, const size_t n_config, const size_t
+			 * n_status, const bool use_llsc );
+			 */
+
+		} else {
+
+			/***************************************/
+			/* clustered interconnect architecture */
+			/***************************************/
+
+			for (AvatarBus bus : TopCellGenerator.syscams.getAllBus()) {
+
+				declaration += "soclib::caba::VciVgsb<vci_param>  vgsb(\"" + bus.getBusName() + "\"" + " , maptab, "
+						+ +nb_clusters + "," + nb_clusters + ");" + CR2;
+
+				// if BUS was not last in input file, update here
+				int i = 0;
+			}
+
+			for (AvatarVgmn vgmn : TopCellGenerator.syscams.getAllVgmn()) {
+				System.out.println("initiators: " + TopCellGenerator.syscams.getNb_init());
+				System.out.println("targets: " + TopCellGenerator.syscams.getNb_target());
+
+				declaration += "soclib::caba::VciVgmn<vci_param> vgmn (\"" + vgmn.getVgmnName() + "\"" + " , maptab, "
+						+ nb_clusters + "," + nb_clusters + "," + vgmn.getMinLatency() + "," + vgmn.getFifoDepth()
+						+ ");" + CR2;
+
+			}
+
+			int i = 0;
+			for (AvatarCrossbar crossbar : TopCellGenerator.syscams.getAllCrossbar()) {
+
+				// currently the number on initiators and targets is fixed
+
+				crossbar.setClusterIndex(i);
+
+				if (crossbar.getClusterIndex() == 0) {
+					crossbar.setNbOfAttachedInitiators(nb_clusters);
+					crossbar.setNbOfAttachedTargets(13);
+				} else {
+					// processor(s) and link to central interconnect are initiators
+					// crossbar.setNbOfAttachedInitiators(2);
+					// crossbar.setNbOfAttachedTargets(2);
+					crossbar.setNbOfAttachedInitiators(1);
+					crossbar.setNbOfAttachedTargets(1);
+				}
+
+				System.out.println("initiators: " + crossbar.getNbOfAttachedInitiators());
+				System.out.println("targets: " + crossbar.getNbOfAttachedTargets());
+
+				declaration += "soclib::caba::VciLocalCrossbar<vci_param> crossbar" + crossbar.getClusterIndex() + "(\""
+						+ crossbar.getCrossbarName() + "\"" + " , maptab, IntTab(" + crossbar.getClusterIndex()
+						+ "),IntTab(" + crossbar.getClusterIndex() + "), " + crossbar.getNbOfAttachedInitiators() + ", "
+						+ crossbar.getNbOfAttachedTargets() + ");" + CR2;
+
+				// if CROSSBAR was not last in input file, update here
+				crossbar.setNbOfAttachedInitiators(TopCellGenerator.syscams.getNb_init());
+				crossbar.setNbOfAttachedTargets(TopCellGenerator.syscams.getNb_target());
+
+			}
+		}
+		int i = 0;
+		// monitoring CPU by logger(1)
+		for (AvatarCPU cpu : TopCellGenerator.syscams.getAllCPU()) {
+
+			if (cpu.getMonitored() == 1) {
+				System.out.println("Spy CPU");
+				declaration += "soclib::caba::VciLogger<vci_param> logger" + i + "(\"logger" + i + "\",maptab);" + CR2;
+				i++;
+			}
+		}
+
+		int j = 0;
+		// monitoring RAM either by logger(1) ou stats (2)
+		for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM()) {
+			if (ram.getMonitored() == 0) {
+
+			}
+			if (ram.getMonitored() == 1) {
+				System.out.println("Spy RAM : Logger");
+				declaration += "soclib::caba::VciLogger<vci_param> logger" + i + "(\"logger" + i + "\",maptab);" + CR2;
+				i++;
+			} else {
+				if (ram.getMonitored() == 2) {
+					System.out.println("Spy RAM : Stats");
+					String strArray = "";
+
+					for (AvatarRelation ar : avspec.getRelations()) {
+
+						for (i = 0; i < ar.nbOfSignals(); i++) {
+
+							AvatarSignal as1 = ar.getSignal1(i);
+							AvatarSignal as2 = ar.getSignal2(i);
+
+							String chname = generateName(ar, i);
+							strArray = strArray + "\"" + chname + "\",";
+						}
+
+					}
+
+					declaration += "soclib::caba::VciMwmrStats<vci_param> mwmr_stats" + j + "(\"mwmr_stats" + j
+							+ "\",maptab, data_ldr, \"mwmr" + j + ".log\",stringArray(" + strArray + "NULL));" + CR2;
+					j++;
+				}
+			}
+		}
+
+		return declaration;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Header.java b/src/main/java/syscamstranslator/toSysCAMS/Header.java
new file mode 100644
index 0000000000000000000000000000000000000000..088972a19748c2eb709c2096b560db24ebfd9e6d
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Header.java
@@ -0,0 +1,97 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* this class produces the lines containing essentially the initial #includes; we include all potential components event if they are not used in the deployment diagram*/
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import java.util.List;
+
+import syscamstranslator.*;
+import ui.syscams.SysCAMSBlockTDF;
+
+/**
+ * Class Header
+ * En-tête des fichiers .h et .cpp
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class Header {
+	static private String headerPrimitive;
+	static private String headerCluster;
+	private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+
+	Header() {}
+
+	public static String getPrimitiveHeader(SysCAMSTBlockTDF tdf) {
+		if (tdf != null) {
+			headerPrimitive = "//-------------------------------Header------------------------------------" + CR2
+					+ "#ifndef " + tdf.getBlockTDFName().toUpperCase() + "_H"+ CR 
+					+ "#define " + tdf.getBlockTDFName().toUpperCase() + "_H" + CR2
+					+ "#include <cmath>" + CR + "#include <iostream>" + CR + "#include <systemc-ams>" + CR2;
+		} else {
+			headerPrimitive = "";
+		}
+		return headerPrimitive;
+	}
+	
+	public static String getClusterHeader(SysCAMSTCluster cluster) {
+		 if (cluster != null) {
+			 List<SysCAMSBlockTDF> blocks = cluster.getBlocks();
+			 
+			 headerCluster = "//-------------------------------Header------------------------------------" + CR2
+						+ "#include <systemc-ams>" + CR2;
+			 
+			 for (SysCAMSBlockTDF b : blocks) {
+				 headerCluster = headerCluster + "#include \"" + b.getValue() + ".h\"" + CR;
+			 }
+			 headerCluster = headerCluster + CR;
+		 } else {
+			 headerCluster = "";
+		 }
+		 return headerCluster;
+	} 
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Loader.java b/src/main/java/syscamstranslator/toSysCAMS/Loader.java
new file mode 100644
index 0000000000000000000000000000000000000000..f8b7dac312738782babb14c6fbc51c0ec21bba39
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Loader.java
@@ -0,0 +1,148 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+/* authors: v1.0 Daniela GENIUS, Julien HENON 2015 */
+
+
+package ddtranslatorSoclib.toTopCell;
+import avatartranslator.AvatarRelation;//DG 23.06.
+import avatartranslator.AvatarSpecification;//DG 23.06.
+import ddtranslatorSoclib.AvatarChannel;
+
+public class Loader {
+public static AvatarSpecification avspec;
+	static private String loader;
+	private final static String NAME_CLK = "signal_clk";
+
+    private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+
+    public Loader(AvatarSpecification _avspec){
+	
+		avspec =_avspec;
+    }
+
+	public static String  getLoader(AvatarSpecification _avspec) {//DG 23.06.
+	    avspec =_avspec;//DG 23.06.
+	    int nb_clusters=TopCellGenerator.syscams.getAllCrossbar().size();		
+	    //nb_clusters=2;
+
+		loader = CR2 + "//-------------------------Call Loader---------------------------------" + CR2 ;
+		loader = loader + "std::cerr << \"caba-vgmn-mutekh_kernel_tutorial SoCLib simulator for MutekH\" << std::endl;"
+				+ CR2 ;
+
+		loader = loader + "if ( (argc < 2) || ((argc % 2) == 0) ) {" + CR ;
+
+		loader = loader + "exit(0);   }" + CR ;
+
+		loader = loader + "  argc--;" + CR ;
+		loader = loader + "  argv++;" + CR2 ;
+		loader = loader + "bool heterogeneous = (argc > 2);" + CR2 ;
+
+		loader = loader + "  for (int i = 0; i < (argc - 1); i += 2){" + CR ;	
+		loader = loader + "    char *cpu_p = argv[i];" + CR ;
+		loader = loader + "    const char *kernel_p = argv[i+1];" + CR ;
+		loader = loader + "    const char *arch_str = strsep(&cpu_p, \":\");" + CR ;
+		loader = loader + "    int count = cpu_p ? atoi(cpu_p) : 1;" + CR ;
+
+		loader = loader + "    common::Loader *text_ldr; " + CR ;
+
+		loader = loader + "    if (heterogeneous) {" + CR ;
+		loader = loader + "	 text_ldr = new common::Loader(std::string(kernel_p) + \";.text\");" + CR ;
+		loader = loader + "	 text_ldr->memory_default(0x5a);;" + CR ;
+		loader = loader + "	 data_ldr.load_file(std::string(kernel_p) + \";.rodata;.boot;.excep\");" + CR ;
+		loader = loader + "	 if (i == 0)" + CR ;
+		loader = loader + "	    data_ldr.load_file(std::string(kernel_p) + \";.data;";	
+      // We generated so far until arriving at first channel segment, if any
+		//current hypothesis : one segment per channel
+		int j=0;
+		//for (AvatarChannel channel : TopCellGenerator.avatardd.getAllMappedChannels()) {    	
+		//DG 23.06. per signal!!hack pour l'instant
+		int i=0;
+		//for (i=0;i<30;i++){ 
+
+		for(AvatarRelation ar: avspec.getRelations()) {
+
+       		for(i=0; i<ar.nbOfSignals() ; i++) {
+
+			loader = loader + ".channel" + j + ";";
+			j++;
+		}
+}
+		// We resume the generation of the fixed code
+		loader = loader + ".cpudata;.contextdata\");" + CR ;
+		loader = loader + "      } else {" + CR ;
+		loader = loader + "	  text_ldr = new common::Loader(std::string(kernel_p));" + CR ;
+		loader = loader + "	  text_ldr->memory_default(0x5a);" + CR ;
+		loader = loader + "	  data_ldr.load_file(std::string(kernel_p));" + CR ;
+		loader = loader + "      }" + CR2 ;
+
+		loader = loader + "      common::Loader tools_ldr(kernel_p);" + CR ;
+		loader = loader + "     tools_ldr.memory_default(0x5a);" + CR2 ;
+
+		loader = loader + "      for (int j = 0; j < count; j++) {" + CR ;
+		loader = loader + "	int id = cpus.size();" + CR ;
+		loader = loader + "	std::cerr << \"***\" << cpus.size() << std::endl;" + CR ;
+
+		loader = loader + "	CpuEntry *e = newCpuEntry(arch_str, id, text_ldr);" + CR ;
+
+		loader = loader + "	if (j == 0)" + CR ;
+		loader = loader + "	  e->init_tools(tools_ldr);" + CR ;
+
+		loader = loader + "	e->cpu = e->new_cpu(e);" + CR ;
+		loader = loader + "	cpus.push_back(e);" + CR ;
+		loader = loader + "      }" + CR ;
+		loader = loader + "    }" + CR2 ;
+		int nb_tty =1; //DG currently only one (multi) tty
+
+if(nb_clusters==0){
+    loader = loader + "  const size_t xicu_n_irq = "+(1+nb_tty+3)+";" + CR2 ;
+}else{
+    loader = loader + "  const size_t xicu_n_irq = "+(5*nb_clusters)+";" + CR2 ;
+}
+        return loader;
+	}
+
+    String getNAME_CLK(){
+      return NAME_CLK;
+    }
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/NetList.java b/src/main/java/syscamstranslator/toSysCAMS/NetList.java
new file mode 100644
index 0000000000000000000000000000000000000000..daf263cdadaeb2bee68efe96f063f80baa3d43af
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/NetList.java
@@ -0,0 +1,508 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package ddtranslatorSoclib.toTopCell;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
+
+public class NetList {
+    public static final String NAME_CLK = "signal_clk";
+    public static final String CR = "\n";
+    public static final String CR2 = "\n\n";
+    private static final String NAME_RST = "signal_resetn";
+    private static boolean tracing;
+
+    public static String getNetlist(String icn, boolean _tracing) {
+	int nb_clusters=TopCellGenerator.syscams.getAllCrossbar().size();
+	
+	tracing = _tracing;
+	
+	String netlist;
+
+	netlist = CR2 + "//------------------------------Netlist---------------------------------" + CR2;
+       
+	netlist = netlist + "// icu" + CR2;
+	netlist = netlist + "  vcifdtrom.add_property(\"interrupt-parent\", vcifdtrom.get_device_phandle(\"vci_xicu\"));" + CR2;
+
+	netlist = netlist + "  vcixicu.p_clk(signal_clk);" + CR;
+	netlist = netlist + "  vcixicu.p_resetn(signal_resetn);" + CR2;		
+	netlist = netlist + "  vcixicu.p_vci(signal_vci_xicu);" + CR2;	
+       
+	netlist = netlist + "  vcifdtrom.begin_device_node(\"vci_rttimer\", \"soclib:vci_rttimer\");" + CR;
+
+	netlist = netlist + "  vcifdtrom.add_property(\"interrupts\", 4);" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"frequency\", 1000000);" + CR;	
+	netlist = netlist + "  vcifdtrom.end_node();" + CR2;
+
+	netlist = netlist + "  vcifdtrom.begin_device_node(\"vci_xicu\", \"soclib:vci_xicu\");" + CR2;
+	netlist = netlist + "  int irq_map[cpus.size() * 3];" + CR;
+	netlist = netlist + "  for ( size_t i = 0; i < cpus.size(); ++i )" + CR;
+	netlist = netlist + "    {" + CR;
+	netlist = netlist + "      irq_map[i*3 + 0] = i;" + CR;
+	netlist = netlist + "      irq_map[i*3 + 1] = vcifdtrom.get_cpu_phandle(i);" + CR;
+	netlist = netlist + "      irq_map[i*3 + 2] = 0;" + CR;
+	netlist = netlist + "    }" + CR2;
+	netlist = netlist + "  vcifdtrom.add_property(\"interrupt-map\", irq_map, cpus.size() * 3);" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"frequency\", 1000000);" + CR2;
+
+	netlist = netlist + "  vcifdtrom.add_property(\"param-int-pti-count\", 1);" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"param-int-hwi-count\", xicu_n_irq);" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"param-int-wti-count\", cpus.size());" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"param-int-irq-count\", cpus.size());" + CR;
+	netlist = netlist + "  vcifdtrom.end_node();" + CR2;
+
+	netlist = netlist + "  for ( size_t i = 0; i < xicu_n_irq; ++i )" + CR;
+	netlist = netlist + "    vcixicu.p_hwi[i](signal_xicu_irq[i]);" + CR2;
+
+	netlist = netlist + "///////////////// cpus" + CR2;
+
+	netlist = netlist + "vcifdtrom.begin_cpus();" + CR2;
+	netlist = netlist + "for ( size_t i = 0; i < cpus.size(); ++i ){" + CR;
+	netlist = netlist + "   // configure het_rom" + CR;
+	netlist = netlist + "  vcihetrom.add_srcid(*cpus[i]->text_ldr, IntTab(i));" + CR;
+
+	netlist = netlist + "  // add cpu node to device tree" + CR;
+	netlist = netlist + "  vcifdtrom.begin_cpu_node(std::string(\"cpu:\") + cpus[i]->type, i);" + CR;
+	netlist = netlist + "  vcifdtrom.add_property(\"freq\", 1000000);" + CR;
+	netlist = netlist + "  vcifdtrom.end_node();" + CR2;
+
+	netlist = netlist + "// connect cpu" + CR;
+	netlist = netlist + "  cpus[i]->connect(cpus[i], signal_clk, signal_resetn, signal_vci_m[i]);" + CR;	             
+	if(icn=="vgmn")
+	    {
+		netlist = netlist + "vgmn.p_to_initiator[i](signal_vci_m[i]);" + CR;
+	    }
+	else{
+	    netlist = netlist + "vgsb.p_to_initiator[i](signal_vci_m[i]);" + CR;
+	}
+	
+	netlist = netlist + "vcixicu.p_irq[i](cpus[i]->irq_sig[0]);" + CR;
+	netlist = netlist + " }" + CR;
+	netlist = netlist + " vcifdtrom.end_node();" + CR2;
+
+	netlist = netlist + "  vcihetrom.p_clk(signal_clk);" + CR;
+	netlist = netlist + "  vcifdtrom.p_clk(signal_clk);" + CR;
+	netlist = netlist + "  vcirom.p_clk(signal_clk);" + CR;
+	netlist = netlist + "  vcisimhelper.p_clk(signal_clk);" + CR;
+	netlist = netlist + "  vcirttimer.p_clk(signal_clk);" + CR;
+
+	netlist = netlist + "  vcihetrom.p_resetn(signal_resetn);" + CR;	
+	netlist = netlist + "  vcifdtrom.p_resetn(signal_resetn);" + CR;
+	netlist = netlist + "  vcirom.p_resetn(signal_resetn);" + CR;
+	netlist = netlist + "  vcisimhelper.p_resetn(signal_resetn);" + CR;
+	netlist = netlist + "  vcirttimer.p_resetn(signal_resetn);" + CR;
+	netlist = netlist + "  vcihetrom.p_vci(signal_vci_vcihetrom);" + CR;	
+		
+	netlist = netlist + "  vcifdtrom.p_vci(signal_vci_vcifdtrom);" + CR;
+	netlist = netlist + "  vcirom.p_vci(signal_vci_vcirom);" + CR;
+	netlist = netlist + "  vcisimhelper.p_vci(signal_vci_vcisimhelper);" + CR;
+	netlist = netlist + "  vcirttimer.p_vci(signal_vci_vcirttimer);" + CR;
+	netlist = netlist + "  vcirttimer.p_irq[0](signal_xicu_irq[4]);" + CR2;
+
+	if(icn=="vgmn"){
+	    netlist = netlist + " vgmn.p_clk(signal_clk);" + CR;
+	    netlist = netlist + "  vgmn.p_resetn(signal_resetn);" + CR;
+	    netlist = netlist + "  vgmn.p_to_target[0](signal_vci_vcihetrom);" + CR;
+	    netlist = netlist + "  vgmn.p_to_target[1](signal_vci_vcirom);" + CR;		       
+	    netlist = netlist + "  vgmn.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
+	    netlist = netlist + "  vgmn.p_to_target[4](signal_vci_xicu);" + CR;
+	    netlist = netlist + "  vgmn.p_to_target[5](signal_vci_vcirttimer);" + CR2;
+	    netlist = netlist + "  vgmn.p_to_target[6](signal_vci_vcifdtrom);" + CR2;	
+	    netlist = netlist + "  vgmn.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
+	    netlist = netlist + "  vgmn.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);" + CR;
+	    netlist = netlist + "  vgmn.p_to_initiator[cpus.size()+2](signal_vci_etherneti);" + CR2;
+	}
+	else{	
+	    netlist = netlist + " vgsb.p_clk(signal_clk);" + CR;
+	    netlist = netlist + "  vgsb.p_resetn(signal_resetn);" + CR;
+	    netlist = netlist + "  vgsb.p_to_target[0](signal_vci_vcihetrom);" + CR;
+	    netlist = netlist + "  vgsb.p_to_target[1](signal_vci_vcirom);" + CR;		       
+	    netlist = netlist + "  vgsb.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
+	    netlist = netlist + "  vgsb.p_to_target[4](signal_vci_xicu);" + CR;
+	    netlist = netlist + "  vgsb.p_to_target[5](signal_vci_vcirttimer);" + CR2;
+	    netlist = netlist + "  vgsb.p_to_target[6](signal_vci_vcifdtrom);" + CR2;	
+	    netlist = netlist + "  vgsb.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
+	    netlist = netlist + "  vgsb.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);" + CR;
+	    netlist = netlist + "  vgsb.p_to_initiator[cpus.size()+2](signal_vci_etherneti);" + CR2;
+	}
+			
+	if(nb_clusters==0){
+	    netlist = netlist + "// RAM netlist" + CR2;
+	    for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM()) {    
+     
+		netlist = netlist + ram.getMemoryName()+".p_clk(" + NAME_CLK + ");" + CR;
+		netlist = netlist + ram.getMemoryName()+".p_resetn(" + NAME_RST + ");" + CR;
+		netlist = netlist + ram.getMemoryName()+".p_vci(signal_vci_vciram"+ram.getIndex()+");" + CR2;
+		if(icn=="vgmn"){
+		    netlist = netlist + "vgmn.p_to_target["+(ram.getNo_target())+"](signal_vci_vciram"+ram.getIndex()+");" + CR2;
+		}
+		else{
+		    netlist = netlist + "vgsb.p_to_target["+(ram.getNo_target())+"](signal_vci_vciram"+ram.getIndex()+");" + CR2;
+		}		   
+	    }		  
+	}
+
+	/* clustered version */
+	/* one or several ram, one locks engine, one mwmr ram and one mwmrd ram per cluster*/
+	else{		   
+	    int i;  
+	    netlist = netlist + "// RAM netlist" + CR2;
+	    for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM()) {    
+     
+		netlist = netlist + ram.getMemoryName()+".p_clk(" + NAME_CLK + ");" + CR;
+		netlist = netlist + ram.getMemoryName()+".p_resetn(" + NAME_RST + ");" + CR;
+		netlist = netlist + ram.getMemoryName()+".p_vci(signal_vci_vciram"+ram.getIndex()+");" + CR2;
+		//target number for local cluster: this is set at avatardd creation	      		    
+		netlist = netlist + "crossbar"+ram.getNo_cluster()+".p_to_target["+ram.getNo_target()+"](signal_vci_vciram"+ram.getIndex()+");" + CR2;		  	   
+	    }
+	
+	    //one mwmr ram and one mwmrdram per cluster are added transparently
+
+	/*convention for local target ids on cluster :
+	  channel: 0
+	  mwmr_ram: 1
+	  mwmrd_ram: 2
+          locks: 3
+          ram: 4
+          tty: 5
+	 */
+
+	    /* for(i=0;i<nb_clusters;i++){
+		netlist = netlist + "crossbar"+i+".p_to_target["+1+"](signal_vci_mwmr_ram"+i+");" + CR2;
+		//netlist = netlist +"mwmr_ram"+i+".p_irq[0](signal_xicu_irq[0]);" + CR2;		  
+		netlist = netlist + "crossbar"+i+".p_to_target["+2+"](signal_vci_mwmrd_ram"+i+");" + CR2;
+		//netlist = netlist +"mwmr_ram"+i+".p_irq[0](signal_xicu_irq[0]);" + CR2;		  
+	    }	 */
+	}
+		   	
+	if(nb_clusters==0){
+	    // we can have several TTYs and each is associated to the fdtrom 
+
+	    /*	    if(icn=="vgmn"){
+		netlist = netlist + "vgmn.p_to_target["+(TopCellGenerator.avatardd.getNb_target())+"](signal_vci_vcifdaccesst);" + CR; 
+		netlist = netlist + "vgmn.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+1)+"](signal_vci_ethernett);" + CR;	
+		netlist = netlist + "vgmn.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+2)+"](signal_vci_bdt);" + CR;	
+	netlist = netlist + "vgmn.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+3)+"](signal_vci_vcilocks);" + CR;	
+	    }else{ //vgsb 
+		netlist = netlist + "vgsb.p_to_target["+(TopCellGenerator.avatardd.getNb_target())+"](signal_vci_vcifdaccesst);" + CR; 
+		netlist = netlist + "vgsb.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+1)+"](signal_vci_ethernett);" + CR;	
+		netlist = netlist + "vgsb.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+2)+"](signal_vci_bdt);" + CR;	
+		   		netlist = netlist + "vgsb.p_to_target["+(TopCellGenerator.avatardd.getNb_target()+3)+"](signal_vci_vcilocks);" + CR;	
+		   }*/
+
+	    int l=8; //number of last tty ToDo
+	    if(icn=="vgmn"){
+		netlist = netlist + "vgmn.p_to_target["+(l)+"](signal_vci_vcifdaccesst);" + CR; 
+		netlist = netlist + "vgmn.p_to_target["+(l+1)+"](signal_vci_ethernett);" + CR;	
+		netlist = netlist + "vgmn.p_to_target["+(l+2)+"](signal_vci_bdt);" + CR;	
+	netlist = netlist + "vgmn.p_to_target["+(l+3)+"](signal_vci_vcilocks);" + CR;	
+	int i;
+	//DG 14.09.
+	int coproc_count=0;
+	for(i=0;i<coproc_count;i++){
+
+	    netlist = netlist + "vgmn.p_to_target["+(l+4+i)+"](signal_mwmr_"+i+"_target);" + CR;
+	}
+	    }else{ //vgsb 
+		netlist = netlist + "vgsb.p_to_target["+(l)+"](signal_vci_vcifdaccesst);" + CR; 
+		netlist = netlist + "vgsb.p_to_target["+(l+1)+"](signal_vci_ethernett);" + CR;	
+		netlist = netlist + "vgsb.p_to_target["+(l+2)+"](signal_vci_bdt);" + CR;	
+		   		netlist = netlist + "vgsb.p_to_target["+(l+3)+"](signal_vci_vcilocks);" + CR;	
+
+	//DG 14.09.
+				int coproc_count=0;
+				int i;
+	  for(i=0;i<coproc_count;i++){
+	      netlist = netlist + "vgmn.p_to_target["+(l+4+i)+"](signal_mwmr_"+i+"_target);" + CR;
+	  }
+	    }
+
+	}else{
+	    /* cluster case */
+	    if(icn=="vgmn"){
+		netlist = netlist + "vgmn.p_to_target["+5+"](signal_vci_vcifdaccesst);" + CR; 						
+		netlist = netlist + "vgmn.p_to_target["+6+"](signal_vci_ethernett);" + CR;    
+													     netlist = netlist + "vgmn.p_to_target["+7+"](signal_vci_bdt);" + CR;	
+	    }else{
+		netlist = netlist + "vgsb.p_to_target["+5+"](signal_vci_vcifdaccesst);" + CR; 
+		netlist = netlist + "vgsb.p_to_target["+6+"](signal_vci_ethernett);" + CR;      
+		netlist = netlist + "vgsb.p_to_target["+7+"](signal_vci_bdt);" + CR;	                   
+	    }
+	}
+	//netlist = netlist + "vcifdtrom.begin_device_node(\"vci_multi_tty\",\"soclib:vci_multi_tty\");" + CR2;
+
+	netlist = netlist + "vcifdtrom.add_property(\"interrupts\", 0);" + CR2;
+	netlist = netlist + "vcifdtrom.end_node();;" + CR2;
+
+	netlist = netlist + "// TTY netlist" + CR2;
+	int i=0;
+
+	for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()){
+	    netlist = netlist + tty.getTTYName()+".p_clk(signal_clk);" + CR;
+	    netlist = netlist + tty.getTTYName()+".p_resetn(signal_resetn);" + CR;
+	    netlist = netlist + tty.getTTYName()+".p_vci(signal_vci_tty"+i+");" + CR2; 		    
+	    int no_irq_tty=0;
+	    if(nb_clusters==0){
+		
+		if(icn=="vgmn"){
+		    netlist = netlist + "vcifdtrom.begin_device_node(\"vci_multi_tty"+i+"\",\"soclib:vci_multi_tty"+i+"\");" + CR2;
+		    netlist = netlist + "vgmn.p_to_target["+tty.getNo_target()+"](signal_vci_tty"+i+");" + CR2;
+		    netlist = netlist + tty.getTTYName()+".p_irq[0](signal_xicu_irq["+no_irq_tty+"]);" + CR2;	
+		}else{
+		    netlist = netlist + "vcifdtrom.begin_device_node(\"vci_multi_tty"+i+"\",\"soclib:vci_multi_tty"+tty.getNo_tty()+"\");" + CR2;
+		    netlist = netlist + "vgsb.p_to_target["+tty.getNo_target()+"](signal_vci_tty"+i+");" + CR2;		    
+		    netlist = netlist + tty.getTTYName()+".p_irq[0](signal_xicu_irq["+no_irq_tty+"]);" + CR2;	
+		}
+	    }	
+	    
+	    //we have a clustered architecture: identify local crossbar	
+	    else{ 
+		int j;		   
+		for(j=0;j<nb_clusters;j++){
+		    netlist = netlist + "crossbar"+j+".p_to_target["+tty.getNo_target()+"](signal_vci_tty"+j+");" + CR2;
+		    //recalculate irq addresses, 5 devices generating irq per cluster
+		    netlist = netlist + tty.getTTYName()+".p_irq[0](signal_xicu_irq["+(tty.getNo_cluster()*5)+"]);" + CR2;		      
+		}	 
+	    }
+	    i++;
+	    //One ICU per cluster per default
+	    no_irq_tty+=6;//if there is more than one tty, irq >5
+	}
+
+	//////////////// fdrom
+	   
+       	netlist = netlist + "{" + CR2;
+       	netlist = netlist + "  vcifdtrom.begin_node(\"aliases\");" + CR;		netlist = netlist + "  vcifdtrom.add_property(\"timer\", vcifdtrom.get_device_name(\"vci_rttimer\") + \"[0]\");" + CR;
+       	netlist = netlist + "  vcifdtrom.add_property(\"console\", vcifdtrom.get_device_name(\"vci_multi_tty0\") + \"[0]\");" + CR;
+       	netlist = netlist + "  vcifdtrom.end_node();" + CR;
+       	netlist = netlist + "}" + CR2;
+
+	//////////////// ethernet
+
+ 	netlist = netlist + "vcieth.p_clk(signal_clk);" + CR;
+  	netlist = netlist + "vcieth.p_resetn(signal_resetn);" + CR;
+  	netlist = netlist + "vcieth.p_irq(signal_xicu_irq[3]);" + CR;
+  	netlist = netlist + "vcieth.p_vci_target(signal_vci_ethernett);" + CR;
+  	netlist = netlist + "vcieth.p_vci_initiator(signal_vci_etherneti);" + CR;
+
+  	netlist = netlist + "vcifdtrom.begin_device_node(\"vci_ethernet\", \"soclib:vci_ethernet\");" + CR;
+  	netlist = netlist + "vcifdtrom.add_property(\"interrupts\", 3);" + CR;
+  	netlist = netlist + "vcifdtrom.end_node();" + CR;
+
+	//////////////// block device
+
+ 	netlist = netlist + "vcibd.p_clk(signal_clk);" + CR;
+  	netlist = netlist + "vcibd.p_resetn(signal_resetn);" + CR;
+  	netlist = netlist + "vcibd.p_irq(signal_xicu_irq[1]);" + CR;
+  	netlist = netlist + "vcibd.p_vci_target(signal_vci_bdt);" + CR;
+  	netlist = netlist + "vcibd.p_vci_initiator(signal_vci_bdi);" + CR;
+
+  	netlist = netlist + "vcifdtrom.begin_device_node(\"vci_block_device\", \"soclib:vci_block_device\");" + CR;
+  	netlist = netlist + "vcifdtrom.add_property(\"interrupts\", 1);" + CR;
+  	netlist = netlist + "vcifdtrom.end_node();" + CR;
+
+	//////////////// fd access
+ 	netlist = netlist + "vcihetrom.add_srcid(*cpus[0]->text_ldr, IntTab(cpus.size()+1));" + CR; /* allows dma read in rodata */
+
+  	netlist = netlist + "vcifd.p_clk(signal_clk);" + CR;
+  	netlist = netlist + "vcifd.p_resetn(signal_resetn);" + CR;
+  	netlist = netlist + "vcifd.p_irq(signal_xicu_irq[2]);" + CR;
+  	netlist = netlist + "vcifd.p_vci_target(signal_vci_vcifdaccesst);" + CR;
+  	netlist = netlist + "vcifd.p_vci_initiator(signal_vci_vcifdaccessi);" + CR;
+
+  	netlist = netlist + "vcifdtrom.begin_device_node(\"vci_fd_access\", \"soclib:vci_fd_access\");" + CR;
+  	netlist = netlist + "vcifdtrom.add_property(\"interrupts\", 2);" + CR;
+  	netlist = netlist + "vcifdtrom.end_node();" + CR2;
+
+	//////////////// locks
+ 
+  	netlist = netlist + "vcilocks.p_clk(signal_clk);" + CR;
+  	netlist = netlist + "vcilocks.p_resetn(signal_resetn);" + CR;     
+  	netlist = netlist + "vcilocks.p_vci(signal_vci_vcilocks);" + CR;	
+
+	////////////////MWMR controller; hypothesis 1 per coprocessor
+	//	if(nb_cluster == 0){
+	    i=0;
+	    int coproc_count=0;
+
+	    for (AvatarCoproMWMR copro : TopCellGenerator.syscams.getAllCoproMWMR()){
+		//a coprocessor with its FIFO interface built from HWA 
+		netlist = netlist +"hwa"+i+".p_clk(signal_clk);" + CR;
+		netlist = netlist +"hwa"+i+".p_resetn(signal_resetn);" + CR;	      	
+                netlist = netlist +"hwa"+i+".p_from_ctrl["+i+"](signal_fifo_"+i+"_from_ctrl);" + CR;
+		netlist = netlist +"hwa"+i+".p_to_ctrl["+i+"](signal_fifo_"+i+"_to_ctrl);" + CR2;
+	
+		//MWMR controller of the HWA
+		netlist = netlist +copro.getCoprocName() +".p_clk(signal_clk);" + CR;
+		netlist = netlist +copro.getCoprocName() +".p_resetn(signal_resetn);" + CR;
+		netlist = netlist +copro.getCoprocName() +".p_vci_initiator(signal_mwmr_"+i+"_initiator);" + CR;
+		netlist = netlist + copro.getCoprocName()+".p_vci_target(signal_mwmr_"+i+"_target);" + CR2;
+		netlist = netlist +copro.getCoprocName() +".p_from_coproc["+i+"](signal_fifo_"+i+"_from_ctrl);" + CR;
+netlist = netlist +copro.getCoprocName() +".p_to_coproc["+i+"](signal_fifo_"+i+"_to_ctrl);" + CR;
+//DG 5.9.
+//	netlist = netlist +copro.getCoprocName() +".status();" + CR;
+//	netlist = netlist +copro.getCoprocName() +".config();" + CR;
+i++;
+coproc_count++;
+          }
+	   
+	
+   //If there is a spy, add logger or stats to vci interface
+
+	    i=0;
+   for (AvatarCPU cpu : TopCellGenerator.syscams.getAllCPU()) { 
+       int number = cpu.getNo_proc();	
+	  if(cpu.getMonitored()==1){
+	  netlist=netlist+CR+
+	  "logger"+i+".p_clk(signal_clk);" +CR+
+	  "logger"+i+".p_resetn(signal_resetn);" +CR+	     
+	  "logger"+i+".p_vci(signal_vci_m["+number+"]);" +CR2;
+	  i++;
+	  }	
+	  
+   }
+   int j=0;
+  
+	for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM()) { 
+	    if (ram.getMonitored()==1){	
+		int number = number = ram.getIndex();
+		netlist += "logger"+i+".p_clk(signal_clk);" + CR;
+		netlist += "logger"+i+".p_resetn(signal_resetn);" + CR; 
+		netlist += "logger"+i+".p_vci(signal_vci_vciram"+number+");" + CR2;  	  
+		i++;   
+	    }	
+	    else{
+		
+		if (ram.getMonitored()==2){
+		    int number = number = ram.getIndex();	
+		    netlist += "mwmr_stats"+j+".p_clk(signal_clk);" + CR;
+		    netlist += "mwmr_stats"+j+".p_resetn(signal_resetn);" + CR; 
+		    netlist += "mwmr_stats"+j+".p_vci(signal_vci_vciram"+number+");" + CR2;		    
+		    j++;	      
+		}	 		
+	    }	   	   
+	}
+
+	//if (with_hw_accellerator>0){  
+
+	int p=0;
+	//for testing:   vci_synthetic_initiator.h and vci_synthetic_target.h    
+	//for (AvatarCoproMWMR HWAccelerator : TopCellGenerator.avatardd.getAllCoproMWMR()) {
+    /*    netlist += "mwmr"+HWAccelerator.getNo()+".p_clk(signal_clk);" + CR;
+    netlist += "mwmr"+HWAccelerator.getNo()+".p_resetn(signal_resetn);" + CR;
+    netlist += "mwmr"+HWAccelerator.getNo()+".p_vci_initiator(signal_mwmr"+HWAccelerator.getNo()+"_initiator);" + CR;
+    netlist += "	mwmr"+HWAccelerator.getNo()+".p_vci_target(signal_mwmr"+HWAccelerator.getNo()+"_target);" + CR;
+    netlist += "	mwmr"+HWAccelerator.getNo()+".p_from_coproc["+HWAccelerator.getNo()+"](signal_fifo_to_ctrl);" + CR;
+    netlist += "	mwmr"+HWAccelerator.getNo()+".p_to_coproc["+HWAccelerator.getNo()+"](signal_fifo_from_ctrl);" + CR;*/
+
+	/*  netlist += "mwmr"+p+".p_clk(signal_clk);" + CR;
+    netlist += "mwmr"+p+".p_resetn(signal_resetn);" + CR;
+    netlist += "mwmr"+p+".p_vci_initiator(signal_mwmr"+p+"_initiator);" + CR;
+    netlist += "	mwmr"+p+".p_vci_target(signal_mwmr"+p+"_target);" + CR;
+    netlist += "	mwmr"+p+".p_from_coproc["+p+"](signal_fifo_"+p+"_to_ctrl);" + CR;
+    netlist += "	mwmr"+p+".p_to_coproc["+p+"](signal_fifo_"+p+"_from_ctrl);" + CR;
+    }	 */   
+//	   }
+		
+	//generate trace file if marked trace option 
+	
+	if(tracing){
+		netlist += "sc_trace_file *tf;" + CR;
+	netlist += "tf=sc_create_vcd_trace_file(\"mytrace\");" + CR;
+	netlist += "sc_trace(tf,signal_clk,\"CLK\");" + CR;
+	netlist += "sc_trace(tf,signal_resetn,\"RESETN\");" + CR;
+
+	netlist += "sc_trace(tf, signal_vci_xicu,\"signal_vci_xicu\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_vcifdtrom,\"signal_vci_vcifdtrom\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_vcihetrom,\"signal_vci_vcihetrom\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_vcirom ,\"signal_vci_vcirom\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_vcisimhelper,\"signal_vci_vcisimhelper\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_vcirttimer ,\"signal_vci_vcirttimer\");" + CR;	    
+	netlist += "sc_trace(tf, signal_vci_vcifdaccessi,\"signal_vci_vcifdaccessi\");" + CR;
+	netlist += "sc_trace(tf,signal_vci_vcifdaccesst ,\"signal_vci_vcifdaccesst\");" + CR;
+	netlist += "sc_trace(tf,signal_vci_bdi ,\"signal_vci_bdi\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_bdt,\"signal_vci_bdt\");" + CR;
+	netlist += "sc_trace(tf, signal_vci_etherneti,\"signal_vci_etherneti\");" + CR;
+	netlist += "sc_trace(tf,signal_vci_ethernett ,\"signal_vci_ethernett\");" + CR;
+
+	for(i=0;i<TopCellGenerator.syscams.getNb_init();i++){ 
+	    netlist += "sc_trace(tf,signal_vci_m["+ i +"] ,\"signal_vci_m["+ i +"]\");" + CR;
+	}
+
+	i=0;
+	for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()) { 
+       
+	    netlist += "sc_trace(tf,signal_vci_tty"+tty.getNo_tty()+",\"TTY"+tty.getNo_tty()+"\");" + CR; 
+	    netlist += "sc_trace(tf,signal_xicu_irq["+ i +"] ,\"signal_xicu_irq["+ i +"]\");" + CR;    
+	    i++;
+	}
+    
+	netlist += "sc_trace(tf,signal_xicu_irq["+i+"] ,\"signal_xicu_irq["+i+"]\");" + CR;  
+	netlist += "sc_trace(tf,signal_xicu_irq["+i+"] ,\"signal_xicu_irq["+i+"]\");" + CR; 
+	netlist += "sc_trace(tf,signal_xicu_irq["+i+"] ,\"signal_xicu_irq["+i+"]\");" + CR; 
+    
+	for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM()) { 
+	    if (ram.getMonitored()==0){			
+		netlist += "sc_trace(tf,signal_vci_vciram"+ram.getIndex()+",\"Memory"+ram.getIndex()+"\");" + CR;
+	    }
+	    }	   
+    	}
+    netlist = netlist + "  sc_core::sc_start(sc_core::sc_time(0, sc_core::SC_NS));" + CR;
+    netlist = netlist + "  signal_resetn = false;" + CR;
+    netlist = netlist + "  sc_core::sc_start(sc_core::sc_time(1, sc_core::SC_NS));" + CR;
+    netlist = netlist + "  signal_resetn = true;" + CR;
+    netlist = netlist + "  sc_core::sc_start();" + CR;
+    if(tracing){
+    	netlist += "sc_close_vcd_trace_file(tf);" + CR;
+    	}
+    netlist = netlist + CR + "  return EXIT_SUCCESS;"+ CR;
+    netlist = netlist +"}" + CR;
+    return netlist;		
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
new file mode 100644
index 0000000000000000000000000000000000000000..bfe11d9f4857549764dc22fbb692779f62eaa9be
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
@@ -0,0 +1,96 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* this class produces the lines containing essentially the initial #includes; we include all potential components event if they are not used in the deployment diagram*/
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import java.util.List;
+
+import syscamstranslator.*;
+import ui.syscams.SysCAMSBlockTDF;
+import ui.syscams.SysCAMSPortConverter;
+import ui.syscams.SysCAMSPortTDF;
+
+/**
+ * Class Header
+ * En-tête des fichiers .h et .cpp
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class PrimitiveCode {
+	static private String codePrimitive;
+	static private String corpsCluster;
+	private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+
+	PrimitiveCode() {}
+
+	public static String getPrimitiveCode(SysCAMSBlockTDF tdf) {
+		if (tdf != null) {
+			codePrimitive = Header.getPrimitiveHeader(tdf) + Corps.getPrimitiveCorps(tdf);
+		} else {
+			codePrimitive = "";
+		}
+		return codePrimitive;
+	}
+	
+	public static String getClusterCorps(SysCAMSTCluster cluster) {
+		 if (cluster != null) {
+			 List<SysCAMSBlockTDF> blocks = cluster.getBlocks();
+			 
+			 corpsCluster = "//-------------------------------Header------------------------------------" + CR2
+						+ "#include <systemc-ams>" + CR2;
+			 
+			 for (SysCAMSBlockTDF b : blocks) {
+				 corpsCluster = corpsCluster + "#include \"" + b.getValue() + ".h\"" + CR;
+			 }
+			 corpsCluster = corpsCluster + CR;
+		 } else {
+			 corpsCluster = "";
+		 }
+		 return corpsCluster;
+	} 
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Signal.java b/src/main/java/syscamstranslator/toSysCAMS/Signal.java
new file mode 100644
index 0000000000000000000000000000000000000000..73fd281b10a21359155c5a0ca8a7f938055c3cec
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Signal.java
@@ -0,0 +1,163 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+/* This class generates the lines of the topcell where the signals are declared*/
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package ddtranslatorSoclib.toTopCell;
+
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
+
+public class Signal {
+
+	private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+	private final static String NAME_CLK = "signal_clk";
+	private static final String NAME_RST = "signal_resetn";
+
+	public static String getSignal() {
+		int nb_clusters = TopCellGenerator.syscams.getAllCrossbar().size();
+		// nb_clusters=2;
+		String signal = CR2 + "//-------------------------------signaux------------------------------------" + CR2;
+
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_m[cpus.size() + 1];" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_xicu(\"signal_vci_xicu\");" + CR;
+
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_vcifdtrom(\"signal_vci_vcifdtrom\");" + CR;
+		signal = signal + " caba::VciSignals<vci_param> signal_vci_vcihetrom(\"signal_vci_vcihetrom\");" + CR;
+		signal = signal + " caba::VciSignals<vci_param> signal_vci_vcirom(\"signal_vci_vcirom\");" + CR;
+		signal = signal + " caba::VciSignals<vci_param> signal_vci_vcisimhelper(\"signal_vci_vcisimhelper\");" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_vcirttimer(\"signal_vci_vcirttimer\");" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_vcilocks(\"signal_vci_vcilocks\");" + CR;
+		// signal = signal +"caba::VciSignals<vci_param>
+		// signal_vci_mwmr_ram(\"signal_vci_mwmr_ram\");"+ CR;
+		// signal = signal +"caba::VciSignals<vci_param>
+		// signal_vci_mwmrd_ram(\"signal_vci_mwmrd_ram\");"+ CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_vcifdaccessi;" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_vcifdaccesst;" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_bdi;" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_bdt;" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_etherneti;" + CR;
+		signal = signal + "caba::VciSignals<vci_param> signal_vci_ethernett;" + CR;
+		signal = signal + "" + CR;
+		signal = signal + "sc_clock signal_clk(\"signal_clk\");" + CR;
+		signal = signal + "sc_signal<bool>  signal_resetn(\"" + NAME_RST + "\");" + CR2;
+		int i = 0;
+		for (AvatarCoproMWMR copro : TopCellGenerator.syscams.getAllCoproMWMR()) {
+			signal = signal + "caba::VciSignals<vci_param> signal_mwmr_" + i + "_initiator;" + CR;
+			signal = signal + "caba::VciSignals<vci_param> signal_mwmr_" + i + "_target;" + CR;
+			signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_" + i + "_from_ctrl;" + CR;
+			signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_" + i + "_to_ctrl;" + CR;
+			i++;
+		}
+
+		if (TopCellGenerator.syscams.getAllCrossbar().size() == 0) {
+			for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM())
+				signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getIndex()
+						+ "(\"signal_vci_vciram" + ram.getIndex() + "\");" + CR2;
+			i = 0;
+
+			for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()) {
+				// signal = signal + "soclib::caba::VciSignals<vci_param>
+				// signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" +
+				// CR2;
+				signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty" + i + "(\"signal_vci_tty" + i
+						+ "\");" + CR2;
+				i++;
+			}
+
+			signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
+			System.out.print("number of processors : " + TopCellGenerator.syscams.getNbCPU() + "\n");
+		}
+
+		else {
+			for (AvatarRAM ram : TopCellGenerator.syscams.getAllRAM())
+				signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getIndex()
+						+ "(\"signal_vci_vciram" + ram.getIndex() + "\");" + CR2;
+			i = 0;
+			for (AvatarTTY tty : TopCellGenerator.syscams.getAllTTY()) {
+				// signal = signal + "soclib::caba::VciSignals<vci_param>
+				// signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" +
+				// CR2;
+				signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty" + i + "(\"signal_vci_tty" + i
+						+ "\");" + CR2;
+				i++;
+			}
+			int p = 0;
+			// if (with_hw_accellerator>0){ //DG 23.08.
+			for (AvatarCoproMWMR HWAccelerator : TopCellGenerator.syscams.getAllCoproMWMR()) {
+				// les accellerateurs sont caches car apparaissent uniquement au niveau
+				// DIPLODOCUS
+				// signal = signal + " soclib::caba::VciSignals<vci_param>
+				// signal_mwmr"+HWAccelerator.getNo()+"_target(\"signal_mwmr"+HWAccelerator.getNo()+"_target\""+CR;
+				// signal = signal + " soclib::caba::VciSignals<vci_param>
+				// signal_mwmr"+HWAccelerator.getNo()+"_initiator(\"signal_mwmr"+HWAccelerator.getNo()+"_initiator\""
+				// +CR;
+
+				// signal = signal + " soclib::caba::FifoSignals<uint32_t>
+				// signal_fifo_to_ctrl"+HWAccelerator.getNo()+"(\"signal_fifo_to_ctrl"+HWAccelerator.getNo()+"\");"+CR;
+				// signal = signal + " soclib::caba::FifoSignals<uint32_t>
+				// signal_fifo_from_ctrl"+HWAccelerator.getNo()+"(\"signal_fifo_from_ctrl"+HWAccelerator.getNo()+"\");"+CR;
+
+				signal = signal + "	soclib::caba::VciSignals<vci_param> signal_mwmr" + p + "_target(\"signal_mwmr" + p
+						+ "_target\"" + CR;
+				signal = signal + "	soclib::caba::VciSignals<vci_param> signal_mwmr" + p + "_initiator(\"signal_mwmr"
+						+ p + "_initiator\"" + CR;
+
+				signal = signal + "	soclib::caba::FifoSignals<uint32_t> signal_fifo_to_ctrl" + p
+						+ "(\"signal_fifo_to_ctrl" + p + "\");" + CR;
+				signal = signal + "       soclib::caba::FifoSignals<uint32_t> signal_fifo_from_ctrl" + p
+						+ "(\"signal_fifo_from_ctrl" + p + "\");" + CR;
+				p++;
+			}
+
+			signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
+			// System.out.print("number of processors : " +
+			// TopCellGenerator.avatardd.getNbCPU()+"\n");
+			System.out.print("number of clusters : " + TopCellGenerator.syscams.getNbClusters() + "\n");
+
+		}
+		return signal;
+	}
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/Simulation.java b/src/main/java/syscamstranslator/toSysCAMS/Simulation.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ab750f451d4d48f426684f12ef8f4a29ebba867
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/Simulation.java
@@ -0,0 +1,74 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * Daniela Genius, Lip6, UMR 7606 
+ * 
+ * ludovic.apvrille AT enst.fr
+ * daniela.genius@lip6.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package ddtranslatorSoclib.toTopCell;
+
+public class Simulation {
+	
+    private  static String simulation;
+	
+    private final static String CR = "\n";
+	private final static String CR2 = "\n\n";
+    
+    public Simulation(){
+    }
+
+    public static String getSimulation(){
+		 simulation  = CR2+ CR2+ 
+		     "/***************************************************************************" +	CR +
+		     "----------------------------simulation-------------------------" + CR +
+		     "***************************************************************************/"+CR2 ;
+		 simulation =simulation+"int sc_main (int argc, char *argv[])" + CR + "{" + CR;
+		 simulation = simulation +"       try {" + CR +"         return _main(argc, argv);" + CR + "    }" + CR2;
+		 simulation =simulation +"       catch (std::exception &e) {" + CR + "            std::cout << e.what() << std::endl;" + CR + "            throw;"+ CR+"    }"; 
+		simulation =simulation+" catch (...) {" + CR;
+		simulation =simulation+"std::cout << \"Unknown exception occured\" << std::endl;" + CR;
+		simulation =simulation+"throw;" + CR;
+		simulation =simulation+"}" + CR;
+		simulation =  simulation+ CR +"       return 1;"+ CR + "}"  ;		 
+		return simulation;
+    }
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
new file mode 100644
index 0000000000000000000000000000000000000000..36a2a6aebf43fa06354fdd1bd77d0e43e2b4b11c
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
@@ -0,0 +1,154 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+  Daniela Genius, Lip6, UMR 7606 
+
+  ludovic.apvrille AT enst.fr
+  daniela.genius@lip6.fr
+
+  This software is a computer program whose purpose is to allow the 
+  edition of TURTLE analysis, design and deployment diagrams, to 
+  allow the generation of RT-LOTOS or Java code from this diagram, 
+  and at last to allow the analysis of formal validation traces 
+  obtained from external tools, e.g. RTL from LAAS-CNRS and CADP 
+  from INRIA Rhone-Alpes.
+
+  This software is governed by the CeCILL  license under French law and
+  abiding by the rules of distribution of free software.  You can  use, 
+  modify and/ or redistribute the software under the terms of the CeCILL
+  license as circulated by CEA, CNRS and INRIA at the following URL
+  "http://www.cecill.info". 
+
+  As a counterpart to the access to the source code and  rights to copy,
+  modify and redistribute granted by the license, users are provided only
+  with a limited warranty  and the software's author,  the holder of the
+  economic rights,  and the successive licensors  have only  limited
+  liability. 
+
+  In this respect, the user's attention is drawn to the risks associated
+  with loading,  using,  modifying and/or developing or reproducing the
+  software by the user in light of its specific status of free software,
+  that may mean  that it is complicated to manipulate,  and  that  also
+  therefore means  that it is reserved for developers  and  experienced
+  professionals having in-depth computer knowledge. Users are therefore
+  encouraged to load and test the software's suitability as regards their
+  requirements in conditions enabling the security of their systems and/or 
+  data to be ensured and,  more generally, to use and operate it in the 
+  same conditions as regards security. 
+
+  The fact that you are presently reading this means that you have had
+  knowledge of the CeCILL license and that you accept its terms.
+*/
+
+/* Generator of the top cell for simulation with SoCLib virtual component 
+   library */
+
+/* authors: v1.0 Raja GATGOUT 2014
+            v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import syscamstranslator.*;
+import syscamstranslator.toSysCAMS.*;
+import ui.syscams.SysCAMSBlockTDF;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class TopCellGenerator {
+	// --------------- accessing Avatardd -----------------
+	public static SysCAMSSpecification syscams;
+	// ---------------------------------------------------
+
+	public String VCIparameters;
+	public String config;
+	public String mainFile;
+	public String src;
+	public String top;
+	public String deployinfo;
+	public String deployinfo_map;
+	public String deployinfo_ram;
+	public String platform_desc;
+	public String procinfo;
+	public String nbproc;
+	public final String DOTH = ".h";
+	public final String DOTCPP = ".cpp";
+	public final String SYSTEM_INCLUDE = "#include \"systemc.h\"";
+	public final String CR = "\n";
+	public final String CR2 = "\n\n";
+	public final String SCCR = ";\n";
+	public final String EFCR = "}\n";
+	public final String EFCR2 = "}\n\n";
+	public final String EF = "}";
+	public final String COTE = "";
+	public final String NAME_RST = "signal_resetn";
+	public final String TYPEDEF = "typedef";
+
+	private final static String GENERATED_PATH = "generated_topcell" + File.separator;
+	private boolean tracing;
+
+	public TopCellGenerator(SysCAMSSpecification sys, boolean _tracing) {
+		syscams = sys;
+		tracing = _tracing;
+	}
+
+	public String generateTopCell(SysCAMSTBlockTDF tdf) {
+		/* first test validity of the hardware platform */
+		if (TopCellGenerator.syscams.getNbCluster() == 0) {
+			System.out.println("***Warning: require at least one cluster***");
+		}
+		if (TopCellGenerator.syscams.getNbBlockTDF() == 0) {
+			System.out.println("***Warning: require at least one TDF block***");
+		}
+		if (TopCellGenerator.syscams.getNbPortTDF() == 0) {
+			System.out.println("***Warning: require at least one TDF port***");
+		}
+		if (TopCellGenerator.syscams.getNbBlockDE() == 0) {
+			System.out.println("***Warning: require at least one DE block***");
+		}
+		if (TopCellGenerator.syscams.getNbPortDE() == 0) {
+			System.out.println("***Warning: require at least one DE port***");
+		}
+		if (TopCellGenerator.syscams.getNbPortConverter() == 0) {
+			System.out.println("***Warning: require at least one converter port***");
+		}
+		String top = Header.getPrimitiveHeader(tdf) + Corps.getPrimitiveCorps(tdf);
+		return (top);
+	}
+
+	public static void saveFile(String path) {
+//		try {
+//			System.err.println(path + GENERATED_PATH + "top.cc");
+//			FileWriter fw = new FileWriter(path + GENERATED_PATH + "/top.cc");
+//			top = generateTopCell();
+//			fw.write(top);
+//			fw.close();
+//		} catch (IOException ex) {
+//		}
+		saveFileBlockTDF(path);
+	}
+
+	public static void saveFileBlockTDF(String path) {
+		LinkedList<SysCAMSTCluster> clusters = TopCellGenerator.syscams.getAllCluster();
+		String code;
+		
+		for (SysCAMSTCluster c : clusters) {
+			List<SysCAMSBlockTDF> tdf = c.getBlocks();
+			for (SysCAMSBlockTDF t : tdf) {
+				try {
+					System.err.println(path + GENERATED_PATH + t.getValue() + ".h");
+					FileWriter fw = new FileWriter(path + GENERATED_PATH + "/" + t.getValue() + ".h");
+					code = PrimitiveCode.getPrimitiveCode(t);
+					fw.write(code);
+					fw.close();
+				} catch (Exception ex) {
+					ex.printStackTrace();
+				}
+			}
+		}
+	}
+	
+	public static void main (String[] args) {
+		saveFile("/main/syscamstranslator/");
+	}
+}
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index 22750ac6399d697c54de3ff5cda796c11f2006a3..6f318d57277391fc51c4084ebb7b439ded20787c 100755
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -911,8 +911,8 @@ public class ActionPerformer {
 	    	// SystemC-AMS
         } else if (command.equals(mgui.actions[TGUIAction.CAMS_EDIT].getActionCommand())) {
             mgui.actionOnButton(TGComponentManager.EDIT, -1);
-        } /*else if (command.equals(mgui.actions[TGUIAction.CAMS_BLOCK_TDF].getActionCommand())) {
-	         mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_BLOCK_TDF);
+        } else if (command.equals(mgui.actions[TGUIAction.CAMS_BLOCK_TDF].getActionCommand())) {
+            mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_BLOCK_TDF);
         } else if (command.equals(mgui.actions[TGUIAction.CAMS_BLOCK_DE].getActionCommand())) {
         	mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_BLOCK_DE);
         } else if (command.equals(mgui.actions[TGUIAction.CAMS_CONNECTOR].getActionCommand())) {
@@ -927,7 +927,7 @@ public class ActionPerformer {
         	mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_CLUSTER);
 
             // Attack Tree Diagrams
-	    } */ else if (command.equals(mgui.actions[TGUIAction.ATD_BLOCK].getActionCommand())) {
+        } else if (command.equals(mgui.actions[TGUIAction.ATD_BLOCK].getActionCommand())) {
             mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ATD_BLOCK);
         } else if (command.equals(mgui.actions[TGUIAction.ATD_ATTACK].getActionCommand())) {
             mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ATD_ATTACK);
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index d79e897533ab4850e6aed4ba112326f35f4953f9..0f8e24046f60f63f4d45779a692c0fcb07b5af88 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -104,7 +104,7 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
 import ui.ftd.FaultTreeDiagramPanel;
 import graph.RG;
-//import ui.het.CAMSBlockDiagramPanel;
+import ui.syscams.SysCAMSComponentTaskDiagramPanel;
 import ui.iod.InteractionOverviewDiagramPanel;
 import ui.ncdd.NCDiagramPanel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
@@ -6222,14 +6222,14 @@ public class GTURTLEModeling {
                     }
                 }
 
-            } /*else if (tdp instanceof CAMSBlockDiagramPanel) {  //ajout CD 24.07----mark
-                nl = doc.getElementsByTagName("CAMSBlockDiagramPanelCopy");
+            } else if (tdp instanceof SysCAMSComponentTaskDiagramPanel) { 
+                nl = doc.getElementsByTagName("SysCAMSComponentTaskDiagramPanelCopy");
 
                 if (nl == null) {
                     return;
                 }
 
-                CAMSBlockDiagramPanel camsp = (CAMSBlockDiagramPanel) tdp;
+                SysCAMSComponentTaskDiagramPanel camsp = (SysCAMSComponentTaskDiagramPanel) tdp;
 
                 for (i = 0; i < nl.getLength(); i++) {
                     adn = nl.item(i);
@@ -6252,7 +6252,7 @@ public class GTURTLEModeling {
                     }
                 }
 
-            } */ else if (tdp instanceof AvatarADPanel) {
+            } else if (tdp instanceof AvatarADPanel) {
                 nl = doc.getElementsByTagName("AvatarADPanelCopy");
 
                 if (nl == null) {
@@ -6454,9 +6454,9 @@ public class GTURTLEModeling {
             loadAvatarMethodology(node);
         } else if (type.compareTo("Sysmlsec Methodology") == 0) {
             loadSysmlsecMethodology(node);
-        } /*else if (type.compareTo("SystemC-AMS") == 0) {
-            loadSystemCAMS(node);
-        }*/ else if (type.compareTo("TML Design") == 0) {
+        } else if (type.compareTo("SystemC-AMS") == 0) {
+            loadSysCAMS(node);
+        } else if (type.compareTo("TML Design") == 0) {
             loadTMLDesign(node);
         } else if (type.compareTo("TML Component Design") == 0) {
             loadTMLComponentDesign(node);
@@ -6986,16 +6986,15 @@ public class GTURTLEModeling {
         }
     }
 
-/*  public void loadSystemCAMS(Node node) throws MalformedModelingException, SAXException {
+		public void loadSysCAMS(Node node) throws MalformedModelingException, SAXException {
         Element elt = (Element) node;
         String nameTab;
         NodeList diagramNl;
         int indexDesign;
 
-
         nameTab = elt.getAttribute("nameTab");
 
-        indexDesign = mgui.createSystemCAMS(nameTab);
+        indexDesign = mgui.createSysCAMSComponentDesign(nameTab);
 
         diagramNl = node.getChildNodes();
 
@@ -7004,15 +7003,15 @@ public class GTURTLEModeling {
             node = diagramNl.item(j);
             if (node.getNodeType() == Node.ELEMENT_NODE) {
                 elt = (Element) node;
-                if (elt.getTagName().compareTo("SystemCAMSDiagramPanel") == 0) {
+                if (elt.getTagName().compareTo("SysCAMSComponentTaskDiagramPanel") == 0) {
                     // Class diagram
                     TraceManager.addDev("Loading SystemC-AMS");
-                    loadSystemCAMSDiagram(elt, indexDesign);
+                    loadSysCAMSDiagram(elt, indexDesign);
                     TraceManager.addDev("End loading SystemC-AMS");
                 }
             }
         }
-	}*/
+    }
 
     public void loadTMLDesign(Node node) throws MalformedModelingException, SAXException {
         Element elt = (Element) node;
@@ -7288,10 +7287,10 @@ public class GTURTLEModeling {
             ((AvatarADPanel) tdp).setConnectorsToFront();
         }
 
-	/* if (tdp instanceof CAMSBlockDiagramPanel) {
+        if (tdp instanceof SysCAMSComponentTaskDiagramPanel) {
             //TraceManager.addDev("Connectors...");
-            ((CAMSBlockDiagramPanel) tdp).setConnectorsToFront();
-	    }*/
+            ((SysCAMSComponentTaskDiagramPanel) tdp).setConnectorsToFront();
+        }
     }
 
     // AVATAR
@@ -7509,21 +7508,18 @@ public class GTURTLEModeling {
         loadDiagram(elt, tdp);
     }
 
-/*public void loadSystemCAMSDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
-        //ajout CD
+    public void loadSysCAMSDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
         String name;
         TDiagramPanel tdp;
 
         // class diagram name
         name = elt.getAttribute("name");
-        mgui.setSystemCAMSDiagramName(indexDesign, name);
+        mgui.setSysCAMSComponentTaskDiagramName(indexDesign, name);
         tdp = mgui.getMainTDiagramPanel(indexDesign);
         tdp.setName(name);
 
-        //TraceManager.addDev("tdp=" + tdp.getName());
-
         loadDiagram(elt, tdp);
-	}*/
+    }
 
     public void loadTMLTaskDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
 
@@ -9255,7 +9251,7 @@ public class GTURTLEModeling {
         }
     }
 
-/*    public boolean checkSyntaxSystemCAMS(Vector<TGComponent> blocksToTakeIntoAccount, SystemCAMSPanel scp, boolean optimize) { //ajout CD 04/07 FIXME
+    /*public boolean checkSyntaxSystemCAMS(Vector<TGComponent> blocksToTakeIntoAccount, SystemCAMSPanel scp, boolean optimize) { //ajout CD 04/07 FIXME
         //     List<TMLError> warningsOptimize = new ArrayList<TMLError>();
         //     warnings = new LinkedList<CheckingError> ();
         //     mgui.setMode(MainGUI.VIEW_SUGG_DESIGN_KO);
@@ -9286,7 +9282,7 @@ public class GTURTLEModeling {
         //         mgui.setMode(MainGUI.GEN_DESIGN_OK);
         return true;
         //     }
-	}*/
+    }*/
 
     public boolean checkSyntaxTMLMapping(Vector<TGComponent> nodesToTakeIntoAccount, TMLArchiPanel tmlap, boolean optimize) {
         List<TMLError> warningsOptimize = new ArrayList<TMLError>();
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index d079fb56416131eba690924f6da11c3526ea72f3..34393eb2821b35a682b9e6da8526c2d3d10b07ab 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -70,7 +70,6 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
 import ui.file.*;
 import ui.ftd.FaultTreeDiagramPanel;
-
 import ui.interactivesimulation.JFrameInteractiveSimulation;
 import ui.interactivesimulation.SimulationTransaction;
 import ui.iod.InteractionOverviewDiagramPanel;
@@ -84,7 +83,6 @@ import ui.tmlcd.TMLTaskDiagramPanel;
 import ui.tmlcompd.TMLCCompositeComponent;
 import ui.tmlcompd.TMLComponentTaskDiagramPanel;
 import ui.tmlcp.TMLCPPanel;
-//import ui.tmldd.TMLArchiCAMSNode;
 import ui.tmldd.TMLArchiDiagramPanel;
 import ui.tmlsd.TMLSDPanel;
 import ui.tree.DiagramTreeModel;
@@ -94,6 +92,7 @@ import ui.ucd.UseCaseDiagramPanel;
 import ui.util.DefaultText;
 import ui.util.IconManager;
 import ui.window.*;
+import ui.syscams.*;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -1060,6 +1059,22 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return index;
     }
 
+    public int addSysCAMSComponentDesignPanel(String name, int index) { 
+        if (index == -1) {
+            index = tabs.size();
+        }
+        SysCAMSComponentDesignPanel sccdp = new SysCAMSComponentDesignPanel(this);
+        tabs.add(index, sccdp);
+        mainTabbedPane.add(sccdp.tabbedPane, index);
+        mainTabbedPane.setToolTipTextAt(index, "Open SystemC-AMS design diagrams");
+        mainTabbedPane.setTitleAt(index, name);
+        mainTabbedPane.setIconAt(index, IconManager.imgic60);
+        //mainTabbedPane.addTab(name, IconManager.imgic14, dp.tabbedPane, "Opens design diagrams");
+        sccdp.init();
+        //ystem.out.println("Design added");
+        return index;
+    }
+
     //Return the list of all the TMLArchiDiagramPanels
     public Vector<TMLArchiPanel> getTMLArchiDiagramPanels() {
 
@@ -1454,11 +1469,11 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return index;
     }
 
-    /* public int createSystemCAMS(String name) { //ajout CD
-        int index = addSystemCAMSPanel(name, -1);
+		public int createSysCAMSComponentDesign(String name) {
+        int index = addSysCAMSComponentDesignPanel(name, -1);
         mainTabbedPane.setSelectedIndex(index);
         return index;
-	}*/
+    }
 
     public int createADD(String name) {
         int index = addADDPanel(name, -1);
@@ -1847,14 +1862,14 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         //frame.repaint();
     }
 
-    /*   public void newSystemCAMS() {//ajout CD
-        //TraceManager.addDev("NEW DIPLO Architecture");
-        addSystemCAMSPanel("SystemC-AMS", -1);
+     public void newSysCAMS() {
+        //TraceManager.addDev("NEW DESIGN");
+        addSysCAMSComponentDesignPanel("SystemC_AMS", -1);
         tabs.elementAt(tabs.size() - 1).tabbedPane.setSelectedIndex(0);
         mainTabbedPane.setSelectedIndex(tabs.size() - 1);
         //paneAction(null);
         //frame.repaint();
-	}*/
+    }
 
     public void newADD() {
         //TraceManager.addDev("NEW Avatar deployment");
@@ -3789,46 +3804,45 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                     }
                 }
             }
-        }/* else if (tp instanceof SystemCAMSPanel) { //Ajout CD
-
-            SystemCAMSPanel camsp = (SystemCAMSPanel) tp;
-            JDialogSelectSystemCAMSBlock.validated = camsp.validated;
-            JDialogSelectSystemCAMSBlock.ignored = camsp.ignored;
-            Vector<TGComponent> camsBlocksToValidate = new Vector<TGComponent>();
-            JDialogSelectSystemCAMSBlock jdsscb = new JDialogSelectSystemCAMSBlock(frame, camsBlocksToValidate, camsp.camsbdp.getComponentList(), "Block Parameter");
-            if (!automatic) {
-                GraphicLib.centerOnParent(jdsscb);
-                jdsscb.setVisible(true);
-            } else {
-                jdsscb.closeDialog();
-            }
-
-            if (camsBlocksToValidate.size() > 0) {
-                camsp.validated = JDialogSelectSystemCAMSBlock.validated;
-                camsp.ignored = JDialogSelectSystemCAMSBlock.ignored;
-                expandToWarnings();
-                expandToErrors();
-                if (b) {
-                    setMode(MainGUI.GEN_SYSTEMC_OK);
-                    setMode(MainGUI.MODEL_OK);
-                    ret = true;
-                    if (!automatic) {
-                        JOptionPane.showMessageDialog(frame,
-                                "0 error, " + getCheckingWarnings().size() + " warning(s). You can now perform verifications (safety, security, performance) or generate executable code",
-                                "Syntax analysis successful on SystemC-AMS",
-                                JOptionPane.INFORMATION_MESSAGE);
-                    }
-                } else {
-                    if (!automatic) {
-                        JOptionPane.showMessageDialog(frame,
-                                "The SystemC-AMS contains several errors",
-                                "Syntax analysis failed",
-                                JOptionPane.INFORMATION_MESSAGE);
-                    }
-                }
-            }
-
-        }*/else if (tp instanceof TMLArchiPanel) {
+        } else if (tp instanceof SysCAMSComponentDesignPanel) {
+        	SysCAMSComponentDesignPanel syscamscdp = (SysCAMSComponentDesignPanel) tp;
+        	JDialogSelectSysCAMSComponent.validated = syscamscdp.validated;
+        	JDialogSelectSysCAMSComponent.ignored = syscamscdp.ignored;
+        	Vector<TGComponent> syscamsComponentsToValidate = new Vector<TGComponent>();
+        	JDialogSelectSysCAMSComponent jdssyscamsc = new JDialogSelectSysCAMSComponent(frame, syscamsComponentsToValidate, syscamscdp.syscamsctdp.getComponentList(), "Choosing SystemC-AMS components to validate");
+        	if (!automatic) {
+        		GraphicLib.centerOnParent(jdssyscamsc);
+        		jdssyscamsc.setVisible(true); // Blocked until dialog has been closed
+        	} else {
+        		jdssyscamsc.closeDialog();
+        	}
+        	if (syscamsComponentsToValidate.size() > 0) {
+        		syscamscdp.validated = JDialogSelectSysCAMSComponent.validated;
+        		syscamscdp.ignored = JDialogSelectSysCAMSComponent.ignored;
+//        		b = gtm.translateSysCAMSComponentDesign(syscamsComponentsToValidate, syscamscdp, jdssyscamsc.getOptimize());
+        		expandToWarnings();
+        		expandToErrors();
+        		if (b) {
+        			//setMode(MainGUI.MODEL_OK);
+        			setMode(MainGUI.GEN_SYSTEMC_OK);
+        			setMode(MainGUI.MODEL_OK);
+        			ret = true;
+        			if (!automatic) {
+        				JOptionPane.showMessageDialog(frame,
+        						"0 error, " + getCheckingWarnings().size() + " warning(s). You can now generate make proofs (safety, security and performance) or generate executable code",
+        						"Syntax analysis successful on SystemC-AMS designs",
+        						JOptionPane.INFORMATION_MESSAGE);
+        			}
+        		} else {
+        			if (!automatic) {
+        				JOptionPane.showMessageDialog(frame,
+        						"The SystemC-AMS design contains several errors",
+        						"Syntax analysis failed",
+        						JOptionPane.INFORMATION_MESSAGE);
+        			}
+        		}
+        	}
+        } else if (tp instanceof TMLArchiPanel) {
             tmlap = (TMLArchiPanel) tp;
             JDialogSelectTMLNodes.validated = tmlap.validated;
             JDialogSelectTMLNodes.ignored = tmlap.ignored;
@@ -6068,6 +6082,34 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
 
         return ll;
     }
+    
+    public List<TGComponent> getAllSysCAMSComponents() {
+    	TURTLEPanel tp;
+    	List<TGComponent> ll = new LinkedList<TGComponent>();
+    	
+    	for (int i = 0; i < tabs.size(); i++) {
+    		tp = tabs.elementAt(i);
+    		
+    		if (tp instanceof SysCAMSComponentDesignPanel) {
+    			ll.addAll(((SysCAMSComponentDesignPanel) tp).syscamsctdp.getComponentList());
+    		}
+    	}
+    	
+    	return ll;
+    }
+
+    public ArrayList<SysCAMSComponentTaskDiagramPanel> getAllPanelsReferencingSysCAMSCompositeComponent(SysCAMSCompositeComponent syscamscc) {
+        TURTLEPanel tp;
+        ArrayList<SysCAMSComponentTaskDiagramPanel> foundPanels = new ArrayList<SysCAMSComponentTaskDiagramPanel>();
+
+        for (int i = 0; i < tabs.size(); i++) {
+            tp = tabs.elementAt(i);
+            if (tp instanceof SysCAMSComponentDesignPanel) {
+                ((SysCAMSComponentDesignPanel) tp).syscamsctdp.getPanelsUsingAComponent(syscamscc, foundPanels);
+            }
+        }
+        return foundPanels;
+    }
 
     public void removeTClass(TURTLEPanel tp, String s) {
         if (!(tp instanceof DesignPanel)) {
@@ -6207,6 +6249,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         }
     }
 
+		public void updateReferenceToSysCAMSCompositeComponent(SysCAMSCompositeComponent tmlcc) {
+    	TURTLEPanel tp;
+    	
+    	for (int i = 0; i < tabs.size(); i++) {
+    		tp = tabs.elementAt(i);
+    		if (tp instanceof SysCAMSComponentDesignPanel) {
+    			((SysCAMSComponentDesignPanel) tp).syscamsctdp.updateReferenceToSysCAMSCompositeComponent(tmlcc);
+    		}
+    	}
+    }
+
     public TMLCCompositeComponent getCompositeComponent(String name) {
         int index = name.indexOf("::");
         if (index == -1) {
@@ -6226,6 +6279,25 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return ((TMLComponentDesignPanel) (tp)).tmlctdp.getCompositeComponentByName(componentName);
     }
 
+		public SysCAMSCompositeComponent getSysCAMSCompositeComponent(String name) {
+    	int index = name.indexOf("::");
+    	if (index == -1) {
+    		return null;
+    	}
+    	
+    	String panelName = name.substring(0, index);
+    	String componentName = name.substring(index + 2, name.length());
+    	
+    	TURTLEPanel tp = getTURTLEPanel(panelName);
+    	
+    	if ((tp == null) || (!(tp instanceof SysCAMSComponentDesignPanel))) {
+    		return null;
+    	}
+    	
+    	return ((SysCAMSComponentDesignPanel) (tp)).syscamsctdp.getCompositeComponentByName(componentName);
+    }
+
+
     public AvatarSMDPanel getAvatarSMDPanel(int indexDesign, String name) {
 
         TURTLEPanel tp = tabs.elementAt(indexDesign);
@@ -6320,10 +6392,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         tp.tabbedPane.setTitleAt(0, name);
     }
 
-    /*  public void setSystemCAMSDiagramName(int indexDesign, String name) {
+    public void setSystemCAMSDiagramName(int indexDesign, String name) {
         TURTLEPanel tp = tabs.elementAt(indexDesign);
         tp.tabbedPane.setTitleAt(0, name);
-	}*/
+    }
 
     public void setSysmlsecMethodologyDiagramName(int indexDesign, String name) {
         TURTLEPanel tp = tabs.elementAt(indexDesign);
@@ -6340,6 +6412,11 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         tp.tabbedPane.setTitleAt(0, name);
     }
 
+		public void setSysCAMSComponentTaskDiagramName(int indexDesign, String name) {
+    	TURTLEPanel tp = tabs.elementAt(indexDesign);
+    	tp.tabbedPane.setTitleAt(0, name);
+    }
+
     public void setTMLArchitectureDiagramName(int indexDesign, String name) {
         TURTLEPanel tp = tabs.elementAt(indexDesign);
         tp.tabbedPane.setTitleAt(0, name);
@@ -7866,6 +7943,36 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return false;
     }
 
+		public boolean newSysCAMSComponentTaskName(TURTLEPanel tp, String old, String niou) {
+    	JTabbedPane jtp = tp.tabbedPane;
+    	for (int i = 0; i < jtp.getTabCount(); i++) {
+    		if (jtp.getTitleAt(i).equals(niou)) {
+    			return false;
+    		}
+    	}
+    	TraceManager.addDev("old " + old + " niou " + niou);
+    	for (int i = 0; i < jtp.getTabCount(); i++) {
+    		TraceManager.addDev("Tab " + i + " = " + mainTabbedPane.getTitleAt(i));
+    		if (jtp.getTitleAt(i).equals(old)) {
+    			jtp.setTitleAt(i, niou);
+    			jtp.setToolTipTextAt(i, "Opens the SystemC-AMS diagram of " + niou);
+    			TDiagramPanel tdp;
+    			//change panel name
+    			for (int j = 0; j < tp.panels.size(); j++) {
+    				tdp = tp.panels.elementAt(j);
+    				if (tdp.getName().equals(old)) {
+    					tdp.setName(niou);
+    				}
+    			}
+    			
+    			return true;
+    		}
+    	}
+    	// internal error
+    	ErrorGUI.exit(ErrorGUI.ERROR_TAB);
+    	return false;
+    }
+
     public void cloneTab(int index) {
         String s = gtm.makeXMLFromTurtleModeling(index, "_cloned");
         try {
@@ -8783,7 +8890,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         private JPopupMenu menu;
 
         private JMenuItem rename, remove, moveRight, moveLeft, newDesign, newAnalysis, newDeployment, newRequirement/*, newTMLDesign*/, newTMLComponentDesign, newTMLArchi, newProactiveDesign, newTURTLEOSDesign,
-                newNCDesign, sort, clone, newAttackTree, newFaultTree, newAVATARBD, newAVATARRequirement, newMAD, newTMLCP, newTMLMethodo, newAvatarMethodo, newAVATARDD, newSysmlsecMethodo, newSystemCAMS;
+                newNCDesign, sort, clone, newAttackTree, newFaultTree, newAVATARBD, newAVATARRequirement, newMAD, newTMLCP, newTMLMethodo, newAvatarMethodo, newAVATARDD, newSysmlsecMethodo, newSysCAMS;
         private JMenuItem newAVATARAnalysis;
 
         public PopupListener(MainGUI _mgui) {
@@ -8841,7 +8948,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
             newTMLComponentDesign = createMenuItem("New Partitioning - Functional view");
             newTMLArchi = createMenuItem("New Partitioning - Architecture and Mapping");
             newTMLCP = createMenuItem("New Partitioning - Communication Pattern");
-            newSystemCAMS = createMenuItem("New SystemC-AMS Block Diagram"); //ajout CD
+            newSysCAMS = createMenuItem("New SystemC-AMS Block Diagram"); //ajout CD
             newProactiveDesign = createMenuItem("New Proactive Design");
             newTURTLEOSDesign = createMenuItem("New TURTLE-OS Design");
             newNCDesign = createMenuItem("New Network Calculus Design");
@@ -8928,7 +9035,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                     menu.add(newTMLCP);
                     menu.add(newTMLArchi);
                     menu.addSeparator();
-                    menu.add(newSystemCAMS);//ajout CD
+                    menu.add(newSysCAMS);
                     menu.addSeparator();
                 }
             }
@@ -9076,10 +9183,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                 } else if (e.getSource() == newAVATARAnalysis) {
                     ModeManager.setMode(CREATE_NEW_PANEL, actions, mainBar, mgui);
                     mgui.newAvatarAnalysis();
-                } /*else if (e.getSource() == newSystemCAMS) { //ajout CD
+                } else if (e.getSource() == newSysCAMS) {
                     ModeManager.setMode(CREATE_NEW_PANEL, actions, mainBar, mgui);
-                    mgui.newSystemCAMS();
-		    }*/
+                    mgui.newSysCAMS();
+                }
             }
         };
     }
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index fe0c5c52213ce8f5af6637fca6dc86122aefc78b..60c9db0282f61a3f8ef1a9b311b7180a3dc65109 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -52,10 +52,10 @@ import ui.avatarmad.AvatarMADAssumption;
 import ui.avatarrd.AvatarRDRequirement;
 import ui.avatarsmd.AvatarSMDState;
 import ui.cd.*;
-/*import ui.het.CAMSBlock;
-import ui.het.CAMSBlockConnector;
-import ui.het.CAMSBlockDiagramPanel;
-import ui.het.CAMSConnectingPoint;*/
+import ui.syscams.SysCAMSBlockDE;
+import ui.syscams.SysCAMSBlockTDF;
+import ui.syscams.SysCAMSCompositeComponent;
+import ui.syscams.SysCAMSRecordComponent;
 import ui.ncdd.NCEqNode;
 import ui.ncdd.NCRouteArtifact;
 import ui.ncdd.NCSwitchNode;
@@ -114,7 +114,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     protected List<TGComponent> componentList;
     protected TGConnectingPoint selectedConnectingPoint;
-    //protected CAMSConnectingPoint selectedCAMSConnectingPoints;
+    /*protected CAMSConnectingPoint selectedCAMSConnectingPoints;*/
     protected TGComponent componentPointed;
     protected TGComponent componentPopup;
     protected TToolBar ttb;
@@ -184,7 +184,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     protected int y2;
     protected Vector<Point> listPoint;
     protected TGConnectingPoint p1, p2;
-    //    protected CAMSConnectingPoint cp1, cp2;
+   /* protected CAMSConnectingPoint cp1, cp2;*/
     protected int type;
 
     // For component selection
@@ -503,8 +503,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             if (this.javaVisible && (tgc.hasPostJavaCode() || tgc.hasPreJavaCode()))
                 tgc.drawJavaCode(g);
 
-	    //            if (this instanceof CAMSBlockDiagramPanel) //Connecting points should always be visible in System-C AMS panels
-	    //   tgc.drawTGConnectingPoint(g, this.type);
+            /*if (this instanceof CAMSBlockDiagramPanel) //Connecting points should always be visible in System-C AMS panels
+                tgc.drawTGConnectingPoint(g, this.type);*/
         }
 
         // Draw name of component selected
@@ -948,9 +948,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         return selectedConnectingPoint;
     }
 
-    /*    public CAMSConnectingPoint getSelectedCAMSConnectingPoint() {
+    /* CAMSConnectingPoint getSelectedCAMSConnectingPoint() {
         return selectedCAMSConnectingPoints;
-	}*/
+    }*/
 
     // Adding component
     public TGComponent addComponent(int x, int y, boolean swallow) {
@@ -1096,7 +1096,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         listPoint = null;
     }
 
-    /*   public void addingCAMSConnector() {
+    /*public void addingCAMSConnector() {
         listPoint = new Vector<Point>();
         cp1 = getSelectedCAMSConnectingPoint();
         x1 = cp1.getX();
@@ -1113,9 +1113,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         listPoint.addElement(new Point(x, y));
         x1 = x;
         y1 = y;
-	}*/
+    }
 
-    /*  public void finishAddingConnector(CAMSConnectingPoint cp2) {
+    public void finishAddingConnector(CAMSConnectingPoint cp2) {
         CAMSBlockConnector camsco = TGComponentManager.addCAMSConnector(cp1.getX(), cp1.getY(), mgui.getIdButtonSelected(), this, cp1, cp2, listPoint);
         if (camsco != null) {
             TraceManager.addDev("Adding connector");
@@ -1134,7 +1134,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             stopAddingConnector(true);
             cp1.setFree(true);
         }
-	}*/
+    }*/
 
 // -------------mark
 
@@ -2597,6 +2597,10 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                     || (o instanceof TMLCRecordComponent && this.checkTMLCRecordComponent((TMLCRecordComponent) o, name))
                     || (o instanceof TMLCCompositeComponent && this.checkTMLCCompositeComponent((TMLCCompositeComponent) o, name))
                     || (o instanceof TMLTaskInterface && this.checkTMLTaskInterface((TMLTaskInterface) o, name))
+                	  || (o instanceof SysCAMSBlockTDF && this.checkSysCAMSBlockTDFComponent((SysCAMSBlockTDF) o, name))
+                    || (o instanceof SysCAMSBlockDE && this.checkSysCAMSBlockDEComponent((SysCAMSBlockDE) o, name))
+                    || (o instanceof SysCAMSRecordComponent && this.checkSysCAMSRecordComponent((SysCAMSRecordComponent) o, name))
+                    || (o instanceof SysCAMSCompositeComponent && this.checkSysCAMSCompositeComponent((SysCAMSCompositeComponent) o, name))
                     || (o instanceof ATDBlock && this.checkATDBlock((ATDBlock) o, name))
                     || (o instanceof AvatarBDBlock && this.checkAvatarBDBlock((AvatarBDBlock) o, name))
                     || (o instanceof AvatarCDBlock && this.checkAvatarCDBlock((AvatarCDBlock) o, name))
@@ -2645,6 +2649,22 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         public boolean checkTMLTaskInterface(TMLTaskInterface o, String name) {
             return false;
         }
+        
+        public boolean checkSysCAMSBlockTDFComponent(SysCAMSBlockTDF o, String name) {
+        	return false;
+        }
+        
+        public boolean checkSysCAMSBlockDEComponent(SysCAMSBlockDE o, String name) {
+        	return false;
+        }
+        
+        public boolean checkSysCAMSRecordComponent(SysCAMSRecordComponent o, String name) {
+        	return false;
+        }
+        
+        public boolean checkSysCAMSCompositeComponent(SysCAMSCompositeComponent o, String name) {
+        	return false;
+        }
 
         public boolean checkATDBlock(ATDBlock o, String name) {
             return false;
@@ -2768,6 +2788,29 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         });
     }
 
+		 public String findSysCAMSPrimitiveComponentName(String name) {
+    	return this.findGoodName(name, new NameChecker() {
+    		public boolean checkSysCAMSBlockTDFComponent(SysCAMSBlockTDF o, String name) {
+    			return o.getValue().equals(name);
+    		}
+    		
+    		public boolean checkSysCAMSBlockDEComponent(SysCAMSBlockDE o, String name) {
+    			return o.getValue().equals(name);
+    		}
+    		
+    		public boolean checkSysCAMSRecordComponent(SysCAMSRecordComponent o, String name) {
+    			return o.getValue().equals(name);
+    		}
+    		
+    		public boolean checkSysCAMSCompositeComponent(SysCAMSCompositeComponent o, String name) {
+    			for (int i = 0; i < o.getNbInternalTGComponent(); i++)
+    				if (this.isNameAlreadyTaken(o.getInternalTGComponent(i), name))
+    					return true;
+    			return false;
+    		}
+    	});
+    }
+
     public String findBlockName(String name) {
         return this.findGoodName(name, new NameChecker() {
             public boolean checkATDBlock(ATDBlock o, String name) {
@@ -2804,7 +2847,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         });
     }
 
-    /*   public String findCAMSBlockName(String name) {
+    /*public String findCAMSBlockName(String name) {
         return this.findGoodName(name, new NameChecker() {
             public boolean checkCAMSBlock(CAMSBlock o, String name) {
                 if (o.getValue().equals(name))
@@ -2812,7 +2855,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 return o.hasBlockWithName();
             }
         });
-	}*/
+    }*/
 
     public String findAvatarSMDStateName(String name) {
         return this.findGoodName(name, new NameChecker() {
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index dacd22c7869066ddc1fd79f39cffafdb34fb3e47..5d18ffd2b4d48a97fff7d7eb2178155257b6b779 100755
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -60,9 +60,6 @@ import ui.dd.TGConnectorLinkNode;
 import ui.diplodocusmethodology.*;
 import ui.ebrdd.*;
 import ui.ftd.*;
-import ui.het.CAMSBlock;
-import ui.het.CAMSBlockConnector;
-import ui.het.CAMSConnectingPoint;
 import ui.iod.*;
 import ui.ncdd.*;
 import ui.osad.*;
@@ -70,6 +67,7 @@ import ui.oscd.*;
 import ui.procsd.*;
 import ui.prosmd.*;
 import ui.req.*;
+import ui.syscams.*;
 import ui.sysmlsecmethodology.*;
 import ui.tmlad.*;
 import ui.tmlcd.*;
@@ -337,7 +335,12 @@ public class TGComponentManager {
 
     // SystemC-AMS
     public static final int CAMS_CONNECTOR = 1601;
-    public static final int CAMS_BLOCK = 1602;
+    public static final int CAMS_BLOCK_TDF = 1602;
+    public static final int CAMS_BLOCK_DE = 1603;
+    public static final int CAMS_PORT_TDF = 1604;
+    public static final int CAMS_PORT_DE = 1605;
+    public static final int CAMS_PORT_CONVERTER = 1606;
+    public static final int CAMS_CLUSTER = 1607;
 
     // SMD diagram
     public static final int PROSMD_START_STATE = 2000;
@@ -1208,9 +1211,6 @@ public class TGComponentManager {
             case TMLARCHI_HWANODE:
                 tgc = new TMLArchiHWANode(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
                 break;
-            case TMLARCHI_CAMSNODE:
-                tgc = new TMLArchiCAMSNode(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
-                break;
             case TMLARCHI_MEMORYNODE:
                 tgc = new TMLArchiMemoryNode(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
                 break;
@@ -1232,10 +1232,25 @@ public class TGComponentManager {
             case TMLARCHI_KEY:
                 tgc = new TMLArchiKey(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
                 break;
-            case CAMS_BLOCK:
-                tgc = new CAMSBlock(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
-                break;
-
+            // SystemC-AMS
+            case CAMS_BLOCK_TDF:
+                tgc = new SysCAMSBlockTDF(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+                break;
+            case CAMS_BLOCK_DE:
+            	tgc = new SysCAMSBlockDE(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            	break;
+            case CAMS_PORT_TDF:
+            	tgc = new SysCAMSPortTDF(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            	break;
+            case CAMS_PORT_DE:
+            	tgc = new SysCAMSPortDE(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            	break;
+            case CAMS_PORT_CONVERTER:
+            	tgc = new SysCAMSPortConverter(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            	break;
+            case CAMS_CLUSTER:
+            	tgc = new SysCAMSCompositeComponent(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            	break;
             // Communication patterns + SD
             case TMLCP_CHOICE:
                 tgc = new TMLCPChoice(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
@@ -1615,9 +1630,21 @@ public class TGComponentManager {
         } else if (tgc instanceof AvatarADAssociationConnector) {
             return AAD_ASSOCIATION_CONNECTOR;
 
-            //SystemC-AMS -----mark
-        } else if (tgc instanceof CAMSBlockConnector) {
+            // SystemC-AMS
+        } else if (tgc instanceof SysCAMSPortConnector) {
             return CAMS_CONNECTOR;
+        } else if (tgc instanceof SysCAMSBlockTDF) {
+        	return CAMS_BLOCK_TDF;
+        } else if (tgc instanceof SysCAMSBlockDE) {
+        	return CAMS_BLOCK_DE;
+        } else if (tgc instanceof SysCAMSPortTDF) {
+        	return CAMS_PORT_TDF;
+        } else if (tgc instanceof SysCAMSPortDE) {
+        	return CAMS_PORT_DE;
+        } else if (tgc instanceof SysCAMSPortConverter) {
+        	return CAMS_PORT_CONVERTER;
+        } else if (tgc instanceof SysCAMSCompositeComponent) {
+        	return CAMS_CLUSTER;
 
             // Others
         } else if (tgc instanceof TADDeterministicDelay) {
@@ -1952,8 +1979,6 @@ public class TGComponentManager {
             return AVATAR_FIREWALL;
         } else if (tgc instanceof TMLArchiHWANode) {
             return TMLARCHI_HWANODE;
-        } else if (tgc instanceof TMLArchiCAMSNode) {
-            return TMLARCHI_CAMSNODE;
         } else if (tgc instanceof TMLArchiMemoryNode) {
             return TMLARCHI_MEMORYNODE;
         } else if (tgc instanceof TMLArchiDMANode) {
@@ -2316,6 +2341,9 @@ public class TGComponentManager {
             case CONNECTOR_PORT_TMLC:
                 tgc = new TMLCPortConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
                 break;
+            case CAMS_CONNECTOR:
+            	tgc = new SysCAMSPortConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
+            	break;
             case CONNECTOR_NODE_TMLARCHI:
                 tgc = new TMLArchiConnectorNode(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
                 break;
@@ -2364,10 +2392,10 @@ public class TGComponentManager {
 
     }
 
-    public final static CAMSBlockConnector addCAMSConnector(int x, int y, int id, TDiagramPanel tdp, CAMSConnectingPoint p1, CAMSConnectingPoint p2, Vector<Point> listPoint) {
+/*    public final static CAMSBlockConnector addCAMSConnector(int x, int y, int id, TDiagramPanel tdp, CAMSConnectingPoint p1, CAMSConnectingPoint p2, Vector<Point> listPoint) {
         CAMSBlockConnector cbc = null;
         cbc = new CAMSBlockConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
         return cbc;
-    }
+    }*/
 
 } // Class
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 5aadb346b13f8bcad56fe45b0a20076772de2177..ac8c4b6b09d6d824800b22799a2a7abc4edaede9 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -278,11 +278,11 @@ public class TGUIAction extends AbstractAction {
     public static final int CAMS_EDIT = 458;
     public static final int CAMS_BLOCK_TDF = 459;
     public static final int CAMS_CONNECTOR = 460;
-    public static final int CAMS_BLOCK_DE = 475;
-    public static final int CAMS_PORT_TDF = 476;
-    public static final int CAMS_PORT_DE = 477;
-    public static final int CAMS_PORT_CONVERTER = 478;
-    public static final int CAMS_CLUSTER = 479;
+    public static final int CAMS_BLOCK_DE = 476;
+    public static final int CAMS_PORT_TDF = 477;
+    public static final int CAMS_PORT_DE = 478;
+    public static final int CAMS_PORT_CONVERTER = 479;
+    public static final int CAMS_CLUSTER = 480;
 
     public static final int EBRDD_EDIT = 271;
     public static final int EBRDD_CONNECTOR = 272;
@@ -636,7 +636,7 @@ public class TGUIAction extends AbstractAction {
     public static final int MOVE_ENABLED = 463;
     public static final int FIRST_DIAGRAM = 464;
     
-    public static final int NB_ACTION = 480;
+    public static final int NB_ACTION = 481;
 
     private static final TAction [] actions = new TAction[NB_ACTION];
 
diff --git a/src/main/java/ui/syscams/.gitkeep b/src/main/java/ui/syscams/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/main/java/ui/syscams/SysCAMSBlockDE.java b/src/main/java/ui/syscams/SysCAMSBlockDE.java
index 27cb244370c46088603c021522743cd9daf56e63..a16b46683d8ed922b9b7c5e701311d778cf35274 100644
--- a/src/main/java/ui/syscams/SysCAMSBlockDE.java
+++ b/src/main/java/ui/syscams/SysCAMSBlockDE.java
@@ -1,67 +1,434 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- * 
- * ludovic.apvrille AT enst.fr
- * 
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- * 
- * This software is governed by the CeCILL  license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- * 
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- * 
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- * 
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.syscams;
-
-import ui.TDiagramPanel;
-import ui.TGComponent;
-
-/**
- * Class SysCAMSBlockDE
- * Primitive Component. To be used in SystemC-AMS component task diagrams 
- * Creation: 23/04/2018
- * @version 1.0 23/04/2018
- * @author Irina Kit Yan LEE
- */
-
-public class SysCAMSBlockDE extends SysCAMSPrimitiveComponent {
-	private int period;
-
-	public SysCAMSBlockDE(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
-		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-	}
-
-	public int getPeriod() {
-		return period;
-	}
-
-	public void setPeriod(int period) {
-		this.period = period;
-	}
-}
\ No newline at end of file
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.syscams;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogSysCAMSBlockDE;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Vector;
+
+/**
+ * Class SysCAMSBlockDE
+ * Primitive Component. To be used in SystemC-AMSdiagrams
+ * Creation: 13/05/2018
+ * @version 1.0 13/05/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class SysCAMSBlockDE extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, WithAttributes {
+	private int period;
+	
+	private int maxFontSize = 14;
+    private int minFontSize = 4;
+    private int currentFontSize = -1;
+    private boolean displayText = true;
+    private Color myColor;
+
+	private boolean isAttacker=false;
+
+    // Attributes
+    public HashMap<String, Integer> attrMap = new HashMap<String, Integer>();
+    public String mappingName;
+    private int textX = 15; // border for ports
+    private double dtextX = 0.0;
+
+    public String oldValue;
+    
+    public SysCAMSBlockDE(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
+        super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+        initScaling(200, 150);
+
+        oldScaleFactor = tdp.getZoom();
+        dtextX = textX * oldScaleFactor;
+        textX = (int)dtextX;
+        dtextX = dtextX - textX;
+
+        minWidth = 1;
+        minHeight = 1;
+
+        nbConnectingPoint = 0;
+
+        addTGConnectingPointsComment();
+
+        nbInternalTGComponent = 0;
+
+        moveable = true;
+        multieditable = true;
+        editable = true;
+        removable = true;
+        userResizable = true;
+
+    	value = tdp.findSysCAMSPrimitiveComponentName("Block_DE_");
+        name = "Primitive component";
+        
+        myImageIcon = IconManager.imgic1202;
+
+        actionOnAdd();
+    }
+
+    public void internalDrawing(Graphics g) {
+        int w;
+        Font f = g.getFont();
+        Font fold = f;
+
+        if (myColor == null) {
+            if (ColorManager.TML_COMPOSITE_COMPONENT == Color.white) {
+                myColor = Color.white;
+            } else {
+        		myColor = Color.white;
+            }
+        }
+        if ((rescaled) && (!tdp.isScaled())) {
+            if (currentFontSize == -1) {
+                currentFontSize = f.getSize();
+            }
+            rescaled = false;
+            // Must set the font size ..
+            // Find the biggest font not greater than max_font size
+            // By Increment of 1
+            // Or decrement of 1
+            // If font is less than 4, no text is displayed
+
+            int maxCurrentFontSize = Math.max(0, Math.min(height-(2*textX), maxFontSize));
+            f = f.deriveFont((float)maxCurrentFontSize);
+            g.setFont(f);
+            while(maxCurrentFontSize > (minFontSize-1)) {
+                if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
+                    break;
+                }
+                maxCurrentFontSize --;
+                f = f.deriveFont((float)maxCurrentFontSize);
+                g.setFont(f);
+            }
+            currentFontSize = maxCurrentFontSize;
+            if(currentFontSize <minFontSize) {
+                displayText = false;
+            } else {
+                displayText = true;
+                f = f.deriveFont((float)currentFontSize);
+                g.setFont(f);
+            }
+        }
+
+        // Zoom is assumed to be computed
+        Color c = g.getColor();
+        g.drawRect(x, y, width, height);
+        if ((width > 2) && (height > 2)) {
+            g.setColor(myColor);
+            g.fillRect(x+1, y+1, width-1, height-1);
+            g.setColor(c);
+        }
+
+        // Font size
+        if (displayText) {
+            f = f.deriveFont((float)currentFontSize);
+            g.setFont(f);
+            w = g.getFontMetrics().stringWidth(value);
+            if (w > (width - 2 * textX)) {
+                g.drawString(value, x + textX + 1, y + currentFontSize + textX);
+            	String s = "Tm = " + this.getPeriod();
+            	g.drawString(s, x + textX + 1, y + height - currentFontSize - textX);
+            } else {
+                g.drawString(value, x + (width - w)/2, y + currentFontSize + textX);
+            	String s = "Tm = " + this.getPeriod();
+            	w = g.getFontMetrics().stringWidth(s);
+            	g.drawString(s, x + (width - w)/2, y + height - currentFontSize - textX);
+            }
+        }
+
+        g.setFont(fold);
+    }
+     public void drawVerification(Graphics g, int x, int y, int checkConfStatus){
+        Color c = g.getColor();
+        Color c1;
+        switch(checkConfStatus) {
+        case TAttribute.CONFIDENTIALITY_OK:
+            c1 = Color.green;
+            break;
+        case TAttribute.CONFIDENTIALITY_KO:
+            c1 = Color.red;
+            break;
+        default:
+            return;
+        }
+		g.drawOval(x-10, y-10, 6, 9);
+		g.setColor(c1);
+		g.fillRect(x-12, y-5, 9, 7);
+		g.setColor(c);
+		g.drawRect(x-12, y-5, 9, 7);
+    }
+
+    public void rescale(double scaleFactor){
+        dtextX = (textX + dtextX) / oldScaleFactor * scaleFactor;
+        textX = (int)(dtextX);
+        dtextX = dtextX - textX;
+        super.rescale(scaleFactor);
+    }
+
+    public TGComponent isOnOnlyMe(int _x, int _y) {
+        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
+            return this;
+        }
+        return null;
+    }
+
+	public boolean isAttacker(){
+		return isAttacker;
+	}
+
+    public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
+    	// On the name ?
+        if ((displayText) && (_y <= (y + currentFontSize + textX))) {
+            //TraceManager.addDev("Edit on double click x=" + _x + " y=" + _y);
+            oldValue = value;
+            String s = (String)JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
+                                                           JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
+                                                           null,
+                                                           getValue());
+            if ((s != null) && (s.length() > 0)) {
+                // Check whether this name is already in use, or not
+
+                if (!TAttribute.isAValidId(s, false, false)) {
+                    JOptionPane.showMessageDialog(frame,
+                                                  "Could not change the name of the component: the new name is not a valid name",
+                                                  "Error",
+                                                  JOptionPane.INFORMATION_MESSAGE);
+                    return false;
+                }
+                if (oldValue.compareTo(s) != 0) {
+                    if (((SysCAMSComponentTaskDiagramPanel)(tdp)).nameBlockTDFComponentInUse(oldValue, s)) {
+                        JOptionPane.showMessageDialog(frame,
+                                                      "Error: the name is already in use",
+                                                      "Name modification",
+                                                      JOptionPane.ERROR_MESSAGE);
+                        return false;
+                    }
+                }
+
+
+                //TraceManager.addDev("Set value with change");
+    			setComponentName(s);
+                setValueWithChange(s);
+				isAttacker = s.contains("Attacker");
+                rescaled = true;
+                //TraceManager.addDev("return true");
+                return true;
+
+            }
+            return false;
+        }
+        
+    	JDialogSysCAMSBlockDE jde = new JDialogSysCAMSBlockDE(this);
+    	jde.setVisible(true);
+        rescaled = true;
+        return true;
+    }
+
+    public Vector<String> getAllRecords() {
+        return ((SysCAMSComponentTaskDiagramPanel)(tdp)).getAllRecords(this);
+    }
+
+    public SysCAMSRecordComponent getRecordNamed(String _nameOfRecord) {
+        return ((SysCAMSComponentTaskDiagramPanel)(tdp)).getRecordNamed(this, _nameOfRecord);
+    }
+
+    public int getType() {
+		return TGComponentManager.CAMS_BLOCK_DE;
+    }
+
+    public void wasSwallowed() {
+        myColor = null;
+    }
+
+    public void wasUnswallowed() {
+        myColor = null;
+        setFather(null);
+        TDiagramPanel tdp = getTDiagramPanel();
+        setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+    }
+
+    public boolean acceptSwallowedTGComponent(TGComponent tgc) {
+        return tgc instanceof SysCAMSPortDE;
+    }
+
+    public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
+        //TraceManager.addDev("Add swallow component");
+        // Choose its position
+        // Make it an internal component
+        // It's one of my son
+        //Set its coordinates
+        if (tgc instanceof SysCAMSPortDE) {
+            tgc.setFather(this);
+            tgc.setDrawingZone(true);
+            tgc.resizeWithFather();
+            addInternalComponent(tgc, 0);
+            return true;
+        }
+        return false;
+    }
+
+    public void removeSwallowedTGComponent(TGComponent tgc) {
+        removeInternalComponent(tgc);
+    }
+
+    public void hasBeenResized() {
+        rescaled = true;
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortDE) {
+                tgcomponent[i].resizeWithFather();
+            }
+        }
+        if (getFather() != null) {
+            resizeWithFather();
+        }
+    }
+
+    public void resizeWithFather() {
+        if ((father != null) && (father instanceof SysCAMSCompositeComponent)) {
+            // Too large to fit in the father? -> resize it!
+            resizeToFatherSize();
+
+            setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+            setMoveCd(x, y);
+        }
+    }
+
+    protected String translateExtraParam() {
+        StringBuffer sb = new StringBuffer("<extraparam>\n");
+			sb.append("<Data isAttacker=\"");
+            sb.append(isAttacker() ? "Yes": "No");
+	        sb.append("\" />\n");
+            sb.append("<Attribute period=\"");
+            sb.append(this.getPeriod());
+            sb.append("\" />\n");
+        sb.append("</extraparam>\n");
+        return new String(sb);
+    }
+
+    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+        try {
+            NodeList nli;
+            Node n1, n2;
+            Element elt;
+            int period;
+            
+            for(int i=0; i<nl.getLength(); i++) {
+                n1 = nl.item(i);
+                if (n1.getNodeType() == Node.ELEMENT_NODE) {
+                    nli = n1.getChildNodes();
+                    for(int j=0; j<nli.getLength(); j++) {
+                        n2 = nli.item(j);
+                        if (n2.getNodeType() == Node.ELEMENT_NODE) {
+                            elt = (Element) n2;
+							if (elt.getTagName().equals("Data")) {
+                                isAttacker = elt.getAttribute("isAttacker").equals("Yes");
+							}
+                            if (elt.getTagName().equals("Attribute")) {
+                                period = Integer.decode(elt.getAttribute("period")).intValue();
+                                setPeriod(period);
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new MalformedModelingException();
+        }
+    }
+
+    public int getCurrentFontSize() {
+        return currentFontSize;
+    }
+
+    public java.util.List<SysCAMSPortDE> getAllDEOriginPorts() {
+        return getAllPorts(1, 1);
+    }
+
+    public java.util.List<SysCAMSPortDE> getAllDEDestinationPorts() {
+        return getAllPorts(1, 0);
+    }
+
+    public java.util.List<SysCAMSPortDE> getAllPorts(int _type, int _isOrigin) {
+    	java.util.List<SysCAMSPortDE> ret = new LinkedList<SysCAMSPortDE>();
+    	SysCAMSPortDE port;
+
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortDE) {
+                port = (SysCAMSPortDE)tgcomponent[i];
+                if ((port.getPortType() == _type) && (port.getOrigin() == _isOrigin)) {
+                    ret.add(port);
+                }
+            }
+        }
+        return ret;
+    }
+
+    public java.util.List<SysCAMSPortDE> getAllInternalPortsDE() {
+    	java.util.List<SysCAMSPortDE> list = new ArrayList<SysCAMSPortDE>();
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortDE) {
+                list.add((SysCAMSPortDE)(tgcomponent[i]));
+            }
+        }
+        return list;
+    }
+
+	public int getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
+	}
+
+	public String getAttributes() {
+		return null;
+	}
+}
diff --git a/src/main/java/ui/syscams/SysCAMSBlockTDF.java b/src/main/java/ui/syscams/SysCAMSBlockTDF.java
index a354f6566f1ef0c9df301a83054d527a98d7fd19..f7c8058aa573f5e78ace734ff750695042daf82a 100644
--- a/src/main/java/ui/syscams/SysCAMSBlockTDF.java
+++ b/src/main/java/ui/syscams/SysCAMSBlockTDF.java
@@ -1,76 +1,498 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- * 
- * ludovic.apvrille AT enst.fr
- * 
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- * 
- * This software is governed by the CeCILL  license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- * 
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- * 
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- * 
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.syscams;
-
-import ui.TDiagramPanel;
-import ui.TGComponent;
-
-/**
- * Class SysCAMSBlockTDF
- * Primitive Component. To be used in SystemC-AMS component task diagrams 
- * Creation: 23/04/2018
- * @version 1.0 23/04/2018
- * @author Irina Kit Yan LEE
- */
-
-public class SysCAMSBlockTDF extends SysCAMSPrimitiveComponent {
-	private int period;
-	private String processCode;
-
-	public SysCAMSBlockTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
-		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-	}
-
-	public String getProcessCode() {
-		return processCode;
-	}
-
-	public void setProcessCode(String processCode) {
-		this.processCode = processCode;
-	}
-
-	public int getPeriod() {
-		return period;
-	}
-
-	public void setPeriod(int period) {
-		this.period = period;
-	}
-}
\ No newline at end of file
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.syscams;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogSysCAMSBlockTDF;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Vector;
+
+/**
+ * Class SysCAMSBlockTDF
+ * Primitive Component. To be used in SystemC-AMSdiagrams
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class SysCAMSBlockTDF extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, WithAttributes {
+	private int period;
+	private String processCode;
+	
+	private int maxFontSize = 14;
+    private int minFontSize = 4;
+    private int currentFontSize = -1;
+    private boolean displayText = true;
+    private Color myColor;
+
+	private boolean isAttacker=false;
+
+    // Attributes
+    public HashMap<String, Integer> attrMap = new HashMap<String, Integer>();
+    public String mappingName;
+    private int textX = 15; // border for ports
+    private double dtextX = 0.0;
+
+    public String oldValue;
+	
+    public SysCAMSBlockTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
+        super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+        initScaling(200, 150);
+
+        oldScaleFactor = tdp.getZoom();
+        dtextX = textX * oldScaleFactor;
+        textX = (int)dtextX;
+        dtextX = dtextX - textX;
+
+        minWidth = 1;
+        minHeight = 1;
+
+        nbConnectingPoint = 0;
+
+        addTGConnectingPointsComment();
+
+        nbInternalTGComponent = 0;
+
+        moveable = true;
+        multieditable = true;
+        editable = true;
+        removable = true;
+        userResizable = true;
+
+        value = tdp.findSysCAMSPrimitiveComponentName("Block_TDF_");
+        oldValue = value;
+        name = "Primitive component";
+        
+        myImageIcon = IconManager.imgic1202;
+
+        actionOnAdd();
+    }
+
+    public void internalDrawing(Graphics g) {
+        int w;
+        Font f = g.getFont();
+        Font fold = f;
+
+        if (myColor == null) {
+    		myColor = Color.lightGray;
+        }
+        if ((rescaled) && (!tdp.isScaled())) {
+            if (currentFontSize == -1) {
+                currentFontSize = f.getSize();
+            }
+            rescaled = false;
+            // Must set the font size ..
+            // Find the biggest font not greater than max_font size
+            // By Increment of 1
+            // Or decrement of 1
+            // If font is less than 4, no text is displayed
+
+            int maxCurrentFontSize = Math.max(0, Math.min(height-(2*textX), maxFontSize));
+            f = f.deriveFont((float)maxCurrentFontSize);
+            g.setFont(f);
+            while(maxCurrentFontSize > (minFontSize-1)) {
+                if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
+                    break;
+                }
+                maxCurrentFontSize --;
+                f = f.deriveFont((float)maxCurrentFontSize);
+                g.setFont(f);
+            }
+            currentFontSize = maxCurrentFontSize;
+            if(currentFontSize <minFontSize) {
+                displayText = false;
+            } else {
+                displayText = true;
+                f = f.deriveFont((float)currentFontSize);
+                g.setFont(f);
+            }
+        }
+
+        // Zoom is assumed to be computed
+        Color c = g.getColor();
+        g.drawRect(x, y, width, height);
+        if ((width > 2) && (height > 2)) {
+            g.setColor(myColor);
+            g.fillRect(x+1, y+1, width-1, height-1);
+            g.setColor(c);
+        }
+
+        // Font size
+        if (displayText) {
+            f = f.deriveFont((float)currentFontSize);
+            g.setFont(f);
+            w = g.getFontMetrics().stringWidth(value);
+            if (w > (width - 2 * textX)) {
+            	// name
+                g.drawString(value, x + textX + 1, y + currentFontSize + textX);
+                // period
+            	String s = "Tm = " + this.getPeriod();
+            	g.drawString(s, x + textX + 1, y + height - currentFontSize - textX);
+            } else {
+            	// name
+                g.drawString(value, x + (width - w)/2, y + currentFontSize + textX);
+                // period
+            	String s = "Tm = " + this.getPeriod();
+            	w = g.getFontMetrics().stringWidth(s);
+            	g.drawString(s, x + (width - w)/2, y + height - currentFontSize - textX);
+            }
+        }
+
+        g.setFont(fold);
+    }
+     public void drawVerification(Graphics g, int x, int y, int checkConfStatus){
+        Color c = g.getColor();
+        Color c1;
+        switch(checkConfStatus) {
+        case TAttribute.CONFIDENTIALITY_OK:
+            c1 = Color.green;
+            break;
+        case TAttribute.CONFIDENTIALITY_KO:
+            c1 = Color.red;
+            break;
+        default:
+            return;
+        }
+		g.drawOval(x-10, y-10, 6, 9);
+		g.setColor(c1);
+		g.fillRect(x-12, y-5, 9, 7);
+		g.setColor(c);
+		g.drawRect(x-12, y-5, 9, 7);
+    }
+
+    public void rescale(double scaleFactor){
+        dtextX = (textX + dtextX) / oldScaleFactor * scaleFactor;
+        textX = (int)(dtextX);
+        dtextX = dtextX - textX;
+        super.rescale(scaleFactor);
+    }
+
+    public TGComponent isOnOnlyMe(int _x, int _y) {
+        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
+            return this;
+        }
+        return null;
+    }
+
+	public boolean isAttacker(){
+		return isAttacker;
+	}
+
+    public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
+    	// On the name ?
+        if ((displayText) && (_y <= (y + currentFontSize + textX))) {
+            //TraceManager.addDev("Edit on double click x=" + _x + " y=" + _y);
+            oldValue = value;
+            String s = (String)JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
+                                                           JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
+                                                           null,
+                                                           getValue());
+            if ((s != null) && (s.length() > 0)) {
+                // Check whether this name is already in use, or not
+
+                if (!TAttribute.isAValidId(s, false, false)) {
+                    JOptionPane.showMessageDialog(frame,
+                                                  "Could not change the name of the component: the new name is not a valid name",
+                                                  "Error",
+                                                  JOptionPane.INFORMATION_MESSAGE);
+                    return false;
+                }
+                if (oldValue.compareTo(s) != 0) {
+                    if (((SysCAMSComponentTaskDiagramPanel)(tdp)).nameBlockTDFComponentInUse(oldValue, s)) {
+                        JOptionPane.showMessageDialog(frame,
+                                                      "Error: the name is already in use",
+                                                      "Name modification",
+                                                      JOptionPane.ERROR_MESSAGE);
+                        return false;
+                    }
+                }
+
+
+                //TraceManager.addDev("Set value with change");
+    			setComponentName(s);
+                setValueWithChange(s);
+				isAttacker = s.contains("Attacker");
+                rescaled = true;
+                //TraceManager.addDev("return true");
+                return true;
+
+            }
+            return false;
+        }
+    	
+    	JDialogSysCAMSBlockTDF jtdf = new JDialogSysCAMSBlockTDF(this);
+    	jtdf.setVisible(true);
+        rescaled = true;
+        return true;
+    }
+
+    public Vector<String> getAllRecords() {
+        return ((SysCAMSComponentTaskDiagramPanel)(tdp)).getAllRecords(this);
+    }
+
+    public SysCAMSRecordComponent getRecordNamed(String _nameOfRecord) {
+        return ((SysCAMSComponentTaskDiagramPanel)(tdp)).getRecordNamed(this, _nameOfRecord);
+    }
+
+    public int getType() {
+		return TGComponentManager.CAMS_BLOCK_TDF;
+    }
+
+    public void wasSwallowed() {
+        myColor = null;
+    }
+
+    public void wasUnswallowed() {
+        myColor = null;
+        setFather(null);
+        TDiagramPanel tdp = getTDiagramPanel();
+        setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+    }
+
+    public boolean acceptSwallowedTGComponent(TGComponent tgc) {
+    	if (tgc instanceof SysCAMSPortTDF) {
+    		return tgc instanceof SysCAMSPortTDF;
+    	} else if (tgc instanceof SysCAMSPortConverter) {
+    		return tgc instanceof SysCAMSPortConverter;
+    	} else {
+    		return true;
+    	}
+    }
+
+    public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
+        //TraceManager.addDev("Add swallow component");
+        // Choose its position
+        // Make it an internal component
+        // It's one of my son
+        //Set its coordinates
+        if (tgc instanceof SysCAMSPortTDF) {
+            tgc.setFather(this);
+            tgc.setDrawingZone(true);
+            tgc.resizeWithFather();
+            addInternalComponent(tgc, 0);
+            return true;
+        }
+        if (tgc instanceof SysCAMSPortConverter) {
+        	tgc.setFather(this);
+        	tgc.setDrawingZone(true);
+        	tgc.resizeWithFather();
+        	addInternalComponent(tgc, 0);
+        	return true;
+        }
+        return false;
+    }
+
+    public void removeSwallowedTGComponent(TGComponent tgc) {
+        removeInternalComponent(tgc);
+    }
+
+    public void hasBeenResized() {
+        rescaled = true;
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortTDF) {
+                tgcomponent[i].resizeWithFather();
+            }
+            if (tgcomponent[i] instanceof SysCAMSPortConverter) {
+            	tgcomponent[i].resizeWithFather();
+            }
+        }
+        if (getFather() != null) {
+            resizeWithFather();
+        }
+    }
+
+    public void resizeWithFather() {
+        if ((father != null) && (father instanceof SysCAMSCompositeComponent)) {
+            // Too large to fit in the father? -> resize it!
+            resizeToFatherSize();
+
+            setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+            setMoveCd(x, y);
+        }
+    }
+
+    protected String translateExtraParam() {
+        StringBuffer sb = new StringBuffer("<extraparam>\n");
+		sb.append("<Data isAttacker=\"");
+        sb.append(isAttacker() ? "Yes": "No");
+        sb.append("\" />\n");
+        sb.append("<Attribute period=\"");
+        sb.append(this.getPeriod());
+        sb.append("\" processCode=\"");
+        sb.append(this.getProcessCode());
+        sb.append("\" />\n");
+        sb.append("</extraparam>\n");
+        return new String(sb);
+    }
+
+    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+        try {
+            NodeList nli;
+            Node n1, n2;
+            Element elt;
+            int period;
+            String processCode;
+            
+            for(int i=0; i<nl.getLength(); i++) {
+                n1 = nl.item(i);
+                if (n1.getNodeType() == Node.ELEMENT_NODE) {
+                    nli = n1.getChildNodes();
+                    for(int j=0; j<nli.getLength(); j++) {
+                        n2 = nli.item(j);
+                        if (n2.getNodeType() == Node.ELEMENT_NODE) {
+                            elt = (Element) n2;
+							if (elt.getTagName().equals("Data")) {
+                                isAttacker = elt.getAttribute("isAttacker").equals("Yes");
+							}
+                            if (elt.getTagName().equals("Attribute")) {
+                                period = Integer.decode(elt.getAttribute("period")).intValue();
+                                processCode = elt.getAttribute("processCode");
+                                setPeriod(period);
+                                setProcessCode(processCode);
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new MalformedModelingException();
+        }
+    }
+
+    public int getCurrentFontSize() {
+        return currentFontSize;
+    }
+
+    public java.util.List<SysCAMSPortTDF> getAllTDFOriginPorts() {
+        return getAllTDFPorts(0, 1);
+    }
+
+    public java.util.List<SysCAMSPortTDF> getAllTDFDestinationPorts() {
+        return getAllTDFPorts(0, 0);
+    }
+    
+    public java.util.List<SysCAMSPortConverter> getAllConvOriginPorts() {
+    	return getAllConvPorts(0, 1);
+    }
+    
+    public java.util.List<SysCAMSPortConverter> getAllConvDestinationPorts() {
+    	return getAllConvPorts(0, 0);
+    }
+
+    public java.util.List<SysCAMSPortTDF> getAllTDFPorts(int _type, int _isOrigin) {
+    	java.util.List<SysCAMSPortTDF> ret = new LinkedList<SysCAMSPortTDF>();
+    	SysCAMSPortTDF port;
+
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortTDF) {
+                port = (SysCAMSPortTDF)tgcomponent[i];
+                if ((port.getPortType() == _type) && (port.getOrigin() == _isOrigin)) {
+                    ret.add(port);
+                }
+            }
+        }
+        return ret;
+    }
+    
+    public java.util.List<SysCAMSPortConverter> getAllConvPorts(int _type, int _isOrigin) {
+    	java.util.List<SysCAMSPortConverter> ret = new LinkedList<SysCAMSPortConverter>();
+    	SysCAMSPortConverter port;
+    	
+    	for(int i=0; i<nbInternalTGComponent; i++) {
+    		if (tgcomponent[i] instanceof SysCAMSPortConverter) {
+    			port = (SysCAMSPortConverter)tgcomponent[i];
+    			if ((port.getPortType() == _type) && (port.getOrigin() == _isOrigin)) {
+    				ret.add(port);
+    			}
+    		}
+    	}
+    	return ret;
+    }
+
+    public java.util.List<SysCAMSPortTDF> getAllInternalPortsTDF() {
+    	java.util.List<SysCAMSPortTDF> list = new ArrayList<SysCAMSPortTDF>();
+        for(int i=0; i<nbInternalTGComponent; i++) {
+            if (tgcomponent[i] instanceof SysCAMSPortTDF) {
+                list.add((SysCAMSPortTDF)(tgcomponent[i]));
+            }
+        }
+        return list;
+    }
+    
+    public java.util.List<SysCAMSPortConverter> getAllInternalPortsConv() {
+    	java.util.List<SysCAMSPortConverter> list = new ArrayList<SysCAMSPortConverter>();
+    	for(int i=0; i<nbInternalTGComponent; i++) {
+    		if (tgcomponent[i] instanceof SysCAMSPortConverter) {
+    			list.add((SysCAMSPortConverter)(tgcomponent[i]));
+    		}
+    	}
+    	return list;
+    }
+
+	public String getProcessCode() {
+		return processCode;
+	}
+
+	public void setProcessCode(String processCode) {
+		this.processCode = processCode;
+	}
+
+	public int getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
+	}
+
+	public String getAttributes() {
+		return null;
+	}
+}
diff --git a/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramPanel.java b/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramPanel.java
index 1d834b9153915ec0a987fc2336f881f1194a9598..f1b5f6b1527599c4c97c9823b7eadd42410bea9a 100644
--- a/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramPanel.java
+++ b/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramPanel.java
@@ -66,15 +66,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public boolean actionOnAdd(TGComponent tgc) {
-        if (tgc instanceof SysCAMSPrimitiveComponent) {
-            return true;
-        } 
-        if (tgc instanceof SysCAMSCompositePort) {
-            if (tgc.getFather() instanceof SysCAMSCompositeComponent) {
-                getMGUI().updateReferenceToSysCAMSCompositeComponent((SysCAMSCompositeComponent)(tgc.getFather()));
-            }
-        }
-
         return true;
     }
 
@@ -90,13 +81,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
             updatePorts();
         }
 
-        if (tgc instanceof SysCAMSCompositePort) {
-            updatePorts();
-            if (fatherOfRemoved instanceof SysCAMSCompositeComponent) {
-                getMGUI().updateReferenceToSysCAMSCompositeComponent((SysCAMSCompositeComponent)(fatherOfRemoved));
-            }
-        }
-
         return true;
     }
 
@@ -104,31 +88,31 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         List<SysCAMSPrimitivePort> ports = new ArrayList<SysCAMSPrimitivePort>();
         for (TGComponent tgc : componentList){
 
-            if (tgc instanceof SysCAMSPrimitiveComponent){
-                SysCAMSPrimitiveComponent comp = (SysCAMSPrimitiveComponent) tgc;
-                List<SysCAMSPrimitivePort> cps = comp.getAllTDFOriginPorts();
-                for (SysCAMSPrimitivePort port : cps){
+            if (tgc instanceof SysCAMSBlockTDF){
+            	SysCAMSBlockTDF comp = (SysCAMSBlockTDF) tgc;
+                List<SysCAMSPortTDF> cps = comp.getAllTDFOriginPorts();
+                for (SysCAMSPortTDF port : cps){
                     if (port.commName.equals(name)){
                         ports.add(port);
                     }
                 }
                 cps = comp.getAllTDFDestinationPorts();
-                for (SysCAMSPrimitivePort port : cps){
+                for (SysCAMSPortTDF port : cps){
                     if (port.commName.equals(name)){
                         ports.add(port);
                     }
                 }
             }
-            if (tgc instanceof SysCAMSPrimitiveComponent){
-            	SysCAMSPrimitiveComponent comp = (SysCAMSPrimitiveComponent) tgc;
-            	List<SysCAMSPrimitivePort> cps = comp.getAllDEOriginPorts();
-            	for (SysCAMSPrimitivePort port : cps){
+            if (tgc instanceof SysCAMSBlockDE){
+            	SysCAMSBlockDE comp = (SysCAMSBlockDE) tgc;
+            	List<SysCAMSPortDE> cps = comp.getAllDEOriginPorts();
+            	for (SysCAMSPortDE port : cps){
             		if (port.commName.equals(name)){
             			ports.add(port);
             		}
             	}
             	cps = comp.getAllDEDestinationPorts();
-            	for (SysCAMSPrimitivePort port : cps){
+            	for (SysCAMSPortDE port : cps){
             		if (port.commName.equals(name)){
             			ports.add(port);
             		}
@@ -139,11 +123,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public boolean actionOnValueChanged(TGComponent tgc) {
-        if (tgc instanceof SysCAMSPrimitiveComponent) {
-            SysCAMSPrimitiveComponent t = (SysCAMSPrimitiveComponent)tgc;
-            mgui.newSysCAMSTaskName(tp, t.oldValue, t.getValue());
-            return true;
-        }
         if (tgc instanceof SysCAMSCompositeComponent) {
             SysCAMSCompositeComponent syscamscc = (SysCAMSCompositeComponent)tgc;
             getMGUI().updateReferenceToSysCAMSCompositeComponent(syscamscc);
@@ -151,11 +130,11 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         return true;
     }
 
-    public boolean renamePrimitiveComponent(String oldValue, String newValue) {
+    public boolean renameBlockTDFComponent(String oldValue, String newValue) {
         return mgui.newSysCAMSComponentTaskName(tp, oldValue, newValue);
     }
 
-    public boolean namePrimitiveComponentInUse(String oldValue, String newValue) {
+    public boolean nameBlockTDFComponentInUse(String oldValue, String newValue) {
         boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
         return ko ? ko : nameAllRecordComponentInUse(oldValue, newValue);
     }
@@ -207,8 +186,8 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         return ll;
     }
 
-    public List<SysCAMSPrimitiveComponent> getPrimitiveComponentList() {
-        List<SysCAMSPrimitiveComponent> ll = new LinkedList<SysCAMSPrimitiveComponent>();
+    public List<SysCAMSBlockTDF> getBlockTDFComponentList() {
+        List<SysCAMSBlockTDF> ll = new LinkedList<SysCAMSBlockTDF>();
         TGComponent tgc;
 
         Iterator<TGComponent> iterator = componentList.listIterator();
@@ -216,18 +195,40 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         while(iterator.hasNext()) {
             tgc = iterator.next();
 
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
-                ll.add( (SysCAMSPrimitiveComponent) tgc );
+            if (tgc instanceof SysCAMSBlockTDF) {
+                ll.add( (SysCAMSBlockTDF) tgc );
             }
             if (tgc instanceof SysCAMSCompositeComponent) {
-                ll.addAll(((SysCAMSCompositeComponent)tgc).getAllPrimitiveComponents());
+                ll.addAll(((SysCAMSCompositeComponent)tgc).getAllBlockTDFComponents());
             }
             if (tgc instanceof SysCAMSRemoteCompositeComponent) {
-                ll.addAll(((SysCAMSRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
+                ll.addAll(((SysCAMSRemoteCompositeComponent)tgc).getAllBlockTDFComponents());
             }
         }
         return ll;
     }
+    
+    public List<SysCAMSBlockDE> getBlockDEComponentList() {
+    	List<SysCAMSBlockDE> ll = new LinkedList<SysCAMSBlockDE>();
+    	TGComponent tgc;
+    	
+    	Iterator<TGComponent> iterator = componentList.listIterator();
+    	
+    	while(iterator.hasNext()) {
+    		tgc = iterator.next();
+    		
+    		if (tgc instanceof SysCAMSBlockDE) {
+    			ll.add( (SysCAMSBlockDE) tgc );
+    		}
+//    		if (tgc instanceof SysCAMSCompositeComponent) {
+//    			ll.addAll(((SysCAMSCompositeComponent)tgc).getAllBlockDEComponents());
+//    		}
+//    		if (tgc instanceof SysCAMSRemoteCompositeComponent) {
+//    			ll.addAll(((SysCAMSRemoteCompositeComponent)tgc).getAllBlockDEComponents());
+//    		}
+    	}
+    	return ll;
+    }
 
     public List<SysCAMSPrimitivePort> getPortsConnectedTo(SysCAMSPrimitivePort _port, List<? extends TGComponent> componentsToTakeIntoAccount) {
         List<TGComponent> ll;
@@ -244,7 +245,12 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
             if (o instanceof SysCAMSPrimitivePort) {
                 p = (SysCAMSPrimitivePort)o;
 
-                if (p.getFather() instanceof SysCAMSPrimitiveComponent) {
+                if (p.getFather() instanceof SysCAMSBlockTDF) {
+                	if (componentsToTakeIntoAccount.contains(p.getFather())) {
+                		ret.add( p );
+                	}
+                }
+                if (p.getFather() instanceof SysCAMSBlockDE) {
                     if (componentsToTakeIntoAccount.contains(p.getFather())) {
                         ret.add( p );
                     }
@@ -395,13 +401,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
                 tgc1 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP1());
                 tgc2 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP2());
                 if ((tgc1 != null) && (tgc2 != null)) {
-                    if (tgc1 instanceof SysCAMSRemoteCompositeComponent) {
-                        tgc1 = ((SysCAMSRemoteCompositeComponent)tgc1).getPortOf(portco.getTGConnectingPointP1());
-                    }
-
-                    if (tgc2 instanceof SysCAMSRemoteCompositeComponent) {
-                        tgc2 = ((SysCAMSRemoteCompositeComponent)tgc2).getPortOf(portco.getTGConnectingPointP2());
-                    }
                     if ((!ll.contains(tgc2) && (tgc2 != _port) && ((tgc1 == _port) || (ll.contains(tgc1))))) {
                         ll.add(tgc2);
                         iterator = components.listIterator();
@@ -499,12 +498,12 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
 
         while(iterator.hasNext()) {
             tgc = iterator.next();
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
-                SysCAMSPrimitiveComponent comp = (SysCAMSPrimitiveComponent) tgc;
-                List<SysCAMSPrimitivePort> ll = comp.getAllTDFOriginPorts();
-                Iterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+            if (tgc instanceof SysCAMSBlockTDF) {
+            	SysCAMSBlockTDF comp = (SysCAMSBlockTDF) tgc;
+                List<SysCAMSPortTDF> ll = comp.getAllTDFOriginPorts();
+                Iterator<SysCAMSPortTDF> ite = ll.listIterator();
                 while(ite.hasNext()) {
-                    SysCAMSPrimitivePort port = ite.next();
+                	SysCAMSPortTDF port = ite.next();
                     chls.add(port.getPortName());
                 }
             }
@@ -521,12 +520,12 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
 
         while(iterator.hasNext()) {
             tgc = iterator.next();
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
-                SysCAMSPrimitiveComponent comp = (SysCAMSPrimitiveComponent) tgc;
-                List<SysCAMSPrimitivePort> ll = comp.getAllTDFDestinationPorts();
-                Iterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+            if (tgc instanceof SysCAMSBlockTDF) {
+            	SysCAMSBlockTDF comp = (SysCAMSBlockTDF) tgc;
+                List<SysCAMSPortTDF> ll = comp.getAllTDFDestinationPorts();
+                Iterator<SysCAMSPortTDF> ite = ll.listIterator();
                 while(ite.hasNext()) {
-                    SysCAMSPrimitivePort port = ite.next();
+                	SysCAMSPortTDF port = ite.next();
                     chls.add(port.getPortName());
                 }
             }
@@ -535,27 +534,71 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         chlArray = chls.toArray(chlArray);
         return chlArray;
     }
+    
+    public String[] getCompOutDE(){
+    	List<String> chls = new ArrayList<String>();
+    	TGComponent tgc;
+    	Iterator<TGComponent> iterator = componentList.listIterator();
+    	
+    	while(iterator.hasNext()) {
+    		tgc = iterator.next();
+    		if (tgc instanceof SysCAMSBlockDE) {
+    			SysCAMSBlockDE comp = (SysCAMSBlockDE) tgc;
+    			List<SysCAMSPortDE> ll = comp.getAllDEOriginPorts();
+    			Iterator<SysCAMSPortDE> ite = ll.listIterator();
+    			while(ite.hasNext()) {
+    				SysCAMSPortDE port = ite.next();
+    				chls.add(port.getPortName());
+    			}
+    		}
+    	}
+    	String[] chlArray = new String[chls.size()];
+    	chlArray = chls.toArray(chlArray);
+    	return chlArray;
+    }
+    
+    public String[] getCompInDE(){
+    	List<String> chls = new ArrayList<String>();
+    	TGComponent tgc;
+    	Iterator<TGComponent> iterator = componentList.listIterator();
+    	
+    	while(iterator.hasNext()) {
+    		tgc = iterator.next();
+    		if (tgc instanceof SysCAMSBlockDE) {
+    			SysCAMSBlockDE comp = (SysCAMSBlockDE) tgc;
+    			List<SysCAMSPortDE> ll = comp.getAllDEDestinationPorts();
+    			Iterator<SysCAMSPortDE> ite = ll.listIterator();
+    			while(ite.hasNext()) {
+    				SysCAMSPortDE port = ite.next();
+    				chls.add(port.getPortName());
+    			}
+    		}
+    	}
+    	String[] chlArray = new String[chls.size()];
+    	chlArray = chls.toArray(chlArray);
+    	return chlArray;
+    }
 
-    public SysCAMSPrimitiveComponent getPrimitiveComponentByName(String _name) {
+    public SysCAMSBlockTDF getBlockTDFComponentByName(String _name) {
         TGComponent tgc;
         Iterator<TGComponent> iterator = componentList.listIterator();
-        SysCAMSPrimitiveComponent tmp;
+        SysCAMSBlockTDF tmp;
 
         while(iterator.hasNext()) {
             tgc = iterator.next();
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
+            if (tgc instanceof SysCAMSBlockTDF) {
                 if (tgc.getValue().equals(_name)) {
-                    return ((SysCAMSPrimitiveComponent)tgc);
+                    return ((SysCAMSBlockTDF)tgc);
                 }
             }
             if (tgc instanceof SysCAMSCompositeComponent) {
-                tmp = ((SysCAMSCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+                tmp = ((SysCAMSCompositeComponent)tgc).getBlockTDFComponentByName(_name);
                 if (tmp != null) {
                     return tmp;
                 }
             }
             if (tgc instanceof SysCAMSRemoteCompositeComponent) {
-                tmp = ((SysCAMSRemoteCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+                tmp = ((SysCAMSRemoteCompositeComponent)tgc).getBlockTDFComponentByName(_name);
                 if (tmp != null) {
                     return tmp;
                 }
@@ -563,6 +606,34 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         }
         return null;
     }
+    
+    public SysCAMSBlockDE getBlockDEComponentByName(String _name) {
+    	TGComponent tgc;
+    	Iterator<TGComponent> iterator = componentList.listIterator();
+//    	SysCAMSBlockDE tmp;
+    	
+    	while(iterator.hasNext()) {
+    		tgc = iterator.next();
+    		if (tgc instanceof SysCAMSBlockDE) {
+    			if (tgc.getValue().equals(_name)) {
+    				return ((SysCAMSBlockDE)tgc);
+    			}
+    		}
+//    		if (tgc instanceof SysCAMSCompositeComponent) {
+//    			tmp = ((SysCAMSCompositeComponent)tgc).getBlockDEComponentByName(_name);
+//    			if (tmp != null) {
+//    				return tmp;
+//    			}
+//    		}
+//    		if (tgc instanceof SysCAMSRemoteCompositeComponent) {
+//    			tmp = ((SysCAMSRemoteCompositeComponent)tgc).getBlockDEComponentByName(_name);
+//    			if (tmp != null) {
+//    				return tmp;
+//    			}
+//    		}
+    	}
+    	return null;
+    }
 
     public void updateReferenceToSysCAMSCompositeComponent(SysCAMSCompositeComponent syscamscc) {
         Iterator<TGComponent> iterator = componentList.listIterator();
@@ -696,9 +767,8 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         TGComponent tgc;
 
         // Get all SysCAMSPrimitivePort
-        List<SysCAMSCompositePort> ports = new ArrayList<SysCAMSCompositePort>();
-        List<SysCAMSCompositePort> referencedports = new ArrayList<SysCAMSCompositePort>();
-        List<SysCAMSPrimitivePort> pports = new ArrayList<SysCAMSPrimitivePort>();
+        List<SysCAMSPortTDF> tdfports = new ArrayList<SysCAMSPortTDF>();
+        List<SysCAMSPortDE> deports = new ArrayList<SysCAMSPortDE>();
         List<SysCAMSChannelFacility> facilities = new ArrayList<SysCAMSChannelFacility>();
 
         iterator = componentList.listIterator();
@@ -706,39 +776,30 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         while(iterator.hasNext()) {
             tgc = iterator.next();
 
-            if (tgc instanceof SysCAMSCompositeComponent) {
-                ports.addAll(((SysCAMSCompositeComponent)tgc).getAllInternalCompositePorts());
-                pports.addAll(((SysCAMSCompositeComponent)tgc).getAllInternalPrimitivePorts());
-                referencedports.addAll(((SysCAMSCompositeComponent)tgc).getAllReferencedCompositePorts());
+            if (tgc instanceof SysCAMSBlockTDF) {
+            	tdfports.addAll(((SysCAMSBlockTDF)tgc).getAllInternalPortsTDF());
             }
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
-                pports.addAll(((SysCAMSPrimitiveComponent)tgc).getAllInternalPrimitivePorts());
+            if (tgc instanceof SysCAMSBlockDE) {
+            	deports.addAll(((SysCAMSBlockDE)tgc).getAllInternalPortsDE());
             }
-            if (tgc instanceof SysCAMSCompositePort) {
-                ports.add((SysCAMSCompositePort)tgc);
+            if (tgc instanceof SysCAMSPortTDF) {
+                tdfports.add((SysCAMSPortTDF)tgc);
             }
-            if (tgc instanceof SysCAMSPrimitivePort) {
-                pports.add((SysCAMSPrimitivePort)tgc);
+            if (tgc instanceof SysCAMSPortDE) {
+            	deports.add((SysCAMSPortDE)tgc);
             }
             if (tgc instanceof SysCAMSChannelFacility) {
                 facilities.add((SysCAMSChannelFacility)tgc);
             }
         }
 
-        // Remove All Current Links To Ports
-        for(SysCAMSCompositePort port:ports) {
-            if (!referencedports.contains(port)) {
-                port.purge();
-            }
-        }
-
         // We take each primitive ports individually and we go thru the graph
         ArrayList<SysCAMSChannelFacility> mets = new ArrayList<SysCAMSChannelFacility>();
         TGConnector connector;
         TGConnectingPoint tp;
         String conflictMessage;
 
-        for(SysCAMSPrimitivePort pport:pports) {
+        for(SysCAMSPortTDF pport : tdfports) {
             for(int i=0; i<pport.getNbConnectingPoint(); i++) {
                 tp = pport.getTGConnectingPointAtIndex(i);
                 connector = findTGConnectorUsing(tp);
@@ -750,6 +811,18 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
                 } 
             }
         }
+        for(SysCAMSPortDE pport : deports) {
+        	for(int i=0; i<pport.getNbConnectingPoint(); i++) {
+        		tp = pport.getTGConnectingPointAtIndex(i);
+        		connector = findTGConnectorUsing(tp);
+        		if (connector != null) {
+        			mets.clear();
+        			conflictMessage = propagate(pport, tp, connector, mets);
+        			TraceManager.addDev("Conflict=" + conflictMessage);
+        			analysePorts(pport, mets, (conflictMessage != null), conflictMessage);
+        		} 
+        	}
+        }
     }
 
     public String propagate(SysCAMSPrimitivePort pport, TGConnectingPoint tp, TGConnector connector, ArrayList<SysCAMSChannelFacility> mets) {
@@ -757,7 +830,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         SysCAMSChannelFacility cp = null;
         String conflictMessage = null;
         String conflictMessageTmp;
-        int outindex, inindex;
 
         if (tp == connector.getTGConnectingPointP1()) {
             tp2 = connector.getTGConnectingPointP2();
@@ -766,7 +838,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         }
 
         TGComponent tgc = (TGComponent)(tp2.getFather());
-        int index = tgc.getIndexOfTGConnectingPoint(tp2);
 
         if (tgc instanceof SysCAMSPrimitivePort) {
             return conflictMessage;
@@ -775,57 +846,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         // Cycle?
         if (mets.contains(tgc)) {
             return "Connection contains a cycle";
-        }
-        if(tgc instanceof SysCAMSCompositePort) {
-            cp = (SysCAMSChannelFacility)tgc;
-            mets.add(cp);
-
-            inindex = cp.getInpIndex();
-            outindex = cp.getOutpIndex();
-            // Already positionned port?
-            if (pport.isOrigin()) {
-                if (cp.getOutPort() != null) {
-                    if (pport.getPortType() != 2) {
-                        conflictMessage = "Conflicting ports types";
-                    } else {
-                        if (cp.getOutPort().getPortType() != 2) {
-                            conflictMessage = "More than two sending non-request ports ";
-                        } else {
-                            if ((outindex<5 && index>4) || (outindex>4 && index<5)) {
-                                conflictMessage = "Sending ports on both side of a composite port";
-                            }
-                        }
-                    }
-                } else {
-                    if (inindex > -1) {
-                        if ((inindex<5 && index<5) || (inindex>4 && index>4)) {
-                            conflictMessage = "Sending and receiving ports on the same side of a composite port";
-                        }
-                    }
-                    cp.setOutPort(pport);
-                    cp.setOutpIndex(index);
-                }
-                conflictMessageTmp = explore(pport, tp2, cp, mets);
-                if (conflictMessageTmp != null) {
-                    conflictMessage = conflictMessageTmp;
-                }
-            } else {
-                if (cp.getInPort() != null) {
-                    conflictMessage = "More than two receiving ports ";
-                } else {
-                    if (outindex > -1) {
-                        if ((index<5 && outindex<5) || (index>4 && outindex>4)) {
-                            conflictMessage = "Sending and receiving ports on the same side of a composite port";
-                        }
-                    }
-                    cp.setInPort(pport);
-                    cp.setInpIndex(index);
-                }
-                conflictMessageTmp = explore(pport, tp2, cp, mets);
-                if (conflictMessageTmp != null) {
-                    conflictMessage = conflictMessageTmp;
-                }
-            }
         } else if(tgc instanceof SysCAMSFork) {
             // Only one out, more than one in is ok
             // No SysCAMSJoin
@@ -844,7 +864,7 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
                 }
             }
 
-            if (pport.isOrigin()) {
+            if (pport.getOrigin() == 1) {
                 if ((cp.getInPort() != null) && (cp.getInPort() != pport)) {
                     conflictMessage = "More than two sending ports  in a fork architecture";
                 }
@@ -874,7 +894,7 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
                 }
             }
 
-            if (!pport.isOrigin()) {
+            if (pport.getOrigin() == 0) {
                 if ((cp.getOutPort() != null) && (cp.getOutPort() != pport)) {
                     conflictMessage = "More than two receiving ports in a join architecture";
                 }
@@ -936,9 +956,12 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         while(iterator.hasNext()) {
             tgc = iterator.next();
 
-            if (tgc instanceof SysCAMSPrimitiveComponent) {
+            if (tgc instanceof SysCAMSBlockTDF) {
                 list.add(_topname + "::" + tgc.getValue());
             }
+            if (tgc instanceof SysCAMSBlockDE) {
+            	list.add(_topname + "::" + tgc.getValue());
+            }
         }
         return list;
     }
@@ -951,22 +974,32 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         while(iterator.hasNext()) {
             tgc = iterator.next();
             if( tgc instanceof SysCAMSCompositeComponent ) {
-                for( SysCAMSPrimitiveComponent primComp: ((SysCAMSCompositeComponent)tgc).getAllPrimitiveComponents() ) {
-                    for( Object o: primComp.getAttributeList() )   {
-                        String s = o.toString();
-                        list.add( primComp.getValue() + "." + s.substring( 2, s.length()-1 ) );
-                    }
+                for( SysCAMSBlockTDF primComp: ((SysCAMSCompositeComponent)tgc).getAllBlockTDFComponents() ) {
+                    Object o = primComp.getPeriod();
+                    String s = o.toString();
+                    list.add( primComp.getValue() + "." + s.substring( 2, s.length()-1 ) );
                 }
+//                for( SysCAMSBlockDE primComp: ((SysCAMSCompositeComponent)tgc).getAllBlockDEComponents() ) {
+//                	Object o = primComp.getPeriod();
+//            		String s = o.toString();
+//            		list.add( primComp.getValue() + "." + s.substring( 2, s.length()-1 ) );
+//                }
             }
         }
         return list;
     }
 
-    public Vector<String> getAllRecords(SysCAMSPrimitiveComponent tgc) {
+    public Vector<String> getAllRecords(SysCAMSBlockTDF tgc) {
         Vector<String> list = new Vector<String>();
         getAllRecords((SysCAMSCompositeComponent)(tgc.getFather()), list);
         return list;
     }
+    
+    public Vector<String> getAllRecords(SysCAMSBlockDE tgc) {
+    	Vector<String> list = new Vector<String>();
+    	getAllRecords((SysCAMSCompositeComponent)(tgc.getFather()), list);
+    	return list;
+    }
 
     public void getAllRecords(SysCAMSCompositeComponent comp,  Vector<String> list) {
         TGComponent tgc;
@@ -990,9 +1023,13 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         getAllRecords((SysCAMSCompositeComponent)(comp.getFather()), list);
     }
 
-    public SysCAMSRecordComponent getRecordNamed(SysCAMSPrimitiveComponent tgc, String _nameOfRecord) {
+    public SysCAMSRecordComponent getRecordNamed(SysCAMSBlockTDF tgc, String _nameOfRecord) {
         return getRecordNamed((SysCAMSCompositeComponent)(tgc.getFather()), _nameOfRecord);
     }
+    
+    public SysCAMSRecordComponent getRecordNamed(SysCAMSBlockDE tgc, String _nameOfRecord) {
+    	return getRecordNamed((SysCAMSCompositeComponent)(tgc.getFather()), _nameOfRecord);
+    }
 
     public SysCAMSRecordComponent getRecordNamed(SysCAMSCompositeComponent comp,  String _nameOfRecord) {
         TGComponent tgc;
@@ -1058,28 +1095,34 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         // and merge paths until nomore merging is possible
         for (TDiagramPanel panel: panels) {
             iterator = panel.getComponentList().listIterator();
-            List<SysCAMSCompositePort> listcp;
-            List<SysCAMSPrimitivePort> listpp;
+            List<SysCAMSPortTDF> listtdf;
+            List<SysCAMSPortDE> listde;
 
             while(iterator.hasNext()) {
                 tgc = iterator.next();
 
                 if (tgc instanceof SysCAMSCompositeComponent) {
-                    listcp = ((SysCAMSCompositeComponent)tgc).getAllInternalCompositePorts();
-                    for(SysCAMSCompositePort cp: listcp) {
-                        addToPaths(paths, cp);
-                    }
-                    listpp = ((SysCAMSCompositeComponent)tgc).getAllInternalPrimitivePorts();
-                    for(SysCAMSPrimitivePort pp: listpp) {
+                    listtdf = ((SysCAMSCompositeComponent)tgc).getAllInternalPortsTDF();
+                    for(SysCAMSPortTDF pp: listtdf) {
                         addToPaths(paths, pp);
                     }
+//                    listde = ((SysCAMSCompositeComponent)tgc).getAllInternalPortsDE();
+//                    for(SysCAMSPortDE pp: listde) {
+//                    	addToPaths(paths, pp);
+//                    }
                 }
-                if (tgc instanceof SysCAMSPrimitiveComponent) {
-                    listpp = ((SysCAMSPrimitiveComponent)tgc).getAllInternalPrimitivePorts();
-                    for(SysCAMSPrimitivePort pp: listpp) {
+                if (tgc instanceof SysCAMSBlockTDF) {
+                    listtdf = ((SysCAMSBlockTDF)tgc).getAllInternalPortsTDF();
+                    for(SysCAMSPrimitivePort pp: listtdf) {
                         addToPaths(paths, pp);
                     }
                 }
+                if (tgc instanceof SysCAMSBlockDE) {
+                	listde = ((SysCAMSBlockDE)tgc).getAllInternalPortsDE();
+                	for(SysCAMSPrimitivePort pp: listde) {
+                		addToPaths(paths, pp);
+                	}
+                }
                 if (tgc instanceof SysCAMSPrimitivePort) {
                     addToPaths(paths, tgc);
                 }
@@ -1110,12 +1153,6 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
                     } else {
                         tgc2 = null;
                     }
-                    if (tgc1 instanceof SysCAMSRemoteCompositeComponent) {
-                        tgc1 = ((SysCAMSRemoteCompositeComponent)tgc1).getPortOf(connector.getTGConnectingPointP1());
-                    }
-                    if (tgc2 instanceof SysCAMSRemoteCompositeComponent) {
-                        tgc2 = ((SysCAMSRemoteCompositeComponent)tgc2).getPortOf(connector.getTGConnectingPointP2());
-                    }
                     if ((tgc1 != null) && (tgc2 != null) && (tgc1 != tgc2)) {
                         path1 = getPathOf(paths, tgc1);
                         path2 = getPathOf(paths, tgc2);
@@ -1174,7 +1211,7 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
         while(iterator.hasNext()) {
             tgc = iterator.next();
             if (tgc instanceof SysCAMSCompositeComponent) {
-                if (((SysCAMSCompositeComponent)tgc).hasReferencesTo(syscamscc)) {
+                if (((SysCAMSCompositeComponent)tgc).hasRefencesTo(syscamscc)) {
                     panels.add(this);
                     return;
                 }
@@ -1189,17 +1226,17 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public String[] getAllOutDE(String nameOfComponent) {
-        SysCAMSPrimitiveComponent comp = getPrimitiveComponentByName(nameOfComponent);
+    	SysCAMSBlockDE comp = getBlockDEComponentByName(nameOfComponent);
         if (comp == null) {
             return null;
         }
-        List<SysCAMSPrimitivePort> ll = comp.getAllDEOriginPorts();
+        List<SysCAMSPortDE> ll = comp.getAllDEOriginPorts();
         String[]terms = new String[ll.size()];
-        Iterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+        Iterator<SysCAMSPortDE> ite = ll.listIterator();
         int i = 0;
 
         while(ite.hasNext()) {
-            SysCAMSPrimitivePort port = ite.next();
+        	SysCAMSPortDE port = ite.next();
             terms[i] = port.getPortName();
             i ++;
         }
@@ -1207,16 +1244,16 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public String[] getAllInDE(String nameOfComponent) {
-        SysCAMSPrimitiveComponent comp = getPrimitiveComponentByName(nameOfComponent);
+    	SysCAMSBlockDE comp = getBlockDEComponentByName(nameOfComponent);
         if (comp == null) {
             return null;
         }
-        List<SysCAMSPrimitivePort> ll = comp.getAllDEDestinationPorts();
+        List<SysCAMSPortDE> ll = comp.getAllDEDestinationPorts();
         String[]terms = new String[ll.size()];
-        ListIterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+        ListIterator<SysCAMSPortDE> ite = ll.listIterator();
         int i = 0;
         while(ite.hasNext()) {
-            SysCAMSPrimitivePort port = ite.next();
+        	SysCAMSPortDE port = ite.next();
             terms[i] = port.getPortName();
             i ++;
         }
@@ -1224,16 +1261,16 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public String[] getAllOutTDF(String nameOfComponent) {
-        SysCAMSPrimitiveComponent comp = getPrimitiveComponentByName(nameOfComponent);
+    	SysCAMSBlockTDF comp = getBlockTDFComponentByName(nameOfComponent);
         if (comp == null) {
             return null;
         }
-        List<SysCAMSPrimitivePort> ll = comp.getAllTDFOriginPorts();
+        List<SysCAMSPortTDF> ll = comp.getAllTDFOriginPorts();
         String[]terms = new String[ll.size()];
-        Iterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+        Iterator<SysCAMSPortTDF> ite = ll.listIterator();
         int i = 0;
         while(ite.hasNext()) {
-            SysCAMSPrimitivePort port = ite.next();
+        	SysCAMSPortTDF port = ite.next();
             terms[i] = port.getPortName();
             i++;
         }
@@ -1241,18 +1278,18 @@ public class SysCAMSComponentTaskDiagramPanel extends TDiagramPanel implements T
     }
 
     public String[] getAllInTDF(String nameOfComponent) {
-        SysCAMSPrimitiveComponent comp = getPrimitiveComponentByName(nameOfComponent);
+    	SysCAMSBlockTDF comp = getBlockTDFComponentByName(nameOfComponent);
         if (comp == null) {
             return null;
         }
 
-        List<SysCAMSPrimitivePort> ll = comp.getAllTDFDestinationPorts();
+        List<SysCAMSPortTDF> ll = comp.getAllTDFDestinationPorts();
         String[]terms = new String[ll.size()];
-        Iterator<SysCAMSPrimitivePort> ite = ll.listIterator();
+        Iterator<SysCAMSPortTDF> ite = ll.listIterator();
         int i = 0;
 
         while(ite.hasNext()) {
-            SysCAMSPrimitivePort port = ite.next();
+        	SysCAMSPortTDF port = ite.next();
             terms[i] = port.getPortName();
             i++;
         }
diff --git a/src/main/java/ui/syscams/SysCAMSCompositeComponent.java b/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
index fddb4ac31ae4bd8ac85a6e38c13c9a79d889c3e5..455c6f5676fd8a3fef910912494a457c304d6f13 100644
--- a/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
+++ b/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
@@ -54,155 +54,154 @@ import java.util.ListIterator;
  * Class SysCAMSCompositeComponent
  * Composite Component. To be used in SystemC-AMS diagrams
  * Creation: 27/04/2018
- *
- * @author Irina Kit Yan LEE
  * @version 1.0 27/04/2018
+ * @author Irina Kit Yan LEE
  */
 
-public class SysCAMSCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, HiddenInternalComponents {
-    private int maxFontSize = 20;
-    private int minFontSize = 4;
-    private int currentFontSize = -1;
-    private boolean displayText = true;
-    private Color myColor;
-    private int iconSize = 17;
-
-    private int textX = 15; // border for ports
-    private double dtextX = 0.0;
-
-    private boolean hiddeni;
-
-    private int compositePortNb = 0;
-
-    public SysCAMSCompositeComponent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+public class SysCAMSCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, HiddenInternalComponents {
+	private int maxFontSize = 20;
+	private int minFontSize = 4;
+	private int currentFontSize = -1;
+	private boolean displayText = true;
+	private Color myColor;
+	private int iconSize = 17;
+
+	private int textX = 15; // border for ports
+	private double dtextX = 0.0;	
+	
+	private boolean hiddeni;
+	
+	private int compositePortNb = 0;
+    
+    public SysCAMSCompositeComponent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
         super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
-        initScaling(250, 200);
-
-        oldScaleFactor = tdp.getZoom();
-        dtextX = textX * oldScaleFactor;
-        textX = (int) dtextX;
-        dtextX = dtextX - textX;
-
+        
+		initScaling(250, 200);
+		
+		oldScaleFactor = tdp.getZoom();
+		dtextX = textX * oldScaleFactor;
+		textX = (int)dtextX;
+		dtextX = dtextX - textX;
+		
         minWidth = 1;
         minHeight = 1;
-
+        
         nbConnectingPoint = 0;
         addTGConnectingPointsComment();
-
+        
         nbInternalTGComponent = 0;
-
-        maxWidth = 2000;
-        maxHeight = 2000;
-
+		
+		maxWidth = 2000;
+		maxHeight = 2000;
+        
         moveable = true;
         editable = true;
         removable = true;
         userResizable = true;
-
-        value = "Cluster";
-        name = "Composite component";
-
+        
+		value = "Cluster";
+		name = "Composite component";
+		
         myImageIcon = IconManager.imgic1200;
     }
-
+    
     public void internalDrawing(Graphics g) {
-        int w;
-        int c;
-        Font f = g.getFont();
-        Font fold = f;
-
-        if (myColor == null) {
-            if (ColorManager.TML_COMPOSITE_COMPONENT == Color.white) {
-                myColor = Color.white;
-            } else {
-                myColor = Color.white;
-            }
-        }
-        if ((rescaled) && (!tdp.isScaled())) {
-            if (currentFontSize == -1) {
-                currentFontSize = f.getSize();
-            }
-            rescaled = false;
-            // Must set the font size ..
-            // Find the biggest font not greater than max_font size
-            // By Increment of 1
-            // Or decrement of 1
-            // If font is less than 4, no text is displayed
-
-            int maxCurrentFontSize = Math.max(0, Math.min(height - (2 * textX), maxFontSize));
-
-            while (maxCurrentFontSize > (minFontSize - 1)) {
-                f = f.deriveFont((float) maxCurrentFontSize);
-                g.setFont(f);
-                w = g.getFontMetrics().stringWidth(value);
-                c = width - iconSize - (2 * textX);
-                if (w < c) {
-                    break;
-                }
-                maxCurrentFontSize--;
-            }
-            currentFontSize = maxCurrentFontSize;
+		int w;
+		int c;
+		Font f = g.getFont();
+		Font fold = f;
+		
+		if (myColor == null) {
+			if (ColorManager.TML_COMPOSITE_COMPONENT == Color.white) {
+				myColor = Color.white;
+			} else {
+				myColor = Color.white;
+			}
+		}
+		if ((rescaled) && (!tdp.isScaled())) {
+			if (currentFontSize == -1) {
+				currentFontSize = f.getSize();
+			}
+			rescaled = false;
+			// Must set the font size ..
+			// Find the biggest font not greater than max_font size
+			// By Increment of 1
+			// Or decrement of 1
+			// If font is less than 4, no text is displayed
+			
+			int maxCurrentFontSize = Math.max(0, Math.min(height-(2*textX), maxFontSize));
+			
+			while(maxCurrentFontSize > (minFontSize-1)) {
+				f = f.deriveFont((float)maxCurrentFontSize);
+				g.setFont(f);
+				w = g.getFontMetrics().stringWidth(value);
+				c = width - iconSize - (2 * textX);
+				if (w < c) {
+					break;
+				}
+				maxCurrentFontSize --;
+			}
+			currentFontSize = maxCurrentFontSize;
             displayText = currentFontSize >= minFontSize;
-        }
-        // Zoom is assumed to be computed
-        Color col = g.getColor();
-        g.drawRect(x, y, width, height);
-        if ((width > 2) && (height > 2)) {
-            g.setColor(myColor);
-            g.fillRect(x + 1, y + 1, width - 1, height - 1);
-            g.setColor(col);
-        }
+		}
+		// Zoom is assumed to be computed
+		Color col = g.getColor();
+		g.drawRect(x, y, width, height);
+		if ((width > 2) && (height > 2)) {
+			g.setColor(myColor);
+			g.fillRect(x+1, y+1, width-1, height-1);
+			g.setColor(col);
+		}
         // Font size 
-        if (displayText) {
-            f = f.deriveFont((float) currentFontSize);
-            g.setFont(f);
-            w = g.getFontMetrics().stringWidth(value);
-            if (!(w < (width - 2 * (iconSize + textX)))) {
-                g.drawString(value, x + textX + 1, y + currentFontSize + textX);
-            } else {
-                g.drawString(value, x + (width - w) / 2, y + currentFontSize + textX);
-            }
-        }
-        g.setFont(fold);
+		if (displayText) {
+			f = f.deriveFont((float)currentFontSize);
+			g.setFont(f);
+			w = g.getFontMetrics().stringWidth(value);
+			if (!(w < (width - 2 * (iconSize + textX)))) {
+				g.drawString(value, x + textX + 1, y + currentFontSize + textX);
+			} else {
+				g.drawString(value, x + (width - w)/2, y + currentFontSize + textX);
+			}
+		}
+		g.setFont(fold);
 //		// Icon
 //		if ((width>30) && (height > (iconSize + 2*textX))) {
 //			g.drawImage(IconManager.imgic1200.getImage(), x + width - iconSize - textX, y + textX, null);
 //		}
     }
-
-    public void rescale(double scaleFactor) {
-        dtextX = (textX + dtextX) / oldScaleFactor * scaleFactor;
-        textX = (int) (dtextX);
-        dtextX = dtextX - textX;
-        super.rescale(scaleFactor);
-    }
-
+	
+	public void rescale(double scaleFactor){
+		dtextX = (textX + dtextX) / oldScaleFactor * scaleFactor;
+		textX = (int)(dtextX);
+		dtextX = dtextX - textX; 
+		super.rescale(scaleFactor);
+	}
+    
     public TGComponent isOnOnlyMe(int _x, int _y) {
-        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
+		if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
             return this;
         }
         return null;
     }
-
+    
     public boolean editOndoubleClick(JFrame frame) {
-        String s = (String) JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
-                JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
-                null,
-                getValue());
+        String s = (String)JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
+		JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
+        null,
+        getValue());
         if ((s != null) && (s.length() > 0)) {
-            if (!TAttribute.isAValidId(s, false, false)) {
-                JOptionPane.showMessageDialog(frame,
-                        "Could not change the name of the component: the new name is not a valid name",
-                        "Error",
-                        JOptionPane.INFORMATION_MESSAGE);
-                return false;
-            }
-            if (((SysCAMSComponentTaskDiagramPanel) (tdp)).isCompositeNameUsed(s)) {
+			if (!TAttribute.isAValidId(s, false, false)) {
+				JOptionPane.showMessageDialog(frame,
+					"Could not change the name of the component: the new name is not a valid name",
+					"Error",
+					JOptionPane.INFORMATION_MESSAGE);
+				return false;
+			}
+			if (((SysCAMSComponentTaskDiagramPanel)(tdp)).isCompositeNameUsed(s)) {
                 JOptionPane.showMessageDialog(frame,
-                        "Error: the name is already in use",
-                        "Name modification",
-                        JOptionPane.ERROR_MESSAGE);
+                                              "Error: the name is already in use",
+                                              "Name modification",
+                                              JOptionPane.ERROR_MESSAGE);
                 return false;
             }
             setValueWithChange(s);
@@ -210,334 +209,301 @@ public class SysCAMSCompositeComponent extends TGCScalableWithInternalComponent
         }
         return false;
     }
-
+    
     public int getType() {
         return TGComponentManager.CAMS_CLUSTER;
     }
-
-    public void wasSwallowed() {
-        myColor = null;
-    }
-
-    public void wasUnswallowed() {
-        myColor = null;
-        setFather(null);
-        TDiagramPanel tdp = getTDiagramPanel();
-        setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
-    }
-
-    public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-        if (tgc instanceof SysCAMSCompositeComponent) {
-            return true;
-        }
-        if (tgc instanceof SysCAMSRecordComponent) {
-            return true;
-        }
-        if (tgc instanceof SysCAMSPrimitiveComponent) {
-            return true;
-        }
-        if (tgc instanceof SysCAMSRemoteCompositeComponent) {
-            return true;
-        }
-        return tgc instanceof SysCAMSCompositePort;
-    }
-
+	
+	public void wasSwallowed() {
+		myColor = null;
+	}
+	
+	public void wasUnswallowed() {
+		myColor = null;
+		setFather(null);
+		TDiagramPanel tdp = getTDiagramPanel();
+		setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+	}
+	
     public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
-        boolean swallowed = false;
-
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SwallowTGComponent) {
-                if (((SwallowTGComponent) tgcomponent[i]).acceptSwallowedTGComponent(tgc)) {
-                    if (tgcomponent[i].isOnMe(x, y) != null) {
-                        swallowed = true;
-                        ((SwallowTGComponent) tgcomponent[i]).addSwallowedTGComponent(tgc, x, y);
-                        break;
-                    }
-                }
-            }
-        }
-        if (swallowed) {
-            return true;
-        }
-        if (!acceptSwallowedTGComponent(tgc)) {
-            return false;
-        }
+		boolean swallowed = false;
+		
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SwallowTGComponent) {
+				if (((SwallowTGComponent)tgcomponent[i]).acceptSwallowedTGComponent(tgc)) {
+					if (tgcomponent[i].isOnMe(x, y) != null) {
+						swallowed = true;
+						((SwallowTGComponent)tgcomponent[i]).addSwallowedTGComponent(tgc, x, y);
+						break;
+					}
+				}
+			}
+        }
+		if (swallowed) {
+			return true;
+		}
+		if (!acceptSwallowedTGComponent(tgc)) {
+			return false;
+		}
         // Choose its position
-
+        
         // Make it an internal component
         // It's one of my son
         tgc.setFather(this);
         tgc.setDrawingZone(true);
-
+        
         //Set its coordinates
         if (tgc instanceof SysCAMSCompositeComponent) {
             tgc.resizeWithFather();
         }
-
-        if (tgc instanceof SysCAMSRecordComponent) {
-            tgc.resizeWithFather();
-        }
-
-        if (tgc instanceof SysCAMSPrimitiveComponent) {
+		if (tgc instanceof SysCAMSRecordComponent) {
             tgc.resizeWithFather();
         }
-
-        if (tgc instanceof SysCAMSRemoteCompositeComponent) {
+		if (tgc instanceof SysCAMSBlockTDF) {
             tgc.resizeWithFather();
         }
-        if (tgc instanceof SysCAMSCompositePort) {
+		if (tgc instanceof SysCAMSBlockDE) {
+			tgc.resizeWithFather();
+		}
+		if (tgc instanceof SysCAMSRemoteCompositeComponent) {
             tgc.resizeWithFather();
-            compositePortNb++;
         }
         //add it
         addInternalComponent(tgc, 0);
-        return true;
+		return true;
     }
-
+    
     public void removeSwallowedTGComponent(TGComponent tgc) {
-        if (tgc instanceof SysCAMSCompositePort) {
-            portRemoved();
-        }
-        for (int i = 0; i < nbInternalTGComponent; i++) {
+		 for(int i=0; i<nbInternalTGComponent; i++) {
             if (tgcomponent[i] == tgc) {
-                nbInternalTGComponent = nbInternalTGComponent - 1;
+				nbInternalTGComponent = nbInternalTGComponent - 1;
                 if (nbInternalTGComponent == 0) {
                     tgcomponent = null;
                 } else {
-                    TGComponent[] tgcomponentbis = new TGComponent[nbInternalTGComponent];
-                    for (int j = 0; j < nbInternalTGComponent; j++) {
-                        if (j < i) {
+                    TGComponent [] tgcomponentbis = new TGComponent[nbInternalTGComponent];
+                    for(int j=0; j<nbInternalTGComponent; j++) {
+                        if (j<i) {
                             tgcomponentbis[j] = tgcomponent[j];
                         }
-                        if (j >= i) {
-                            tgcomponentbis[j] = tgcomponent[j + 1];
+                        if (j>=i) {
+                            tgcomponentbis[j] = tgcomponent[j+1];
                         }
                     }
                     tgcomponent = tgcomponentbis;
                 }
-                break;
-            }
-        }
+				break;
+			}
+		 }
     }
-
+    
     public void hasBeenResized() {
-        rescaled = true;
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                tgcomponent[i].resizeWithFather();
-            }
-            if (tgcomponent[i] instanceof SysCAMSPrimitiveComponent) {
-                tgcomponent[i].resizeWithFather();
-            }
-            if (tgcomponent[i] instanceof SysCAMSRecordComponent) {
-                tgcomponent[i].resizeWithFather();
-            }
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                tgcomponent[i].resizeWithFather();
-            }
-            if (tgcomponent[i] instanceof SysCAMSCompositePort) {
-                tgcomponent[i].resizeWithFather();
-            }
-        }
-        if (getFather() != null) {
-            resizeWithFather();
-        }
-    }
-
-    public void resizeWithFather() {
-        if ((father != null) && ((father instanceof SysCAMSCompositeComponent) || (father instanceof SysCAMSPrimitiveComponent))) {
-            // Too large to fit in the father? -> resize it!
-            resizeToFatherSize();
-
+		rescaled = true;
+        for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				tgcomponent[i].resizeWithFather();
+			}
+			if (tgcomponent[i] instanceof SysCAMSBlockTDF) {
+				tgcomponent[i].resizeWithFather();
+			}
+			if (tgcomponent[i] instanceof SysCAMSBlockDE) {
+				tgcomponent[i].resizeWithFather();
+			}
+			if (tgcomponent[i] instanceof SysCAMSRecordComponent) {
+				tgcomponent[i].resizeWithFather();
+			}
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				tgcomponent[i].resizeWithFather();
+			}
+        }
+		if (getFather() != null) {
+			resizeWithFather();
+		}
+    }
+	
+	public void resizeWithFather() {
+        if ((father != null) && ((father instanceof SysCAMSCompositeComponent) || (father instanceof SysCAMSBlockTDF) || (father instanceof SysCAMSBlockDE))) {
+			// Too large to fit in the father? -> resize it!
+			resizeToFatherSize();
+			
             setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
             setMoveCd(x, y);
         }
     }
-
-    public java.util.List<SysCAMSPrimitiveComponent> getAllPrimitiveComponents() {
-        ArrayList<SysCAMSPrimitiveComponent> ll = new ArrayList<SysCAMSPrimitiveComponent>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                ll.addAll(((SysCAMSCompositeComponent) tgcomponent[i]).getAllPrimitiveComponents());
-            }
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                ll.addAll(((SysCAMSRemoteCompositeComponent) tgcomponent[i]).getAllPrimitiveComponents());
-            }
-            if (tgcomponent[i] instanceof SysCAMSPrimitiveComponent) {
-                ll.add(((SysCAMSPrimitiveComponent) (tgcomponent[i])));
-            }
-        }
-        return ll;
-    }
-
-    public ArrayList<SysCAMSRecordComponent> getAllRecordComponents() {
-        ArrayList<SysCAMSRecordComponent> ll = new ArrayList<SysCAMSRecordComponent>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                ll.addAll(((SysCAMSCompositeComponent) tgcomponent[i]).getAllRecordComponents());
-            }
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                ll.addAll(((SysCAMSRemoteCompositeComponent) tgcomponent[i]).getAllRecordComponents());
-            }
-
-            if (tgcomponent[i] instanceof SysCAMSRecordComponent) {
-                ll.add(((SysCAMSRecordComponent) (tgcomponent[i])));
-            }
-        }
-        return ll;
-    }
-
-    public void getAllCompositeComponents(ArrayList<String> list, String _name) {
-        String s;
-        SysCAMSCompositeComponent syscamscc;
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                syscamscc = (SysCAMSCompositeComponent) tgcomponent[i];
-                s = _name + "::" + syscamscc.getValue();
-                list.add(s);
-                syscamscc.getAllCompositeComponents(list, _name);
-            }
-        }
-    }
-
-    public ArrayList<SysCAMSCompositePort> getAllInternalCompositePorts() {
-        ArrayList<SysCAMSCompositePort> list = new ArrayList<SysCAMSCompositePort>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                list.addAll(((SysCAMSCompositeComponent) tgcomponent[i]).getAllInternalCompositePorts());
-            }
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                list.addAll(((SysCAMSRemoteCompositeComponent) tgcomponent[i]).getAllInternalCompositePorts());
-            }
-            if (tgcomponent[i] instanceof SysCAMSCompositePort) {
-                list.add((SysCAMSCompositePort) (tgcomponent[i]));
-            }
-        }
-        return list;
-    }
-
-    public ArrayList<SysCAMSCompositePort> getAllReferencedCompositePorts() {
-        ArrayList<SysCAMSCompositePort> list = new ArrayList<SysCAMSCompositePort>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                list.addAll(((SysCAMSCompositeComponent) tgcomponent[i]).getAllReferencedCompositePorts());
-            }
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                list.addAll(((SysCAMSRemoteCompositeComponent) tgcomponent[i]).getAllInternalCompositePorts());
-            }
-        }
-        return list;
-    }
-
-    public ArrayList<SysCAMSCompositePort> getFirstLevelCompositePorts() {
-        ArrayList<SysCAMSCompositePort> list = new ArrayList<SysCAMSCompositePort>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositePort) {
-                list.add((SysCAMSCompositePort) (tgcomponent[i]));
-            }
-        }
-        return list;
-    }
-
-    public ArrayList<SysCAMSPrimitivePort> getAllInternalPrimitivePorts() {
-        ArrayList<SysCAMSPrimitivePort> list = new ArrayList<SysCAMSPrimitivePort>();
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                list.addAll(((SysCAMSCompositeComponent) tgcomponent[i]).getAllInternalPrimitivePorts());
-            }
-            if (tgcomponent[i] instanceof SysCAMSPrimitiveComponent) {
-                list.addAll(((SysCAMSPrimitiveComponent) tgcomponent[i]).getAllInternalPrimitivePorts());
-            }
-        }
-        return list;
-    }
-
-    public SysCAMSPrimitiveComponent getPrimitiveComponentByName(String _name) {
-        SysCAMSPrimitiveComponent tgc;
-        ListIterator<SysCAMSPrimitiveComponent> li = getAllPrimitiveComponents().listIterator();
-
-        while (li.hasNext()) {
-            tgc = li.next();
-            if (tgc.getValue().equals(_name)) {
-                return tgc;
-            }
-        }
-        return null;
-    }
-
-    public SysCAMSCompositeComponent getCompositeComponentByName(String _name) {
-        TGComponent tgc;
-        SysCAMSCompositeComponent tmp;
-
-        for (int i = 0; i < nbInternalTGComponent; i++) {
+	
+	public java.util.List<SysCAMSBlockTDF> getAllBlockTDFComponents() {
+		ArrayList<SysCAMSBlockTDF> ll = new ArrayList<SysCAMSBlockTDF>();
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				ll.addAll(((SysCAMSCompositeComponent)tgcomponent[i]).getAllBlockTDFComponents());
+			}
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				ll.addAll(((SysCAMSRemoteCompositeComponent)tgcomponent[i]).getAllBlockTDFComponents());
+			}
+			if (tgcomponent[i] instanceof SysCAMSBlockTDF) {
+				ll.add(((SysCAMSBlockTDF)(tgcomponent[i])));
+			}
+		}
+		return ll;
+	}
+	
+//	public java.util.List<SysCAMSBlockDE> getAllBlockDEComponents() {
+//		ArrayList<SysCAMSBlockDE> ll = new ArrayList<SysCAMSBlockDE>();
+//		for(int i=0; i<nbInternalTGComponent; i++) {
+//			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+//				ll.addAll(((SysCAMSCompositeComponent)tgcomponent[i]).getAllBlockDEComponents());
+//			}
+//			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+//				ll.addAll(((SysCAMSRemoteCompositeComponent)tgcomponent[i]).getAllBlockDEComponents());
+//			}
+//			if (tgcomponent[i] instanceof SysCAMSBlockDE) {
+//				ll.add(((SysCAMSBlockDE)(tgcomponent[i])));
+//			}
+//		}
+//		return ll;
+//	}
+	
+	public ArrayList<SysCAMSRecordComponent> getAllRecordComponents() {
+		ArrayList<SysCAMSRecordComponent> ll = new ArrayList<SysCAMSRecordComponent>();
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				ll.addAll(((SysCAMSCompositeComponent)tgcomponent[i]).getAllRecordComponents());
+			}
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				ll.addAll(((SysCAMSRemoteCompositeComponent)tgcomponent[i]).getAllRecordComponents());
+			}
+			
+			if (tgcomponent[i] instanceof SysCAMSRecordComponent) {
+				ll.add(((SysCAMSRecordComponent)(tgcomponent[i])));
+			}
+		}
+		return ll;
+	}
+	
+	public void getAllCompositeComponents(ArrayList<String> list, String _name) {
+		String s;
+		SysCAMSCompositeComponent syscamscc;
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				syscamscc = (SysCAMSCompositeComponent)tgcomponent[i];
+				s = _name + "::" + syscamscc.getValue();
+				list.add(s);
+				syscamscc.getAllCompositeComponents(list, _name);
+			}
+		}
+	}
+	
+	public ArrayList<SysCAMSPortTDF> getAllInternalPortsTDF() {
+		ArrayList<SysCAMSPortTDF> list = new ArrayList<SysCAMSPortTDF>();
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				list.addAll(((SysCAMSCompositeComponent)tgcomponent[i]).getAllInternalPortsTDF());
+			}
+			if (tgcomponent[i] instanceof SysCAMSBlockTDF) {
+				list.addAll(((SysCAMSBlockTDF)tgcomponent[i]).getAllInternalPortsTDF());
+			}
+		}
+		return list;
+	}
+	
+//	public ArrayList<SysCAMSPortDE> getAllInternalPortsDE() {
+//		ArrayList<SysCAMSPortDE> list = new ArrayList<SysCAMSPortDE>();
+//		for(int i=0; i<nbInternalTGComponent; i++) {
+//			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+//				list.addAll(((SysCAMSCompositeComponent)tgcomponent[i]).getAllInternalPortsDE());
+//			}
+//			if (tgcomponent[i] instanceof SysCAMSBlockDE) {
+//				list.addAll(((SysCAMSBlockDE)tgcomponent[i]).getAllInternalPortsDE());
+//			}
+//		}
+//		return list;
+//	}
+	
+	public SysCAMSBlockTDF getBlockTDFComponentByName(String _name) {
+		SysCAMSBlockTDF tgc;
+		ListIterator<SysCAMSBlockTDF> li = getAllBlockTDFComponents().listIterator();
+		
+		while(li.hasNext()) {
+			tgc = li.next();
+			if (tgc.getValue().equals(_name)) {
+				return tgc;
+			}
+		}
+		return null;
+	}
+	
+//	public SysCAMSBlockDE getBlockDEComponentByName(String _name) {
+//		SysCAMSBlockDE tgc;
+//		ListIterator<SysCAMSBlockDE> li = getAllBlockDEComponents().listIterator();
+//		
+//		while(li.hasNext()) {
+//			tgc = li.next();
+//			if (tgc.getValue().equals(_name)) {
+//				return tgc;
+//			}
+//		}
+//		return null;
+//	}
+	
+	public SysCAMSCompositeComponent getCompositeComponentByName(String _name) {
+		TGComponent tgc;
+		SysCAMSCompositeComponent tmp;
+        
+       for(int i=0; i<nbInternalTGComponent; i++) {
             tgc = tgcomponent[i];
             if (tgc instanceof SysCAMSCompositeComponent) {
-                tmp = (SysCAMSCompositeComponent) tgc;
-                if (tmp.getValue().equals(_name)) {
-                    return tmp;
-                }
-
-                if ((tmp = tmp.getCompositeComponentByName(name)) != null) {
-                    return tmp;
-                }
-            }
-        }
-        return null;
-    }
-
-    public void setInternalsHidden(boolean hide) {
-        hiddeni = hide;
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (!(tgcomponent[i] instanceof SysCAMSCompositePort)) {
-                tgcomponent[i].setHidden(hide);
-            }
-        }
-
-        if (tdp instanceof SysCAMSComponentTaskDiagramPanel) {
-            ((SysCAMSComponentTaskDiagramPanel) tdp).hideConnectors();
-        }
-    }
-
-    public boolean areInternalsHidden() {
-        return hiddeni;
-    }
-
-    public void drawInternalComponentsWhenHidden(Graphics g) {
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositePort) {
-                tgcomponent[i].draw(g);
-            }
-        }
-    }
-
+				tmp = (SysCAMSCompositeComponent)tgc;
+				if (tmp.getValue().equals(_name)) {
+					return tmp;
+				}
+				
+				if ((tmp = tmp.getCompositeComponentByName(name)) != null) {
+					return tmp;
+				}
+            }
+        }
+		return null;
+	}
+	
+	public void setInternalsHidden(boolean hide) {
+		hiddeni = hide;
+		
+		if (tdp instanceof SysCAMSComponentTaskDiagramPanel) {
+			((SysCAMSComponentTaskDiagramPanel)tdp).hideConnectors();
+		}
+	}
+	
+	public boolean areInternalsHidden() {
+		return hiddeni;
+	}
+	
     protected String translateExtraParam() {
         StringBuffer sb = new StringBuffer("<extraparam>\n");
-        sb.append("<info hiddeni=\"" + hiddeni + "\" ");
+        sb.append("<info hiddeni=\"" + hiddeni + "\" "); 
         sb.append("/>\n");
         sb.append("</extraparam>\n");
         return new String(sb);
     }
-
-    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException {
+    
+    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
         try {
             NodeList nli;
             Node n1, n2;
             Element elt;
-
-            for (int i = 0; i < nl.getLength(); i++) {
+            
+            for(int i=0; i<nl.getLength(); i++) {
                 n1 = nl.item(i);
                 if (n1.getNodeType() == Node.ELEMENT_NODE) {
                     nli = n1.getChildNodes();
-                    for (int j = 0; j < nli.getLength(); j++) {
+                    for(int j=0; j<nli.getLength(); j++) {
                         n2 = nli.item(j);
                         if (n2.getNodeType() == Node.ELEMENT_NODE) {
                             elt = (Element) n2;
                             if (elt.getTagName().equals("info")) {
-                                if (elt.getAttribute("hiddeni").equals("true")) {
-                                    setInternalsHidden(true);
-                                }
-                            }
-
+								if (elt.getAttribute("hiddeni").equals("true")) {
+									setInternalsHidden(true);
+								}
+							}
+							
                         }
                     }
                 }
@@ -546,88 +512,95 @@ public class SysCAMSCompositeComponent extends TGCScalableWithInternalComponent
             throw new MalformedModelingException();
         }
     }
-
-    public void drawTGConnectingPoint(Graphics g, int type) {
-        for (int i = 0; i < nbConnectingPoint; i++) {
+	
+	public void drawTGConnectingPoint(Graphics g, int type) {
+        for (int i=0; i<nbConnectingPoint; i++) {
             if (connectingPoint[i].isCompatibleWith(type)) {
                 connectingPoint[i].draw(g);
             }
         }
-
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (hiddeni) {
-                if (tgcomponent[i] instanceof SysCAMSCompositePort) {
-                    tgcomponent[i].drawTGConnectingPoint(g, type);
-                }
-            } else {
-                tgcomponent[i].drawTGConnectingPoint(g, type);
-            }
-        }
-    }
-
-    public String getExtendedValue() {
-        return getValuePanel() + "::" + getValue();
-    }
-
-    public void myActionWhenRemoved() {
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                tgcomponent[i].myActionWhenRemoved();
-            }
-        }
-        tdp = null;
-    }
-
-    public void updateReferenceToSysCAMSCompositeComponent(SysCAMSCompositeComponent syscamscc) {
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                ((SysCAMSRemoteCompositeComponent) tgcomponent[i]).updateReference(syscamscc);
-            }
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                ((SysCAMSCompositeComponent) tgcomponent[i]).updateReferenceToSysCAMSCompositeComponent(syscamscc);
-            }
-        }
-    }
-
-    public void delayedLoad() {
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                try {
-                    ((SysCAMSRemoteCompositeComponent) tgcomponent[i]).delayedLoad();
-                } catch (Exception e) {
-                }
-            }
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                ((SysCAMSCompositeComponent) tgcomponent[i]).delayedLoad();
-            }
-        }
-    }
-
-    public int getCompositePortNb() {
-        return compositePortNb;
-    }
-
-    public void portRemoved() {
-        compositePortNb--;
-    }
-
-    public boolean hasReferencesTo(SysCAMSCompositeComponent syscamscc) {
-        boolean b;
-
-        for (int i = 0; i < nbInternalTGComponent; i++) {
-            if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
-                b = ((SysCAMSRemoteCompositeComponent) tgcomponent[i]).getReference() == syscamscc;
-                if (b) {
-                    return true;
-                }
-            }
-            if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
-                b = ((SysCAMSCompositeComponent) tgcomponent[i]).hasReferencesTo(syscamscc);
-                if (b) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
\ No newline at end of file
+		
+        for(int i=0; i<nbInternalTGComponent; i++) {
+			if (hiddeni) {
+			} else {
+				tgcomponent[i].drawTGConnectingPoint(g, type);
+			}
+        }
+    }
+	
+	public String getExtendedValue() {
+		return getValuePanel() + "::" + getValue();
+	}
+	
+	public void myActionWhenRemoved() {
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				tgcomponent[i].myActionWhenRemoved();
+			}
+		}
+		tdp = null;
+	}
+	
+	public void updateReferenceToSysCAMSCompositeComponent(SysCAMSCompositeComponent syscamscc) {
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				((SysCAMSRemoteCompositeComponent)tgcomponent[i]).updateReference(syscamscc);
+			}
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				((SysCAMSCompositeComponent)tgcomponent[i]).updateReferenceToSysCAMSCompositeComponent(syscamscc);
+			}
+		}
+	}
+	
+	public void delayedLoad() {
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				try {
+					((SysCAMSRemoteCompositeComponent)tgcomponent[i]).delayedLoad();
+				} catch (Exception e) {
+				}
+			}
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				((SysCAMSCompositeComponent)tgcomponent[i]).delayedLoad();
+			}
+		}
+	}
+	
+	public int getCompositePortNb() {
+		return compositePortNb;
+	}
+	
+	public void portRemoved() {
+		compositePortNb --;
+	}
+	
+	public boolean hasRefencesTo(SysCAMSCompositeComponent syscamscc) {
+		boolean b;
+		
+		for(int i=0; i<nbInternalTGComponent; i++) {
+			if (tgcomponent[i] instanceof SysCAMSRemoteCompositeComponent) {
+				b = ((SysCAMSRemoteCompositeComponent)tgcomponent[i]).getReference() == syscamscc;
+				if (b) {
+					return true;
+				}
+			}
+			if (tgcomponent[i] instanceof SysCAMSCompositeComponent) {
+				b = ((SysCAMSCompositeComponent)tgcomponent[i]).hasRefencesTo(syscamscc);
+				if (b) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
+    	if (tgc instanceof SysCAMSBlockTDF) {
+    		return tgc instanceof SysCAMSBlockTDF;
+    	} else if (tgc instanceof SysCAMSBlockDE) {
+    		return tgc instanceof SysCAMSBlockDE;
+    	} else {
+    		return true;
+    	}
+	}
+}
diff --git a/src/main/java/ui/syscams/SysCAMSPath.java b/src/main/java/ui/syscams/SysCAMSPath.java
index 9b05b7de2dd0bb7c36c54b4c59ede8ca97dae344..e8fd0e60bac17b0382d11e3f8eb06fcb78c1c085 100644
--- a/src/main/java/ui/syscams/SysCAMSPath.java
+++ b/src/main/java/ui/syscams/SysCAMSPath.java
@@ -55,7 +55,6 @@ public class SysCAMSPath  {
     public ArrayList<SysCAMSPrimitivePort> consumerPorts;
 
     // Facilities
-    public ArrayList<SysCAMSCompositePort> cports;
     public ArrayList<SysCAMSFork> forks;
     public ArrayList<SysCAMSJoin> joins;
 
@@ -78,7 +77,6 @@ public class SysCAMSPath  {
     };
 
     public SysCAMSPath() {
-        cports = new ArrayList<SysCAMSCompositePort>();
         producerPorts = new ArrayList<SysCAMSPrimitivePort>();
         consumerPorts = new ArrayList<SysCAMSPrimitivePort>();
         forks = new ArrayList<SysCAMSFork>();
@@ -86,12 +84,9 @@ public class SysCAMSPath  {
     }
 
     public void addComponent(TGComponent _tgc) {
-        if (_tgc instanceof SysCAMSCompositePort) {
-            cports.add((SysCAMSCompositePort)_tgc);
-        }
         if (_tgc instanceof SysCAMSPrimitivePort) {
             SysCAMSPrimitivePort p = (SysCAMSPrimitivePort)_tgc;
-            if (p.isOrigin()) {
+            if (p.getOrigin() == 1) {
                 producerPorts.add(p);
             } else {
                 consumerPorts.add(p);
@@ -114,9 +109,6 @@ public class SysCAMSPath  {
     }
 
     public boolean contains(TGComponent tgc) {
-        if (cports.contains(tgc)) {
-            return true;
-        }
         if (producerPorts.contains(tgc)) {
             return true;
         }
@@ -130,7 +122,6 @@ public class SysCAMSPath  {
     }
 
     public void mergeWith(SysCAMSPath _path) {
-        cports.addAll(_path.cports);
         producerPorts.addAll(_path.producerPorts);
         consumerPorts.addAll(_path.consumerPorts);
         forks.addAll(_path.forks);
@@ -323,25 +314,6 @@ public class SysCAMSPath  {
             }
         }
 
-        for (SysCAMSCompositePort port: cports) {
-            if (producerPorts.size() > 0) {
-                port.setOutPort(producerPorts.get(0));
-            } else {
-                port.setOutPort(null);
-            }
-
-            if (consumerPorts.size() > 0) {
-                port.setInPort(consumerPorts.get(0));
-            } else {
-                port.setInPort(null);
-            }
-            if (hasError()) {
-                port.setConflict(hasError(), errors[errorNumber]);
-            } else {
-                port.setConflict(false, "");
-            }
-        }
-
         for (SysCAMSPrimitivePort pport: producerPorts) {
             if (hasError()) {
                 pport.setConflict(hasError(), errors[errorNumber]);
diff --git a/src/main/java/ui/syscams/SysCAMSPortConnector.java b/src/main/java/ui/syscams/SysCAMSPortConnector.java
index 6766b226e7e2da3e737f8d025a877cabf6dd12b8..df5a52e3842a10481bb75d3a72e886ce6696bdde 100644
--- a/src/main/java/ui/syscams/SysCAMSPortConnector.java
+++ b/src/main/java/ui/syscams/SysCAMSPortConnector.java
@@ -126,7 +126,7 @@ public  class SysCAMSPortConnector extends TGConnector implements ScalableTGComp
     }
 
     public int getType() {
-        return TGComponentManager.CONNECTOR_PORT_TMLC;
+        return TGComponentManager.CAMS_CONNECTOR;
     }
 
     public void specificActionAfterAdd() {
diff --git a/src/main/java/ui/syscams/SysCAMSPortConverter.java b/src/main/java/ui/syscams/SysCAMSPortConverter.java
index ceaf066a161e5df9411e519ffc91c32ea0c9144a..b4bedc05ee8472fcce8d4ca82619de84285e4d23 100644
--- a/src/main/java/ui/syscams/SysCAMSPortConverter.java
+++ b/src/main/java/ui/syscams/SysCAMSPortConverter.java
@@ -1,57 +1,99 @@
-package ui.syscams;
-
-import ui.TDiagramPanel;
-import ui.TGComponent;
-
-public class SysCAMSPortConverter extends SysCAMSCompositePort {
-	private int period;
-	private int rate;
-	private int delay;
-	private String origin;
-	private String convType;
-	
-	public SysCAMSPortConverter(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
-		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-	}
-
-	public int getPeriod() {
-		return period;
-	}
-
-	public void setPeriod(int period) {
-		this.period = period;
-	}
-
-	public int getRate() {
-		return rate;
-	}
-
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
-	public int getDelay() {
-		return delay;
-	}
-
-	public void setDelay(int delay) {
-		this.delay = delay;
-	}
-
-	public String getOrigin() {
-		return origin;
-	}
-
-	public void setOrigin(String origin) {
-		this.origin = origin;
-	}
-
-	public String getConvType() {
-		return convType;
-	}
-
-	public void setConvType(String convType) {
-		this.convType = convType;
-	}
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.syscams;
+
+import java.awt.Graphics;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+
+/**
+ * Class SysCAMSPortConverter
+ * Primitive port. To be used in SystemC-AMS diagrams
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class SysCAMSPortConverter extends SysCAMSPrimitivePort {
+	private int period;
+	private int rate;
+	private int delay;
+	private String convType;
+	
+	public SysCAMSPortConverter(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
+			TGComponent _father, TDiagramPanel _tdp) {
+		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+	}
+
+	public int getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
+	}
+
+	public int getRate() {
+		return rate;
+	}
+
+	public void setRate(int rate) {
+		this.rate = rate;
+	}
+
+	public int getDelay() {
+		return delay;
+	}
+
+	public void setDelay(int delay) {
+		this.delay = delay;
+	}
+
+	public String getConvType() {
+		return convType;
+	}
+
+	public void setConvType(String convType) {
+		this.convType = convType;
+	}
+
+	public void drawParticularity(Graphics g) {
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/ui/syscams/SysCAMSPortDE.java b/src/main/java/ui/syscams/SysCAMSPortDE.java
index 5f837c6d98ef73b27dee5190206b92bf473b6192..2ec7fbc38c8fcd21d975983024865822cf5e9780 100644
--- a/src/main/java/ui/syscams/SysCAMSPortDE.java
+++ b/src/main/java/ui/syscams/SysCAMSPortDE.java
@@ -1,62 +1,99 @@
-package ui.syscams;
-
-import java.awt.Graphics;
-
-import ui.TDiagramPanel;
-import ui.TGComponent;
-
-public class SysCAMSPortDE extends SysCAMSPrimitivePort {
-	private int period;
-	private int rate;
-	private int delay;
-	private String origin;
-	private String DEType;
-	
-	public SysCAMSPortDE(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
-			TDiagramPanel _tdp) {
-		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-	}
-
-	public String getDEType() {
-		return DEType;
-	}
-
-	public void setDEType(String DEType) {
-		this.DEType = DEType;
-	}
-
-	public String getOrigin() {
-		return origin;
-	}
-
-	public void setOrigin(String origin) {
-		this.origin = origin;
-	}
-
-	public int getPeriod() {
-		return period;
-	}
-
-	public void setPeriod(int period) {
-		this.period = period;
-	}
-
-	public int getRate() {
-		return rate;
-	}
-
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
-	public int getDelay() {
-		return delay;
-	}
-
-	public void setDelay(int delay) {
-		this.delay = delay;
-	}
-
-	public void drawParticularity(Graphics g) {
-	}	
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.syscams;
+
+import java.awt.Graphics;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+
+/**
+ * Class SysCAMSPortDE
+ * Primitive port. To be used in SystemC-AMS diagrams
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class SysCAMSPortDE extends SysCAMSPrimitivePort {
+	private int period;
+	private int rate;
+	private int delay;
+	private String DEType;
+	
+	public SysCAMSPortDE(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
+			TDiagramPanel _tdp) {
+		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+	}
+
+	public String getDEType() {
+		return DEType;
+	}
+
+	public void setDEType(String DEType) {
+		this.DEType = DEType;
+	}
+
+	public int getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
+	}
+
+	public int getRate() {
+		return rate;
+	}
+
+	public void setRate(int rate) {
+		this.rate = rate;
+	}
+
+	public int getDelay() {
+		return delay;
+	}
+
+	public void setDelay(int delay) {
+		this.delay = delay;
+	}
+
+	public void drawParticularity(Graphics g) {
+	}	
 }
\ No newline at end of file
diff --git a/src/main/java/ui/syscams/SysCAMSPortTDF.java b/src/main/java/ui/syscams/SysCAMSPortTDF.java
index afc054a3a0fdb69e45bb3207c43c9f85f22ec5af..59010f2324173a3fe0b2cfdfb4552caaea20ec67 100644
--- a/src/main/java/ui/syscams/SysCAMSPortTDF.java
+++ b/src/main/java/ui/syscams/SysCAMSPortTDF.java
@@ -1,62 +1,99 @@
-package ui.syscams;
-
-import java.awt.Graphics;
-
-import ui.TDiagramPanel;
-import ui.TGComponent;
-
-public class SysCAMSPortTDF extends SysCAMSPrimitivePort {
-	private int period;
-	private int rate;
-	private int delay;
-	private String origin;
-	private String TDFType;
-	
-	public SysCAMSPortTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
-			TDiagramPanel _tdp) {
-		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-	}
-	
-	public String getTDFType() {
-		return TDFType;
-	}
-
-	public void setTDFType(String tDFType) {
-		TDFType = tDFType;
-	}
-
-	public String getOrigin() {
-		return origin;
-	}
-
-	public void setOrigin(String origin) {
-		this.origin = origin;
-	}
-
-	public int getPeriod() {
-		return period;
-	}
-
-	public void setPeriod(int period) {
-		this.period = period;
-	}
-
-	public int getRate() {
-		return rate;
-	}
-
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
-	public int getDelay() {
-		return delay;
-	}
-
-	public void setDelay(int delay) {
-		this.delay = delay;
-	}
-
-	public void drawParticularity(Graphics g) {
-	}
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.syscams;
+
+import java.awt.Graphics;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+
+/**
+ * Class SysCAMSPortTDF
+ * Primitive port. To be used in SystemC-AMS diagrams
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class SysCAMSPortTDF extends SysCAMSPrimitivePort {
+	private int period;
+	private int rate;
+	private int delay;
+	private String TDFType;
+	
+	public SysCAMSPortTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
+			TDiagramPanel _tdp) {
+		super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+	}
+	
+	public String getTDFType() {
+		return TDFType;
+	}
+
+	public void setTDFType(String tDFType) {
+		TDFType = tDFType;
+	}
+
+	public int getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
+	}
+
+	public int getRate() {
+		return rate;
+	}
+
+	public void setRate(int rate) {
+		this.rate = rate;
+	}
+
+	public int getDelay() {
+		return delay;
+	}
+
+	public void setDelay(int delay) {
+		this.delay = delay;
+	}
+
+	public void drawParticularity(Graphics g) {
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/ui/syscams/SysCAMSPrimitivePort.java b/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
index 2e79885b2fb713cf945dba957a7cf2438538e34f..0c1b0af2c4014dbe6f5a4619037b4714c7b1e1cc 100644
--- a/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
+++ b/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
@@ -44,15 +44,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import ui.*;
-import ui.tmlad.TMLADNotifiedEvent;
-import ui.tmlad.TMLADReadChannel;
-import ui.tmlad.TMLADSendEvent;
-import ui.tmlad.TMLADSendRequest;
-import ui.tmlad.TMLADWaitEvent;
-import ui.tmlad.TMLADWriteChannel;
-import ui.tmldd.TMLArchiCPNode;
-import ui.tmldd.TMLArchiPortArtifact;
 import ui.util.IconManager;
+import ui.window.JDialogSysCAMSPortConverter;
 import ui.window.JDialogSysCAMSPortDE;
 import ui.window.JDialogSysCAMSPortTDF;
 
@@ -62,8 +55,8 @@ import java.awt.*;
 /**
  * Class SysCAMSPrimitivePort
  * Primitive port. To be used in SystemC-AMS diagrams
- * Creation: 27/04/2018
- * @version 1.0 27/04/2018
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
  * @author Irina Kit Yan LEE
  */
 
@@ -74,49 +67,18 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
     protected int halfwidth = 13;
     protected int currentOrientation = GraphicLib.NORTH;
 
-    protected int nbMaxAttribute = 5;
-    protected TType list[];
-    protected int maxSamples = 8;
-    protected int widthSamples = 4;
-    protected boolean isFinite = false;
-    protected boolean isBlocking = false;
-    public boolean isOrigin = true;
+    private int isOrigin = -1;
     public int typep = 0;
     protected int oldTypep = typep;
     public String commName;
 
-    protected boolean isLossy;
-    protected boolean isPostex = false;
-    protected boolean isPrex = false;
-    protected int lossPercentage;
-    protected int maxNbOfLoss; //-1 means no max
-
-    //Security Verification
-    public int checkConfStatus;
-
-    public int checkSecConfStatus;
-    public String secName="";
-
-    public int checkWeakAuthStatus;
-    public int checkStrongAuthStatus;
-    public boolean checkConf;
-    public boolean checkAuth;
-    public static int NOCHECK= 0;
-    public static int TOCHECK = 1;
-    public static int CHECKED_CONF = 2;
-    public static int CHECKED_UNCONF = 3;
-
-    public String mappingName="???";
     protected int decPoint = 3;
 
     protected boolean conflict = false;
     protected String conflictMessage;
-    protected String dataFlowType = "VOID";
-    protected String associatedEvent = "VOID";
-
-    public int verification;
     
     private ImageIcon portImageIconTDF, portImageIconDE;
+    private ImageIcon portImageIconW, portImageIconE, portImageIconN, portImageIconS;
     
     public SysCAMSPrimitivePort(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
         super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -140,24 +102,34 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
         editable = true;
         removable = true;
         userResizable = false;
-        checkConf=false;
-        commName = "comm";
+        commName = "port";
         makeValue();
         setName("Primitive port");
-        checkConfStatus= NOCHECK;
-        list = new TType[nbMaxAttribute];
-        for(int i=0; i<nbMaxAttribute; i++) {
-            list[i] = new TType();
-        }
+
         myImageIcon = IconManager.imgic1206;
         portImageIconTDF = IconManager.imgic8000;
         portImageIconDE = IconManager.imgic8001;
+        portImageIconW = IconManager.imgic8002; 
+        portImageIconE = IconManager.imgic8003; 
+        portImageIconN = IconManager.imgic8004; 
+        portImageIconS = IconManager.imgic8005; 
         
         // Initialization of port attributes
         if (this instanceof SysCAMSPortTDF) {
-        	((SysCAMSPortTDF) this).setTDFType("");
+        	((SysCAMSPortTDF) this).setPeriod(0);
+        	((SysCAMSPortTDF) this).setRate(0);
+        	((SysCAMSPortTDF) this).setDelay(0);
+        	((SysCAMSPortTDF) this).setTDFType("int");
         } else if (this instanceof SysCAMSPortDE) {
-        	((SysCAMSPortDE) this).setDEType("");
+        	((SysCAMSPortDE) this).setPeriod(0);
+        	((SysCAMSPortDE) this).setRate(0);
+        	((SysCAMSPortDE) this).setDelay(0);
+        	((SysCAMSPortDE) this).setDEType("int");
+        } else if (this instanceof SysCAMSPortConverter) {
+        	((SysCAMSPortConverter) this).setPeriod(0);
+        	((SysCAMSPortConverter) this).setDelay(0);
+        	((SysCAMSPortConverter) this).setRate(0);
+        	((SysCAMSPortConverter) this).setConvType("int");
         }
     }
 
@@ -181,7 +153,6 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
             oldx = x;
             oldy = y;
         }
-        calculatePortColor();
 
         if (rescaled) {
             rescaled = false;
@@ -192,19 +163,47 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
         g.setColor(c);
          
         TGComponent tgc = getFather();
-        if ((tgc != null) && (tgc instanceof SysCAMSPrimitiveComponent)) {
+        if ((tgc != null) && (tgc instanceof SysCAMSBlockTDF)) {
         	if (tgc instanceof SysCAMSBlockTDF && this instanceof SysCAMSPortTDF) {
         		g.drawRect(x+width/2-portImageIconTDF.getIconWidth()/2, y+height/2-portImageIconTDF.getIconHeight()/2, portImageIconTDF.getIconWidth(), portImageIconTDF.getIconHeight());
         		g.drawImage(portImageIconTDF.getImage(), x+width/2-portImageIconTDF.getIconWidth()/2, y+height/2-portImageIconTDF.getIconHeight()/2, null);
-        	} else if (tgc instanceof SysCAMSBlockDE && this instanceof SysCAMSPortDE) {
+        	} 
+        }
+        if ((tgc != null) && (tgc instanceof SysCAMSBlockDE)) {
+        	if (tgc instanceof SysCAMSBlockDE && this instanceof SysCAMSPortDE) {
         		g.drawRect(x+width/2-portImageIconDE.getIconWidth()/2, y+height/2-portImageIconDE.getIconHeight()/2, portImageIconDE.getIconWidth(), portImageIconDE.getIconHeight());
         		g.drawImage(portImageIconDE.getImage(), x+width/2-portImageIconDE.getIconWidth()/2, y+height/2-portImageIconDE.getIconHeight()/2, null);
         	}
         }
+        if ((tgc != null) && (tgc instanceof SysCAMSBlockTDF)) {
+        	if (tgc instanceof SysCAMSBlockTDF && this instanceof SysCAMSPortConverter) {
+        		switch(currentOrientation) {
+                case GraphicLib.NORTH:
+            		g.drawRect(x-1+width/2-portImageIconN.getIconWidth()/2, y-1+height/2-portImageIconN.getIconHeight()/2, portImageIconN.getIconWidth()+2, portImageIconN.getIconHeight()+2);
+             		g.drawImage(portImageIconN.getImage(), x+width/2-portImageIconN.getIconWidth()/2, y+height/2-portImageIconN.getIconHeight()/2, null);
+                	break;
+                case GraphicLib.SOUTH:
+            		g.drawRect(x+width/2-portImageIconS.getIconWidth()/2, y+height/2-portImageIconS.getIconHeight()/2, portImageIconS.getIconWidth(), portImageIconS.getIconHeight());
+             		g.drawImage(portImageIconS.getImage(), x+width/2-portImageIconS.getIconWidth()/2, y+height/2-portImageIconS.getIconHeight()/2, null);
+                	break;
+                case GraphicLib.WEST:
+            		g.drawRect(x+width/2-portImageIconW.getIconWidth()/2, y+height/2-portImageIconW.getIconHeight()/2, portImageIconW.getIconWidth(), portImageIconW.getIconHeight());
+             		g.drawImage(portImageIconW.getImage(), x+width/2-portImageIconW.getIconWidth()/2, y+height/2-portImageIconW.getIconHeight()/2, null);
+                	break;
+                case GraphicLib.EAST:
+                default:
+            		g.drawRect(x+width/2-portImageIconE.getIconWidth()/2, y+height/2-portImageIconE.getIconHeight()/2, portImageIconE.getIconWidth(), portImageIconE.getIconHeight());
+             		g.drawImage(portImageIconE.getImage(), x+width/2-portImageIconE.getIconWidth()/2, y+height/2-portImageIconE.getIconHeight()/2, null);
+                }
+        	}
+        }
         
         int ft = 10;
-        if ((tgc != null) && (tgc instanceof SysCAMSPrimitiveComponent)) {
-            ft = ((SysCAMSPrimitiveComponent)tgc).getCurrentFontSize();
+        if ((tgc != null) && (tgc instanceof SysCAMSBlockTDF)) {
+            ft = ((SysCAMSBlockTDF)tgc).getCurrentFontSize();
+        }
+        if ((tgc != null) && (tgc instanceof SysCAMSBlockDE)) {
+        	ft = ((SysCAMSBlockDE)tgc).getCurrentFontSize();
         }
         int w;
         Font f = g.getFont();
@@ -218,12 +217,6 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
             g.drawString(commName, x, y-1);
         }
 
-        if (checkConf && isOrigin){
-            drawConfVerification(g);
-        }
-        if (checkAuth && !isOrigin){
-            drawAuthVerification(g);
-        }
         g.setFont(fold);
 
         drawParticularity(g);
@@ -231,123 +224,6 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
 
     public abstract void drawParticularity(Graphics g);
 
-    public void drawAuthVerification(Graphics g){
-        int lockwidth=(int) (16*tdp.getZoom());
-        int lockheight=(int) (16*tdp.getZoom());
-
-        int xc=(int) (18*tdp.getZoom());
-        int yc= (int) (12*tdp.getZoom());
-
-        int xoffset= (int) (20*tdp.getZoom());
-        int yoffset= (int) (18*tdp.getZoom());
-
-        int ovalwidth=(int) (10*tdp.getZoom());
-        int ovalheight=(int) (15*tdp.getZoom());
-        g.drawString(secName, x-xc*2/3, y+yc*2/3);
-        Color c = g.getColor();
-        Color c1;
-        Color c2;
-        switch(checkStrongAuthStatus) {
-        case 2:
-            c1 = Color.green;
-            break;
-        case 3:
-            c1 = Color.red;
-            break;
-        default:
-            c1 = Color.gray;
-        }
-        switch(checkWeakAuthStatus) {
-        case 2:
-            c2 = Color.green;
-            break;
-        case 3:
-            c2 = Color.red;
-            break;
-        default:
-            c2= c1;
-        }
-        g.drawOval(x-xc, y+yc, ovalwidth, ovalheight);
-        g.setColor(c1);
-        int[] xps = new int[]{x-xoffset, x-xoffset, x-xoffset+lockwidth};
-        int[] yps = new int[]{y+yoffset, y+yoffset+lockheight, y+yoffset+lockheight};
-        int[] xpw = new int[]{x-xoffset+lockwidth, x-xoffset+lockwidth, x-xoffset};
-        int[] ypw = new int[]{y+yoffset+lockheight, y+yoffset, y+yoffset};
-        g.fillPolygon(xps, yps,3);
-
-        g.setColor(c2);
-        g.fillPolygon(xpw, ypw, 3);
-        g.setColor(c);
-        g.drawPolygon(xps, yps,3);
-        g.drawPolygon(xpw, ypw, 3);
-        g.drawString("S", x-xoffset+1, y+yc+yoffset);
-        g.drawString("W", x-xoffset+lockwidth/2, y+yc+ovalheight);
-        if (checkStrongAuthStatus ==3){
-            g.drawLine(x-xoffset, y+yoffset*3/2, x-xoffset/2, y+yoffset+yc);
-            g.drawLine(x-xoffset, y+yoffset+yc, x-xoffset/2, y+yoffset*3/2);
-        }
-        if (checkWeakAuthStatus==3 || checkStrongAuthStatus==3 && checkWeakAuthStatus <2){
-            g.drawLine(x-xc*2/3, y+yoffset, x-xc/3, y+yc+lockheight);
-            g.drawLine(x-xc*2/3, y+yc+lockheight, x-xc/3, y+yoffset);
-        }
-    }
-
-    public void drawConfVerification(Graphics g){
-        int lockwidth=(int) (9*tdp.getZoom());
-        int lockheight=(int) (7*tdp.getZoom());
-        int yoffset = 3*lockheight;
-
-        int ovalwidth=(int) (6*tdp.getZoom());
-        int ovalheight=(int) (9*tdp.getZoom());
-
-        Color c = g.getColor();
-        Color c1;
-        switch(checkConfStatus) {
-        case 1:
-            c1 = Color.gray;
-            break;
-        case 2:
-            c1 = Color.green;
-            break;
-        case 3:
-            c1 = Color.red;
-            break;
-        default:
-            return;
-        }
-        g.drawString(mappingName, x-lockwidth*2, y-lockheight);
-        g.drawOval(x-ovalwidth*2, y, ovalwidth, ovalheight);
-        g.setColor(c1);
-        g.fillRect(x-lockwidth*3/2, y+lockheight/2, lockwidth, lockheight);
-        g.setColor(c);
-        g.drawRect(x-lockwidth*3/2, y+lockheight/2, lockwidth, lockheight);
-        if (checkConfStatus==3){
-            g.drawLine(x-lockwidth*2, y, x, y+lockheight*2);
-            g.drawLine(x-lockwidth*2, y+lockheight*2, x, y);
-        }
-        if (!secName.equals("")){
-            switch(checkSecConfStatus) {
-            case 1:
-                c1 = Color.gray;
-                break;
-            case 2:
-                c1 = Color.green;
-                break;
-            case 3:
-                c1 = Color.red;
-                break;
-            default:
-                return;
-            }
-            g.drawString(secName, x-lockwidth*2, y+lockheight*3);
-            g.drawOval(x-ovalwidth*2, y+yoffset, ovalwidth, ovalheight);
-            g.setColor(c1);
-            g.fillRect(x-lockwidth*3/2, y+lockheight/2+yoffset, lockwidth, lockheight);
-            g.setColor(c);
-            g.drawRect(x-lockwidth*3/2, y+lockheight/2+yoffset, lockwidth, lockheight);
-        }
-    }
-
     public void manageMove() {
         if (father != null) {
             Point p = GraphicLib.putPointOnRectangle(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
@@ -388,7 +264,7 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
             h0 = 0.5;
         }
 
-        for (int i=0; i<nbConnectingPoint; i++) {
+        for (int i=0; i<1; i++) {
             ((SysCAMSPortConnectingPoint) connectingPoint[i]).setW(w0);
             ((SysCAMSPortConnectingPoint) connectingPoint[i]).setH(h0);
         }
@@ -400,6 +276,17 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
         }
         return null;
     }
+    
+    public int getType() {
+    	if (this instanceof SysCAMSPortTDF) {
+    		return TGComponentManager.CAMS_PORT_TDF;
+    	} else if (this instanceof SysCAMSPortDE) {
+    		return TGComponentManager.CAMS_PORT_DE;
+    	} else if (this instanceof SysCAMSPortConverter) {
+    		return TGComponentManager.CAMS_PORT_CONVERTER;
+    	}
+    	return -1;
+    }
 
     public void wasSwallowed() {
         myColor = null;
@@ -413,96 +300,32 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
     }
 
     public void resizeWithFather() {
-        if ((father != null) && (father instanceof SysCAMSPrimitiveComponent)) {
+        if ((father != null) && (father instanceof SysCAMSBlockTDF)) {
             // Too large to fit in the father? -> resize it!
-            //resizeToFatherSize();
             setCdRectangle(0-getWidth()/2, father.getWidth() - (getWidth()/2), 0-getHeight()/2, father.getHeight() - (getHeight()/2));
             setMoveCd(x, y);
             oldx = -1;
             oldy = -1;
         }
+        if ((father != null) && (father instanceof SysCAMSBlockDE)) {
+        	// Too large to fit in the father? -> resize it!
+        	setCdRectangle(0-getWidth()/2, father.getWidth() - (getWidth()/2), 0-getHeight()/2, father.getHeight() - (getHeight()/2));
+        	setMoveCd(x, y);
+        	oldx = -1;
+        	oldy = -1;
+        }
     }
 
     public boolean editOndoubleClick(JFrame frame) {
-//        int oldSample = maxSamples;
-//
-//        Vector<String> otherTypes;
-//
-//        if (getFather() == null) {
-//            otherTypes = new Vector<String>();
-//        } else {
-//            SysCAMSPrimitiveComponent tgc = (SysCAMSPrimitiveComponent)(getFather());
-//            otherTypes = tgc.getAllRecords();
-//        }
-//        Vector<TGComponent> refs = new Vector<TGComponent>();
-//        for (TGComponent req: tdp.getMGUI().getAllRequirements()){
-//            if (req instanceof AvatarRDRequirement){
-//                refs.add(req);
-//            }
-//        }
-
-//        JDialogTMLCompositePort jda = new JDialogTMLCompositePort(commName, typep, list[0], list[1], list[2], list[3], list[4], isOrigin, isFinite, isBlocking, ""+maxSamples, ""+widthSamples, isLossy, lossPercentage, maxNbOfLoss, frame, "Port properties", otherTypes, dataFlowType, associatedEvent, isPrex, isPostex, checkConf, checkAuth, reference, refs);
-//        GraphicLib.centerOnParent(jda, 350, 700 );
-//        jda.setVisible( true );
-//        dataFlowType = jda.getDataFlowType();
-//        associatedEvent = jda.getAssociatedEvent();
-//        isPrex = jda.isChannelPrex();
-//        isPostex = jda.isChannelPostex();
-
-//        TraceManager.addDev( "The Data flow type is: " + dataFlowType );
-//        TraceManager.addDev( "The Associated event is: " + associatedEvent );
-
-//        if (jda.hasNewData()) {
-//            try {
-//                maxSamples = Integer.decode(jda.getMaxSamples()).intValue();
-//                widthSamples = Integer.decode(jda.getWidthSamples()).intValue();
-//                if (maxSamples < 1) {
-//                    maxSamples = oldSample;
-//                    JOptionPane.showMessageDialog(frame, "Non valid value: " + maxSamples + ": Should be at least 1", "Error", JOptionPane.INFORMATION_MESSAGE);
-//                    return false;
-//                }
-//                isOrigin = jda.isOrigin();
-//                isFinite = jda.isFinite();
-//                isBlocking = jda.isBlocking();
-//                setPortName(jda.getParamName());
-//                commName = jda.getParamName();
-//                isLossy = jda.isLossy();
-//                lossPercentage = jda.getLossPercentage();
-//                maxNbOfLoss = jda.getMaxNbOfLoss();
-//                oldTypep = typep;
-//                typep = jda.getPortType();
-//                checkConf = jda.checkConf;
-//                reference = jda.getReference();
-//                if (checkConf){
-//                    if (checkConfStatus == NOCHECK){
-//                        checkConfStatus = TOCHECK;
-//                    }
-//                }
-//                else {
-//                    if (checkConfStatus != NOCHECK){
-//                        checkConfStatus = NOCHECK;
-//                    }
-//                }
-//                checkAuth = jda.checkAuth;
-//                if (checkStrongAuthStatus < 2){
-//                	checkStrongAuthStatus = 1;
-//                	checkWeakAuthStatus = 1;
-//                }
-//                for(int i=0; i<nbMaxAttribute; i++) {
-//                    list[i].setType(jda.getStringType(i));
-//                }
-//            } catch (Exception e) {
-//                JOptionPane.showMessageDialog(frame, "Non valid value: " + e.getMessage(), "Error", JOptionPane.INFORMATION_MESSAGE);
-//                return false;
-//            }
-//        }
-    	
     	if (this instanceof SysCAMSPortTDF) {
     		JDialogSysCAMSPortTDF jtdf = new JDialogSysCAMSPortTDF((SysCAMSPortTDF) this);
     		jtdf.setVisible(true);
-    	} else {
+    	} else if (this instanceof SysCAMSPortDE){
     		JDialogSysCAMSPortDE jde = new JDialogSysCAMSPortDE((SysCAMSPortDE) this);
     		jde.setVisible(true);
+    	} else if (this instanceof SysCAMSPortConverter) {
+    		JDialogSysCAMSPortConverter jconv = new JDialogSysCAMSPortConverter((SysCAMSPortConverter) this);
+    		jconv.setVisible(true);
     	}
     	
         ((SysCAMSComponentTaskDiagramPanel)tdp).updatePorts();
@@ -510,65 +333,44 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
     }
 
     protected String translateExtraParam() {
-        TType a;
         StringBuffer sb = new StringBuffer("<extraparam>\n");
         sb.append("<Prop commName=\"");
         sb.append(commName);
         sb.append("\" commType=\"" + typep);
         sb.append("\" origin=\"");
-        if (isOrigin) {
-            sb.append("true");
-        } else {
-            sb.append("false");
-        }
-        sb.append("\" finite=\"");
-        if (isFinite) {
-            sb.append("true");
-        } else {
-            sb.append("false");
-        }
-        sb.append("\" blocking=\"");
-        if (isBlocking) {
-            sb.append("true");
-        } else {
-            sb.append("false");
+        sb.append(getOrigin());
+        
+        if (this instanceof SysCAMSPortTDF) {
+        	sb.append("\" period=\"" + ((SysCAMSPortTDF) this).getPeriod());
+        	sb.append("\" rate=\"" + ((SysCAMSPortTDF) this).getRate());
+        	sb.append("\" delay=\"" + ((SysCAMSPortTDF) this).getDelay());
+        	sb.append("\" type=\"" + ((SysCAMSPortTDF) this).getTDFType());
+        }
+        if (this instanceof SysCAMSPortDE) {
+        	sb.append("\" period=\"" + ((SysCAMSPortDE) this).getPeriod());
+        	sb.append("\" rate=\"" + ((SysCAMSPortDE) this).getRate());
+        	sb.append("\" delay=\"" + ((SysCAMSPortDE) this).getDelay());
+        	sb.append("\" type=\"" + ((SysCAMSPortDE) this).getDEType());
+        }
+        if (this instanceof SysCAMSPortConverter) {
+        	sb.append("\" period=\"" + ((SysCAMSPortConverter) this).getPeriod());
+        	sb.append("\" rate=\"" + ((SysCAMSPortConverter) this).getRate());
+        	sb.append("\" delay=\"" + ((SysCAMSPortConverter) this).getDelay());
+        	sb.append("\" type=\"" + ((SysCAMSPortConverter) this).getConvType());
         }
-        sb.append("\" maxSamples=\"" + maxSamples);
-        sb.append("\" widthSamples=\"" + widthSamples);
-        sb.append("\" isLossy=\"" + isLossy);
-        sb.append("\" isPrex=\"" + isPrex);
-        sb.append("\" isPostex=\"" + isPostex);
-        sb.append("\" lossPercentage=\"" + lossPercentage);
-        sb.append("\" maxNbOfLoss=\"" + maxNbOfLoss);
-        sb.append("\" dataFlowType=\"" + dataFlowType);
-        sb.append("\" associatedEvent=\"" + associatedEvent);
-        sb.append("\" checkConf=\"" + checkConf);
-        sb.append("\" checkConfStatus=\"" + checkConfStatus);
-        sb.append("\" checkAuth=\"" + checkAuth);
-        sb.append("\" checkWeakAuthStatus=\"" + checkWeakAuthStatus);
-        sb.append("\" checkStrongAuthStatus=\"" + checkStrongAuthStatus);
         sb.append("\" />\n");
-        for(int i=0; i<nbMaxAttribute; i++) {
-            a = list[i];
-            sb.append("<Type");
-            sb.append(" type=\"");
-            sb.append(a.getType());
-            sb.append("\" typeOther=\"");
-            sb.append(a.getTypeOther());
-            sb.append("\" />\n");
-        }
         sb.append("</extraparam>\n");
         return new String(sb);
     }
 
-    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+	public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
         try {
             NodeList nli;
             Node n1, n2;
             Element elt;
-            int typeAtt;
-            String typeOther;
-            int nbAttribute = 0;
+            
+            int period, rate, delay;
+            String type; 
 
             for(int i=0; i<nl.getLength(); i++) {
                 n1 = nl.item(i);
@@ -578,49 +380,31 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
                         n2 = nli.item(j);
                         if (n2.getNodeType() == Node.ELEMENT_NODE) {
                             elt = (Element) n2;
-                            if ((elt.getTagName().equals("Type")) && (nbAttribute < nbMaxAttribute)) {
-                                typeAtt = Integer.decode(elt.getAttribute("type")).intValue();
-                                try {
-                                    typeOther = elt.getAttribute("typeOther");
-                                } catch (Exception e) {
-                                    typeOther = "";
-                                }
-                                TType ta = new TType(typeAtt, typeOther);
-                                list[nbAttribute] = ta;
-                                nbAttribute ++;
-                            }
                             if (elt.getTagName().equals("Prop")) {
                                 commName = elt.getAttribute("commName");
-                                try {
-                                    typep = Integer.decode(elt.getAttribute("commType")).intValue();
-                                    maxSamples = Integer.decode(elt.getAttribute("maxSamples")).intValue();
-                                    widthSamples = Integer.decode(elt.getAttribute("widthSamples")).intValue();
-                                } catch (Exception e) {
+                                typep = Integer.decode(elt.getAttribute("commType")).intValue();
+                                isOrigin = Integer.decode(elt.getAttribute("origin")).intValue();
+                                period = Integer.decode(elt.getAttribute("period")).intValue();
+                                rate = Integer.decode(elt.getAttribute("rate")).intValue();
+                                delay = Integer.decode(elt.getAttribute("delay")).intValue();
+                                type = elt.getAttribute("type");
+                                setPortName(commName);
+                                if (this instanceof SysCAMSPortTDF) {
+                                	((SysCAMSPortTDF)this).setPeriod(period);
+                                	((SysCAMSPortTDF)this).setRate(rate);
+                                	((SysCAMSPortTDF)this).setDelay(delay);
+                                	((SysCAMSPortTDF)this).setTDFType(type);
+                                } else if (this instanceof SysCAMSPortDE) {
+                                	((SysCAMSPortDE)this).setPeriod(period);
+                                	((SysCAMSPortDE)this).setRate(rate);
+                                	((SysCAMSPortDE)this).setDelay(delay);
+                                	((SysCAMSPortDE)this).setDEType(type);
+                                } else if (this instanceof SysCAMSPortConverter) {
+                                	((SysCAMSPortConverter)this).setPeriod(period);
+                                	((SysCAMSPortConverter)this).setRate(rate);
+                                	((SysCAMSPortConverter)this).setDelay(delay);
+                                	((SysCAMSPortConverter)this).setConvType(type);
                                 }
-                                try {
-                                    lossPercentage = Integer.decode(elt.getAttribute("lossPercentage")).intValue();
-                                    maxNbOfLoss = Integer.decode(elt.getAttribute("maxNbOfLoss")).intValue();
-                                    dataFlowType = elt.getAttribute("dataFlowType");
-                                    associatedEvent = elt.getAttribute("associatedEvent");
-                                    checkConf = (elt.getAttribute("checkConf").compareTo("true")==0);
-                                    if (checkConf){
-                                        checkConfStatus=TOCHECK;
-                                    }
-                                    checkAuth = (elt.getAttribute("checkAuth").compareTo("true")==0);
-                                    isLossy = (elt.getAttribute("isLossy").compareTo("true") ==0);
-                                    isPrex = (elt.getAttribute("isPrex").compareTo("true") ==0);
-                                    isPostex = (elt.getAttribute("isPostex").compareTo("true") ==0);
-                                } catch (Exception e) {
-                                    lossPercentage = 0;
-                                    maxNbOfLoss = -1;
-                                    isLossy = false;
-                                }
-                                try {
-                                    isBlocking = (elt.getAttribute("blocking").compareTo("true") ==0);
-                                    isOrigin = (elt.getAttribute("origin").compareTo("true") ==0);
-                                    isFinite = (elt.getAttribute("finite").compareTo("true") ==0);
-
-                                } catch (Exception e) {}
                             }
                             makeValue();
                         }
@@ -640,126 +424,58 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
         return commName;
     }
 
+    public void setPortName(String s) {
+        commName = s;
+     }
+    
     public int getPortType() {
         return typep;
     }
 
     public String getPortTypeName() {
-        switch(typep) {
-        case 0:
-            return "Channel";
-        case 1:
-            return "Event";
-        case 2:
-        default:
-            return "Request";
-        }
-    }
-
-    public boolean isBlocking() {
-        return isBlocking;
-    }
-
-    public boolean isFinite() {
-        return isFinite;
-    }
-
-    public int getMax() {
-        return maxSamples;
-    }
-
-    public int getSize() {
-        return widthSamples;
-    }
-
-    public boolean isOrigin() {
-        return isOrigin;
-    }
-
-    public int getNbMaxAttribute() {
-        return nbMaxAttribute;
+        if (this instanceof SysCAMSPortTDF) {
+        	return "Port TDF";
+        } else if (this instanceof SysCAMSPortDE) {
+        	return "Port DE";
+        } else if (this instanceof SysCAMSPortConverter) {
+        	return "Port Converter";
+        } 
+        return "";
     }
 
-    public TType getParamAt(int index) {
-        return list[index];
+    public int getOrigin() {
+    	return isOrigin;
     }
-    public void setParam(int index, TType t){
-        list[index] = t;
+    
+    public void setOrigin(int orig) {
+    	isOrigin = orig;
     }
-
+    
     public int getDefaultConnector() {
         return TGComponentManager.CONNECTOR_PORT_TMLC;
     }
 
     public String getAttributes() {
         String attr = "";
-        if (isOrigin()) {
+        if (getOrigin() == 1) {
             attr += "out ";
-        } else {
+        } else if (getOrigin() == 0) {
             attr += "in ";
         }
         attr += getPortTypeName() + ": ";
         attr += getPortName() + "\n";
-        // Channel
-        if (typep == 0) {
-            if (!isBlocking()) {
-                attr += "N";
-            }
-            attr += "B";
-            if (isOrigin()) {
-                attr += "W\n";
-                attr += "Width (in B): " + getSize() + "\n";
-                if (isFinite()) {
-                    attr += "Max samples: " + getNbMaxAttribute() + "\n";
-                } else {
-                    attr += "Infinite\n";
-                }
-            } else {
-                attr += "R\n";
-            }
-            // Event and Request
-        } else {
-            attr += "(";
-            for(int i=0; i<nbMaxAttribute; i++) {
-                if (i!=0) {
-                    attr += ",";
-                }
-                attr += TType.getStringType(list[i].getType());
-            }
-            attr += ")\n";
-            if (typep == 1) {
-                if (isOrigin()) {
-                    if (!isFinite()) {
-                        attr += "Infinite FIFO\n";
-                    } else {
-                        if (isBlocking()) {
-                            attr += "Blocking ";
-                        } else {
-                            attr += "Non-blocking ";
-                        }
-                        attr += "finite FIFO: " + getMax() + "\n";
-                    }
-                }
-            }
+        attr += "B";
+        if (getOrigin() == 1) {
+            attr += "W\n";
+        } else if (getOrigin() == 0) {
+            attr += "R\n";
         }
         if (conflict) {
             attr += "Error in path=" + conflictMessage;
         }
         return attr;
     }
-
-    public boolean isLossy() {
-        return isLossy && isOrigin;
-    }
-
-    public int getLossPercentage() {
-        return lossPercentage;
-    }
-
-    public int getMaxNbOfLoss() {
-        return maxNbOfLoss;
-    }
-
+    
     public boolean getConflict() {
         return conflict;
     }
@@ -768,111 +484,5 @@ public abstract class SysCAMSPrimitivePort extends TGCScalableWithInternalCompon
         conflict = _conflict;
         myColor = null;
         conflictMessage = _msg;
-        calculatePortColor();
-    }
-
-    public void calculatePortColor() {
-        if (conflict) {
-            myColor = Color.red;
-        } else {
-//            if (typep == 0) {
-//                myColor = ColorManager.TML_PORT_CHANNEL;
-//            } else if (typep == 1) {
-//                myColor = ColorManager.TML_PORT_EVENT;
-//            } else {
-//                myColor = ColorManager.TML_PORT_REQUEST;
-//            }
-        	if (this instanceof SysCAMSPortTDF) {
-        		myColor = Color.lightGray;
-        	} else {
-        		myColor = Color.white;
-        	}
-        }
-    }
-
-    public String getDataFlowType() {
-        return dataFlowType;
-    }
-
-    public boolean isPrex() {
-        return isPrex;
-    }
-
-    public boolean isPostex() {
-        return isPostex;
-    }
-
-    public String getAssociatedEvent() {
-        return associatedEvent;
-    }
-
-    public boolean hasSameParametersThan(SysCAMSPrimitivePort _p) {
-        for(int i=0; i<5; i++) {
-            if (!(getParamAt(i).equals(_p.getParamAt(i)))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public void setPortName(String s) {
-        for (TURTLEPanel tp : tdp.getMainGUI().tabs) {
-            for (TDiagramPanel t : tp.getPanels()) {
-                for (TGComponent t2 : t.getComponentList()) {
-                    if (t2 instanceof TMLArchiCPNode) {
-                        TMLArchiCPNode tacn = (TMLArchiCPNode) t2;
-                        for (TGComponent tgc : tacn.getRecursiveAllInternalComponent()) {
-                            if (tgc instanceof TMLArchiPortArtifact) {
-                                TMLArchiPortArtifact tapi = (TMLArchiPortArtifact) tgc;
-                                String tmp = tapi.getValue().replaceAll("(?i)" + commName + "$", s);
-                                tapi.setValue(tmp);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if ( (father != null) && (father instanceof SysCAMSPrimitiveComponent)) {
-            String name = father.getValue();
-            TURTLEPanel tp = tdp.getMainGUI().getCurrentTURTLEPanel();
-            for (TDiagramPanel t : tp.getPanels()) {
-                if (t.getName().compareTo(name) == 0) {
-                    for (TGComponent t2 : t.getComponentList()) {
-                        if (t2 instanceof TMLADWriteChannel) {
-                            TMLADWriteChannel twc = (TMLADWriteChannel) t2;
-                            if (twc.getChannelName().equals(commName))
-                                twc.setChannelName(s);
-                        }
-                        if (t2 instanceof TMLADReadChannel) {
-                            TMLADReadChannel trc = (TMLADReadChannel) t2;
-                            if (trc.getChannelName().equals(commName))
-                                trc.setChannelName(s);
-                        }
-                        if (t2 instanceof TMLADSendEvent) {
-                            TMLADSendEvent tse = (TMLADSendEvent) t2;
-                            if (tse.getEventName().equals(commName))
-                                tse.setEventName(s);
-                        }
-                        if (t2 instanceof TMLADSendRequest) {
-                            TMLADSendRequest tsr = (TMLADSendRequest) t2;
-                            if (tsr.getRequestName().equals(commName))
-                                tsr.setRequestName(s);
-                        }
-                        if (t2 instanceof TMLADWaitEvent) {
-                            TMLADWaitEvent twe = (TMLADWaitEvent) t2;
-                            if (twe.getEventName().equals(commName))
-                                twe.setEventName(s);
-                        }
-                        if (t2 instanceof TMLADNotifiedEvent) {
-                            TMLADNotifiedEvent tne = (TMLADNotifiedEvent) t2;
-                            if (tne.getEventName().equals(commName))
-                                tne.setEventName(s);
-                        }
-                    }
-                    t.repaint();
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ui/syscams/SysCAMSReferencePortConnectingPoint.java b/src/main/java/ui/syscams/SysCAMSReferencePortConnectingPoint.java
index 88945a228fd3055cc42a6a0a633b252f534eb80f..6d3f514642d25614918e80de019675a2788aecf3 100644
--- a/src/main/java/ui/syscams/SysCAMSReferencePortConnectingPoint.java
+++ b/src/main/java/ui/syscams/SysCAMSReferencePortConnectingPoint.java
@@ -39,7 +39,6 @@
 package ui.syscams;
 
 import ui.CDElement;
-import ui.TGComponent;
 
 /**
  * Class SysCAMSReferencePortConnectingPoint
@@ -50,73 +49,8 @@ import ui.TGComponent;
  */
 
 public class SysCAMSReferencePortConnectingPoint extends SysCAMSPortConnectingPoint{
-    
-	private SysCAMSCompositePort port;
-	
-    public SysCAMSReferencePortConnectingPoint(SysCAMSCompositePort _port, CDElement _container, double _w, double _h) {
+ 
+	public SysCAMSReferencePortConnectingPoint(CDElement _container, double _w, double _h) {
         super(_container, 0, 0, true, true, _w, _h);
-		port = _port;
-    }
-	
-	public void setPort(SysCAMSCompositePort _port) {
-		port = _port;
-	}
-	
-	public SysCAMSCompositePort getPort() {
-		return port;
-	}
-	
-	public static double getDecX(SysCAMSCompositePort _port) {
-		if (_port != null) {
-			TGComponent tgc = _port.getFather();
-			if (tgc != null) {
-				int x1 = _port.getX() + _port.getWidth()/2;
-				int x2 = tgc.getX();
-				int w1 = tgc.getWidth();
-				return ((double)x1 - x2) / w1;
-			}
-		}
-		return 0;
-	}
-	
-	public double getDecX() {
-		if (port != null) {
-			return getDecX(port);
-		}
-		return 0;
-	}
-	
-	public static double getDecY(SysCAMSCompositePort _port) {
-		if (_port != null) {
-			TGComponent tgc = _port.getFather();
-			if (tgc != null) {
-				int y1 = _port.getY() + _port.getHeight()/2;
-				int y2 = tgc.getY();
-				int h1 = tgc.getHeight();
-				return ((double)y1 - y2) / h1;
-			}
-		}
-		return 0;
-	}
-	
-	public double getDecY() {
-		if (port != null) {
-			return getDecY(port);
-		}
-		return 0;
-	}
-	
-	public int getX() {
-		if (container != null) {
-			return x + container.getX() + (int)(container.getWidth() * getDecX());
-		}
-		return x;
-    }
-    
-    public int getY() {
-		if (container != null) {
-			return y + container.getY() + (int)(container.getHeight() * getDecY());
-		}
-		return y;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ui/syscams/SysCAMSRemoteCompositeComponent.java b/src/main/java/ui/syscams/SysCAMSRemoteCompositeComponent.java
index b85c1ea3c7bd64ed862adc4bfe1343f7623bb128..33a1728c111b30c2dce9ca5a3e2615ed4f9edc15 100644
--- a/src/main/java/ui/syscams/SysCAMSRemoteCompositeComponent.java
+++ b/src/main/java/ui/syscams/SysCAMSRemoteCompositeComponent.java
@@ -75,7 +75,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 	private double ddefaultDiag = 0.0;
 	
 	private SysCAMSCompositeComponent syscamscc;
-	private ArrayList<SysCAMSCompositePort> ports;
 	
 	private NodeList nl;
     
@@ -104,8 +103,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 		value = "No reference";
 		name = "Remote composite component";
 		
-		ports = new ArrayList<SysCAMSCompositePort>();
-		
         myImageIcon = IconManager.imgic1200;
     }
 	
@@ -144,10 +141,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 			if (syscamscc.getTDiagramPanel() == null) {
 				syscamscc = null;
 				value =  "No reference";
-			} else {
-				if (ports.size() != syscamscc.getCompositePortNb()) {
-					updateReference();
-				}
 			}
 		}
 		if (myColor == null) {
@@ -267,10 +260,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
         StringBuffer sb = new StringBuffer("<extraparam>\n");
 		sb.append("<info ref=\"" + value + "\" "); 
         sb.append("/>\n");
-		
-		for (SysCAMSCompositePort port: ports) {
-			sb.append("<port id=\"" + port.getId() + "\" />\n");
-		}
         sb.append("</extraparam>\n");
         return new String(sb);
     }
@@ -284,12 +273,8 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
             NodeList nli;
             Node n1, n2;
             Element elt;
-			int j, k;
-			int index;
-			int cptk = 0;
-			SysCAMSRemotePortCompositeComponent pcc;
+			int j;
 			TGConnectingPoint[] old = null;
-			ArrayList<SysCAMSCompositePort> tmp = null;
 			
             for(int i=0; i<nl.getLength(); i++) {
                 n1 = nl.item(i);
@@ -305,11 +290,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 								if (syscamscc != null ){
 									updateReference();
 									rescaled = true;
-									tmp = ports;
-									ports = new ArrayList<SysCAMSCompositePort>();
-									for (SysCAMSCompositePort port: tmp) {
-										ports.add(port);
-									}
 								}
 							}
 							
@@ -318,37 +298,7 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 									old =  connectingPoint;
 									connectingPoint = new TGConnectingPoint[nbConnectingPoint];
 								}
-								try {
-									int portid = Integer.decode(elt.getAttribute("id")).intValue();
-									
-									for (SysCAMSCompositePort port: tmp) {
-										if (port.getId() == portid) {
-											index = tmp.indexOf(port);
-											for (k=index*5; k<(index+1)*5; k++) {
-												// Must update position of connecting point
-												connectingPoint[k] = old[cptk];
-												
-												if ((k % 5) == 0) {
-													if (nbInternalTGComponent > (k/5)) {
-														pcc = (SysCAMSRemotePortCompositeComponent)(tgcomponent[k/5]);
-														if (pcc != null) {
-															pcc.setElements(port, (SysCAMSReferencePortConnectingPoint)(connectingPoint[k]));
-														}
-													}
-												}
-												((SysCAMSReferencePortConnectingPoint)(connectingPoint[k])).setPort(port);
-												if (connectingPoint[k] == null) {
-													TraceManager.addDev("null cp");
-												}
-												cptk ++;
-											}
-											break;
-										}
-									}
-								} catch (Exception e) {
-								}
 							}
-							
                         }
                     }
                 }
@@ -383,7 +333,7 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
     }
 	
 	public void resizeWithFather() {
-        if ((father != null) && ((father instanceof SysCAMSCompositeComponent) ||(father instanceof SysCAMSPrimitiveComponent))) {
+        if ((father != null) && ((father instanceof SysCAMSCompositeComponent) || (father instanceof SysCAMSBlockTDF) || (father instanceof SysCAMSBlockDE))) {
 			// Too large to fit in the father? -> resize it!
 			resizeToFatherSize();
             setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
@@ -391,13 +341,20 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
         }
     }
 	
-	public java.util.List<SysCAMSPrimitiveComponent> getAllPrimitiveComponents() {
+	public java.util.List<SysCAMSBlockTDF> getAllBlockTDFComponents() {
 		if (syscamscc == null) {
-			return new ArrayList<SysCAMSPrimitiveComponent>();
+			return new ArrayList<SysCAMSBlockTDF>();
 		}
-		return syscamscc.getAllPrimitiveComponents();
+		return syscamscc.getAllBlockTDFComponents();
 	}
 	
+//	public java.util.List<SysCAMSBlockDE> getAllBlockDEComponents() {
+//		if (syscamscc == null) {
+//			return new ArrayList<SysCAMSBlockDE>();
+//		}
+//		return syscamscc.getAllBlockDEComponents();
+//	}
+	
 	public java.util.List<SysCAMSRecordComponent> getAllRecordComponents() {
 		if (syscamscc == null) {
 			return new ArrayList<SysCAMSRecordComponent>();
@@ -405,29 +362,35 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 		return syscamscc.getAllRecordComponents();
 	}
 	
-	public java.util.List<SysCAMSCompositePort> getAllInternalCompositePorts() {
-		java.util.List<SysCAMSCompositePort> list = new ArrayList<SysCAMSCompositePort>();
-		if (syscamscc == null) {
-			return list;
-		}
-		return syscamscc.getAllInternalCompositePorts();
-	}
-	
 	public ArrayList<SysCAMSPrimitivePort> getAllInternalPrimitivePorts() {
 		ArrayList<SysCAMSPrimitivePort> list = new ArrayList<SysCAMSPrimitivePort>();
 		if (syscamscc == null) {
 			return list;
+		} else {
+			for (SysCAMSPortTDF tdf : syscamscc.getAllInternalPortsTDF()) {
+				list.add(tdf);
+			}
+//			for (SysCAMSPortDE de : syscamscc.getAllInternalPortsDE()) {
+//				list.add(de);
+//			}
+			return list;
 		}
-		return syscamscc.getAllInternalPrimitivePorts();
 	}
 	
-	public SysCAMSPrimitiveComponent getPrimitiveComponentByName(String _name) {
+	public SysCAMSBlockTDF getBlockTDFComponentByName(String _name) {
 		if (syscamscc == null) {
 			return null;
 		}
-		return syscamscc.getPrimitiveComponentByName(_name);
+		return syscamscc.getBlockTDFComponentByName(_name);
 	}
 	
+//	public SysCAMSBlockDE getBlockDEComponentByName(String _name) {
+//		if (syscamscc == null) {
+//			return null;
+//		}
+//		return syscamscc.getBlockDEComponentByName(_name);
+//	}
+	
 	public void drawTGConnectingPoint(Graphics g, int type) {
         for (int i=0; i<nbConnectingPoint; i++) {
             if (connectingPoint[i].isCompatibleWith(type)) {
@@ -441,58 +404,17 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 	// Update tgconnecting points accordingly. Those points should point to their original ones so as to be sure to be drawn at the right place
 	// to a list of those points, keep that list, and then, generate a array of those points.
 	public void updatePorts() {
-		ArrayList<SysCAMSCompositePort> list = syscamscc.getFirstLevelCompositePorts();
 		int cpt=0;
 		
-		int i, j;
-		SysCAMSCompositePort tmp;
-		SysCAMSReferencePortConnectingPoint point;
-		
 		// Close attention to the list
 		boolean change = true;
-		if (list.size() != ports.size()) {
-			change = true;
-		} else {
-			for (SysCAMSCompositePort port: ports) {
-				if (!list.contains(port)) {
-					change = true;
-					break;
-				}
-			}
-		}
-		
 		if (change) {
 			TraceManager.addDev("change on  ports!");
 			// Delete unused ports and 
 			ArrayList<SysCAMSReferencePortConnectingPoint> points = new ArrayList<SysCAMSReferencePortConnectingPoint>();
 			cpt=0;
 			
-			for(i=0; i<ports.size(); i++) {
-				tmp = ports.get(i);
-				if (list.contains(tmp)) {
-					for (j=cpt; j<cpt+5; j++) {
-						points.add((SysCAMSReferencePortConnectingPoint)(connectingPoint[cpt]));
-					}
-				} else {
-					ports.remove(tmp);
-					for (j=cpt; j<cpt+5; j++) {
-						tdp.removeOneConnector(connectingPoint[cpt]);
-						// Shall we remove the connecting points?
-					}
-					i --;
-				}
-				cpt = cpt + 5;
-			}
 			// Add new ports
-			for (SysCAMSCompositePort port1: list) {
-				if (!ports.contains(port1)) {
-					ports.add(port1);
-					for(j=0; j<5; j++) {
-						point = new SysCAMSReferencePortConnectingPoint(port1, this, 0.5, 0.5);
-						points.add(point);
-					}
-				}
-			}
 			
 			if (nbConnectingPoint == points.size()) {
 			} else {
@@ -508,7 +430,7 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 					connectingPoint[cpt] = pt;
 					if ((cpt % 5) == 0) {
 						tgp = new SysCAMSRemotePortCompositeComponent(getX(), getY(), 0, 0, 10, 10, false, this, tdp);
-						tgp.setElements(ports.get(cpttg), (SysCAMSReferencePortConnectingPoint)pt);
+						tgp.setElements((SysCAMSReferencePortConnectingPoint)pt);
 						tgcomponent[cpttg] = tgp;
 						cpttg ++;
 					}
@@ -518,20 +440,6 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 		}
 	}
 	
-	public TGComponent getPortOf(TGConnectingPoint tp) {
-		if (ports == null) {
-			return null;
-		}
-		for (int i=0; i<nbConnectingPoint; i++) {
-			if (connectingPoint[i] == tp) {
-				if (i/5 < ports.size()) {
-					return ports.get(i/5);
-				}
-			}
-		}
-		return null;
-	}
-	
 	public boolean setIdTGConnectingPoint(int num, int id) {
 		int i;
 		try {
@@ -539,7 +447,7 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 				nbConnectingPoint = num + 1;
 				connectingPoint = new TGConnectingPoint[nbConnectingPoint];
 				for(i=0; i<nbConnectingPoint; i++) {
-					connectingPoint[i] = new SysCAMSReferencePortConnectingPoint(null, this, 0.5, 0.5);
+					connectingPoint[i] = new SysCAMSReferencePortConnectingPoint(this, 0.5, 0.5);
 				}
 			} else {
 				if (num >= nbConnectingPoint) {
@@ -550,7 +458,7 @@ public class SysCAMSRemoteCompositeComponent extends TGCScalableWithInternalComp
 						connectingPoint[i] = old[i];
 					}
 					for(i=old.length; i<nbConnectingPoint; i++) {
-						connectingPoint[i] = new SysCAMSReferencePortConnectingPoint(null, this, 0.5, 0.5);
+						connectingPoint[i] = new SysCAMSReferencePortConnectingPoint(this, 0.5, 0.5);
 					}
 				}
 			}
diff --git a/src/main/java/ui/syscams/SysCAMSRemotePortCompositeComponent.java b/src/main/java/ui/syscams/SysCAMSRemotePortCompositeComponent.java
index 6d43d813253ee8003aa2e2cfdb73d095f0534c75..67982d3dfde0d54e115b1cbd9eda4de09d538480 100644
--- a/src/main/java/ui/syscams/SysCAMSRemotePortCompositeComponent.java
+++ b/src/main/java/ui/syscams/SysCAMSRemotePortCompositeComponent.java
@@ -53,7 +53,6 @@ import java.awt.*;
  */
 
 public class SysCAMSRemotePortCompositeComponent extends TGCWithInternalComponent implements SwallowedTGComponent, WithAttributes {
-    private SysCAMSCompositePort port;
 	SysCAMSReferencePortConnectingPoint point;
 	private int defaultDiag = 10;
 	private Color myColor = new Color(251, 252, 200);
@@ -81,13 +80,6 @@ public class SysCAMSRemotePortCompositeComponent extends TGCWithInternalComponen
 		Color pc = myColor;
 		Color col = g.getColor();
 		
-		if (port != null) {
-			pc = port.getPortColor();
-			if (pc == null) {
-				pc = myColor;
-			}
-		}
-		
 		if (point != null) {
 			xp = point.getX() - (defaultDiag / 2);
 			yp = point.getY() - (defaultDiag / 2);
@@ -101,22 +93,10 @@ public class SysCAMSRemotePortCompositeComponent extends TGCWithInternalComponen
 		}
 	}
 	
-	public void setElements(SysCAMSCompositePort _port, SysCAMSReferencePortConnectingPoint _point) {
-		port = _port;
+	public void setElements(SysCAMSReferencePortConnectingPoint _point) {
 		point = _point;
 	}
 	
-	public SysCAMSCompositePort getPort() {
-		return port;
-	}
-	
-	public String getAttributes() {
-		if (port != null) {
-			return port.getAttributes();
-		}
-		return "";
-	}
-	
 	public TGComponent isOnOnlyMe(int x1, int y1) {
         if (point == null) {
 			return null;
@@ -135,4 +115,8 @@ public class SysCAMSRemotePortCompositeComponent extends TGCWithInternalComponen
 	 public int getType() {
         return TGComponentManager.TMLCTD_CREMOTEPORTCOMPONENT;
     }
+
+	public String getAttributes() {
+		return null;
+	}
 }
\ No newline at end of file