diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentGyrator.java b/src/main/java/ui/eln/sca_eln/ELNComponentGyrator.java
deleted file mode 100644
index cd8437af5fb35d327a37c856117e64d70d6ead6f..0000000000000000000000000000000000000000
--- a/src/main/java/ui/eln/sca_eln/ELNComponentGyrator.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/* 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.eln.sca_eln;
-
-import myutil.GraphicLib;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import ui.*;
-import ui.eln.ELNConnectingPoint;
-import ui.util.IconManager;
-import ui.window.JDialogELNComponentGyrator;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Class ELNComponentGyrator
- * Gyrator to be used in ELN diagrams
- * Creation: 14/06/2018
- * @version 1.0 14/06/2018
- * @author Irina Kit Yan LEE
- */
-
-public class ELNComponentGyrator extends TGCScalableWithInternalComponent {
-    protected Color myColor;
-    protected int orientation;
-	private int maxFontSize = 14;
-    private int minFontSize = 4;
-    private int currentFontSize = -1;
-//    protected int oldx, oldy;
-//    protected int currentOrientation = GraphicLib.NORTH;
-
-    private int textX = 15; // border for ports
-    private double dtextX = 0.0;
-    protected int decPoint = 3;
-
-    private int fact = 2;
-    
-	// Parameters
-	private double g1, g2;
-	private String unit1, unit2;
-    
-    public ELNComponentGyrator(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(60*fact, 40*fact);
-
-        dtextX = textX * oldScaleFactor;
-        textX = (int)dtextX;
-        dtextX = dtextX - textX;
-        
-        minWidth = 1;
-        minHeight = 1;
-
-        initConnectingPoint(4);
-                
-        addTGConnectingPointsComment();
-
-        moveable = true;
-        editable = true;
-        removable = true;
-        userResizable = false;
-        value = tdp.findELNComponentName("Gyrator");
-        
-        myImageIcon = IconManager.imgic1206;
-        
-        // Initialization of gyrator attributes
-        setG1(1.0);
-        setUnit1("S");
-        setG2(1.0);
-        setUnit2("S");
-    }
-
-    public void initConnectingPoint(int nb) {
-        nbConnectingPoint = nb;
-        connectingPoint = new TGConnectingPoint[nb];
-        connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0);
-        connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0, 0.0);
-        connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 1.0);
-        connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0, 1.0);
-    }
-
-    public Color getMyColor() {
-        return myColor;
-    }
-
-    public void internalDrawing(Graphics g) {
-        Font f = g.getFont();
-        Font fold = f;
-        
-//    	if ((x != oldx) | (oldy != y)) {
-//            // Component has moved!
-//            manageMove();
-//            oldx = x;
-//            oldy = y;
-//        }
-
-    	if (this.rescaled && !this.tdp.isScaled()) {
-            this.rescaled = false;
-            // Must set the font size...
-            // Incrementally find the biggest font not greater than max_font size
-            // If font is less than min_font, no text is displayed
-
-            int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
-            f = f.deriveFont((float) maxCurrentFontSize);
-
-            while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
-            	if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
-            		break;
-            	}
-                maxCurrentFontSize--;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-
-            if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
-                maxCurrentFontSize++;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-            g.setFont(f);
-            this.currentFontSize = maxCurrentFontSize;
-        } else {
-            f = f.deriveFont(this.currentFontSize);
-    	}
-
-        // Zoom is assumed to be computed
-    	Color c = g.getColor();
-        int [] ptx0 = {x, x+width/3, x+width/3, x, x+width/3, x+width/3};
-        int [] pty0 = {y, y, y+height, y+height, y+height, y};
-        g.drawPolygon(ptx0, pty0, 6);
-        int [] ptx1 = {x+width, x+2*width/3, x+2*width/3, x+width, x+2*width/3, x+2*width/3};
-        int [] pty1 = {y, y, y+height, y+height, y+height, y};
-        g.drawPolygon(ptx1, pty1, 6);
-        g.drawArc(x+width/6+10*fact/2, y+height/4, width/3-10*fact, 2*height/4, 270, 180);
-        g.drawArc(x+width/2+10*fact/2, y+height/4, width/3-10*fact, 2*height/4, 90, 180);
-        int [] ptx2 = {x+width/3+width/(6*fact), x+2*width/3-width/(6*fact), x+2*width/3-width/(6*fact)-width/(12*fact), x+2*width/3-width/(6*fact), x+2*width/3-width/(6*fact)-width/(12*fact), x+2*width/3-width/(6*fact)};
-        int [] pty2 = {y+height/8, y+height/8, y+height/8-height/(8*fact), y+height/8, y+height/8+height/(8*fact), y+height/8};
-        g.drawPolygon(ptx2, pty2, 6);
-        int [] ptx3 = {x+2*width/3-width/(6*fact), x+width/3+width/(6*fact), x+width/3+width/(6*fact)+width/(12*fact), x+width/3+width/(6*fact), x+width/3+width/(6*fact)+width/(12*fact), x+width/3+width/(6*fact)};
-        int [] pty3 = {y+7*height/8, y+7*height/8, y+7*height/8-height/(8*fact), y+7*height/8, y+7*height/8+height/(8*fact), y+7*height/8};
-        g.drawPolygon(ptx3, pty3, 6);
-        g.setColor(c);
-      
-    	// Set font size
-        int attributeFontSize = this.currentFontSize * 5 / 6;
-        int w = g.getFontMetrics().stringWidth(value);
-        g.setFont(f.deriveFont((float) attributeFontSize));
-        g.setFont(f);
-    	g.setFont(f.deriveFont(Font.BOLD));
-    	g.drawString(value, x + (width - w)/2, y+height/(16*fact)-attributeFontSize-height/(4*fact));
-    	g.setFont(f.deriveFont(Font.PLAIN));
-        w = g.getFontMetrics().stringWidth(Double.toString(g1));
-    	g.drawString(Double.toString(g1), x+(width-w)/2, y+height/(16*fact));
-    	w = g.getFontMetrics().stringWidth(Double.toString(g2));
-    	g.drawString(Double.toString(g2), x+(width-w)/2, y+7*height/8+height/(8*fact)+attributeFontSize+height/(16*fact));
-        g.setFont(fold);
-    }
-
-//    public void manageMove() {
-//        if (father != null) {
-//            Point p = GraphicLib.putPointOnRectangle(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//
-//            x = p.x - width/2;
-//            y = p.y - height/2;
-//
-//            setMoveCd(x, y);
-//
-//            int orientation = GraphicLib.getCloserOrientation(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//            if (orientation != currentOrientation) {
-////                setOrientation(orientation);
-//            }
-//        }
-//    }
-
-    // TGConnecting points ..
-    // TODO : change the orientation of the component
-//    public void setOrientation(int orientation) {
-//        currentOrientation = orientation;
-//        double w0, h0, w1, h1;
-//
-////        switch(orientation) {
-//////        case GraphicLib.NORTH:
-//////            w0 = 0.5;
-//////            h0 = 0.0;
-//////            break;
-////        case GraphicLib.WEST:
-////            w0 = 0.0;
-////            h0 = 0.5;
-////            break;
-//////        case GraphicLib.SOUTH:
-//////            w0 = 0.5;
-//////            h0 = 1.0;
-//////            break;
-////        case GraphicLib.EAST:
-////        default:
-////            w0 = 1.0;
-////            h0 = 0.5;
-////        }
-//
-//        w0 = 0.0;
-//        h0 = 0.5;
-//        w1 = 1.0;
-//        h1 = 0.5;
-//        System.out.println(connectingPoint.length);
-//		((ELNConnectingPoint) connectingPoint[0]).setW(w0);
-//		((ELNConnectingPoint) connectingPoint[0]).setH(h0);
-//		((ELNConnectingPoint) connectingPoint[1]).setW(w1);
-//		((ELNConnectingPoint) connectingPoint[1]).setH(h1);
-//    }
-
-    public TGComponent isOnOnlyMe(int _x, int _y) {
-        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
-            return this;
-        }
-        return null;
-    }
-    
-    public int getType() {
-    	return TGComponentManager.ELN_GYRATOR;
-    }
-
-    public boolean editOndoubleClick(JFrame frame) {
-    	JDialogELNComponentGyrator jde = new JDialogELNComponentGyrator(this);
-    	jde.setVisible(true);
-        return true;
-    }
-    
-    public StringBuffer encode(String data) {
-    	StringBuffer databuf = new StringBuffer(data);
-    	StringBuffer buffer = new StringBuffer("");
-        for(int pos = 0; pos != data.length(); pos++) {
-        	char c = databuf.charAt(pos);
-            switch(c) {
-                case '\u03BC' : 
-                	buffer.append("&#x3BC;");      
-                	break;
-                default :   
-                	buffer.append(databuf.charAt(pos)); 
-                	break;
-            }
-        }
-        return buffer;
-    }
-
-    protected String translateExtraParam() {
-        StringBuffer sb = new StringBuffer("<extraparam>\n");
-        sb.append("<attributes g1=\"" + g1);
-        sb.append("\" unit1=\"" + encode(unit1));
-        sb.append("\" g2=\"" + g2);
-        sb.append("\" unit2=\"" + encode(unit2) + "\"");
-        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;
-            
-            double g1, g2;
-            String unit1, unit2;
-
-            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("attributes")) {
-                            	g1 = Double.parseDouble(elt.getAttribute("g1"));
-                            	unit1 = elt.getAttribute("unit1");
-                            	g2 = Double.parseDouble(elt.getAttribute("g2"));
-                            	unit2 = elt.getAttribute("unit2");
-								setG1(g1);
-								setG2(g2);
-								setUnit1(unit1);
-								setUnit2(unit2);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new MalformedModelingException();
-        }
-    }
-
-    public int getDefaultConnector() {
-        return TGComponentManager.ELN_CONNECTOR;
-    }
-
-	public double getG1() {
-		return g1;
-	}
-
-	public void setG1(double _gyra1) {
-		g1 = _gyra1;
-	}
-
-	public double getG2() {
-		return g2;
-	}
-
-	public void setG2(double _gyra2) {
-		g2 = _gyra2;
-	}
-
-	public String getUnit1() {
-		return unit1;
-	}
-
-	public void setUnit1(String _unit1) {
-		unit1 = _unit1;
-	}
-
-	public String getUnit2() {
-		return unit2;
-	}
-
-	public void setUnit2(String _unit2) {
-		unit2 = _unit2;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
deleted file mode 100644
index a343b23e8f9d70b29d2760a4e0eb350786e9e15a..0000000000000000000000000000000000000000
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/* 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.eln.sca_eln;
-
-import myutil.GraphicLib;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import ui.*;
-import ui.eln.ELNConnectingPoint;
-import ui.util.IconManager;
-import ui.window.JDialogELNComponentIndependentCurrentSource;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Class ELNComponentIndependentCurrentSource
- * Independent current source to be used in ELN diagrams
- * Creation: 15/06/2018
- * @version 1.0 15/06/2018
- * @author Irina Kit Yan LEE
- */
-
-public class ELNComponentIndependentCurrentSource extends TGCScalableWithInternalComponent {
-    protected Color myColor;
-    protected int orientation;
-	private int maxFontSize = 14;
-    private int minFontSize = 4;
-    private int currentFontSize = -1;
-//    protected int oldx, oldy;
-//    protected int currentOrientation = GraphicLib.NORTH;
-
-    private int textX = 15; // border for ports
-    private double dtextX = 0.0;
-    protected int decPoint = 3;
-
-    private int fact = 2;
-    
-	// Parameters
-	private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
-	private String delay;
-	private String unit0;
-    
-    public ELNComponentIndependentCurrentSource(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(30*fact, 40*fact);
-
-        dtextX = textX * oldScaleFactor;
-        textX = (int)dtextX;
-        dtextX = dtextX - textX;
-        
-        minWidth = 1;
-        minHeight = 1;
-
-        initConnectingPoint(2);
-                
-        addTGConnectingPointsComment();
-
-        moveable = true;
-        editable = true;
-        removable = true;
-        userResizable = false;
-        value = tdp.findELNComponentName("ISource");
-        
-        myImageIcon = IconManager.imgic1206;
-        
-        // Initialization of isource attributes
-        setInitValue(0.0);
-        setOffset(0.0);
-        setAmplitude(0.0);
-        setFrequency(0.0);
-        setUnit0("Hz");
-        setPhase(0.0);
-        setDelay("sc_core::SC_ZERO_TIME");
-        setAcAmplitude(0.0);
-        setAcPhase(0.0);
-        setAcNoiseAmplitude(0.0);
-    }
-
-    public void initConnectingPoint(int nb) {
-        nbConnectingPoint = nb;
-        connectingPoint = new TGConnectingPoint[nb];
-        connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0/3.0, 0.0);
-        connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0/3.0, 1.0);
-    }
-
-    public Color getMyColor() {
-        return myColor;
-    }
-
-    public void internalDrawing(Graphics g) {
-        Font f = g.getFont();
-        Font fold = f;
-        
-//    	if ((x != oldx) | (oldy != y)) {
-//            // Component has moved!
-//            manageMove();
-//            oldx = x;
-//            oldy = y;
-//        }
-
-    	if (this.rescaled && !this.tdp.isScaled()) {
-            this.rescaled = false;
-            // Must set the font size...
-            // Incrementally find the biggest font not greater than max_font size
-            // If font is less than min_font, no text is displayed
-
-            int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
-            f = f.deriveFont((float) maxCurrentFontSize);
-
-            while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
-            	if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
-            		break;
-            	}
-                maxCurrentFontSize--;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-
-            if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
-                maxCurrentFontSize++;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-            g.setFont(f);
-            this.currentFontSize = maxCurrentFontSize;
-        } else {
-            f = f.deriveFont(this.currentFontSize);
-    	}
-
-        // Zoom is assumed to be computed
-    	Color c = g.getColor();
-        int [] ptx0 = {x+width/3, x+width/3};
-        int [] pty0 = {y, y+height/4};
-        g.drawPolygon(ptx0, pty0, 2);
-        int [] ptx1 = {x+width/3, x+width/3};
-        int [] pty1 = {y+3*height/4, y+height};
-        g.drawPolygon(ptx1, pty1, 2);
-        int [] ptx2 = {x, x+2*width/3};
-        int [] pty2 = {y+height/2, y+height/2};
-        g.drawPolygon(ptx2, pty2, 2);
-        int [] ptx3 = {x+2*width/3+width/6, x+2*width/3+width/6, x+2*width/3, x+2*width/3+width/6, x+width, x+2*width/3+width/6};
-        int [] pty3 = {y+height/4, y+3*height/4, y+3*height/4-width/6, y+3*height/4, y+3*height/4-width/6, y+3*height/4};
-        g.drawPolygon(ptx3, pty3, 6);
-        g.drawOval(x, y+height/4, 2*width/3, height/2);
-        g.setColor(c);
-      
-    	// Set font size
-        int attributeFontSize = this.currentFontSize * 5 / 6;
-        int w = g.getFontMetrics().stringWidth(value);
-        g.setFont(f.deriveFont((float) attributeFontSize));
-        g.setFont(f);
-        g.setFont(f.deriveFont(Font.BOLD));
-    	g.drawString(value, x+(width-w)/2, y-height/(4*fact));
-
-        g.setFont(fold);
-    }
-
-//    public void manageMove() {
-//        if (father != null) {
-//            Point p = GraphicLib.putPointOnRectangle(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//
-//            x = p.x - width/2;
-//            y = p.y - height/2;
-//
-//            setMoveCd(x, y);
-//
-//            int orientation = GraphicLib.getCloserOrientation(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//            if (orientation != currentOrientation) {
-////                setOrientation(orientation);
-//            }
-//        }
-//    }
-
-    // TGConnecting points ..
-    // TODO : change the orientation of the component
-//    public void setOrientation(int orientation) {
-//        currentOrientation = orientation;
-//        double w0, h0, w1, h1;
-//
-////        switch(orientation) {
-//////        case GraphicLib.NORTH:
-//////            w0 = 0.5;
-//////            h0 = 0.0;
-//////            break;
-////        case GraphicLib.WEST:
-////            w0 = 0.0;
-////            h0 = 0.5;
-////            break;
-//////        case GraphicLib.SOUTH:
-//////            w0 = 0.5;
-//////            h0 = 1.0;
-//////            break;
-////        case GraphicLib.EAST:
-////        default:
-////            w0 = 1.0;
-////            h0 = 0.5;
-////        }
-//
-//        w0 = 0.0;
-//        h0 = 0.5;
-//        w1 = 1.0;
-//        h1 = 0.5;
-//        System.out.println(connectingPoint.length);
-//		((ELNConnectingPoint) connectingPoint[0]).setW(w0);
-//		((ELNConnectingPoint) connectingPoint[0]).setH(h0);
-//		((ELNConnectingPoint) connectingPoint[1]).setW(w1);
-//		((ELNConnectingPoint) connectingPoint[1]).setH(h1);
-//    }
-
-    public TGComponent isOnOnlyMe(int _x, int _y) {
-        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
-            return this;
-        }
-        return null;
-    }
-    
-    public int getType() {
-    	return TGComponentManager.ELN_INDEPENDENT_CURRENT_SOURCE;
-    }
-
-    public boolean editOndoubleClick(JFrame frame) {
-    	JDialogELNComponentIndependentCurrentSource jde = new JDialogELNComponentIndependentCurrentSource(this);
-    	jde.setVisible(true);
-        return true;
-    }
-    
-    public StringBuffer encode(String data) {
-    	StringBuffer databuf = new StringBuffer(data);
-    	StringBuffer buffer = new StringBuffer("");
-        for(int pos = 0; pos != data.length(); pos++) {
-        	char c = databuf.charAt(pos);
-            switch(c) {
-                case '\u03BC' : 
-                	buffer.append("&#x3BC;");      
-                	break;
-                default :   
-                	buffer.append(databuf.charAt(pos)); 
-                	break;
-            }
-        }
-        return buffer;
-    }
-
-    protected String translateExtraParam() {
-        StringBuffer sb = new StringBuffer("<extraparam>\n");
-        sb.append("<attributes init_value=\"" + initValue);
-        sb.append("\" offset=\"" + offset);
-        sb.append("\" amplitude=\"" + amplitude);
-        sb.append("\" frequency=\"" + frequency);
-        sb.append("\" unit0=\"" + encode(unit0));
-        sb.append("\" phase=\"" + phase);
-        sb.append("\" delay=\"" + delay);
-        sb.append("\" ac_amplitude=\"" + acAmplitude);
-        sb.append("\" ac_phase=\"" + acPhase);
-		sb.append("\" ac_noise_amplitude=\"" + acNoiseAmplitude + "\"");
-        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;
-            
-            double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
-        	String delay;
-        	String unit0;
-
-            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("attributes")) {
-                            	initValue = Double.parseDouble(elt.getAttribute("init_value"));
-                            	offset = Double.parseDouble(elt.getAttribute("offset"));
-                            	amplitude = Double.parseDouble(elt.getAttribute("amplitude"));
-                            	frequency = Double.parseDouble(elt.getAttribute("frequency"));
-                            	unit0 = elt.getAttribute("unit0");
-                            	phase = Double.parseDouble(elt.getAttribute("phase"));
-                            	delay = elt.getAttribute("delay");
-                            	acAmplitude = Double.parseDouble(elt.getAttribute("ac_amplitude"));
-                            	acPhase = Double.parseDouble(elt.getAttribute("ac_phase"));
-                            	acNoiseAmplitude = Double.parseDouble(elt.getAttribute("ac_noise_amplitude"));
-								setInitValue(initValue);
-								setOffset(offset);
-								setAmplitude(amplitude);
-								setFrequency(frequency);
-                            	setUnit0(unit0);
-                            	setPhase(phase);
-								setDelay(delay);
-								setAcAmplitude(acAmplitude);
-								setAcPhase(acPhase);
-								setAcNoiseAmplitude(acNoiseAmplitude);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new MalformedModelingException();
-        }
-    }
-
-    public int getDefaultConnector() {
-        return TGComponentManager.ELN_CONNECTOR;
-    }
-
-	public double getInitValue() {
-		return initValue;
-	}
-
-	public void setInitValue(double _initValue) {
-		initValue = _initValue;
-	}
-
-	public double getOffset() {
-		return offset;
-	}
-
-	public void setOffset(double _offset) {
-		offset = _offset;
-	}
-
-	public double getAmplitude() {
-		return amplitude;
-	}
-
-	public void setAmplitude(double _amplitude) {
-		amplitude = _amplitude;
-	}
-
-	public double getFrequency() {
-		return frequency;
-	}
-
-	public void setFrequency(double _frequency) {
-		frequency = _frequency;
-	}
-
-	public double getPhase() {
-		return phase;
-	}
-
-	public void setPhase(double _phase) {
-		phase = _phase;
-	}
-
-	public double getAcAmplitude() {
-		return acAmplitude;
-	}
-
-	public void setAcAmplitude(double _acAmplitude) {
-		acAmplitude = _acAmplitude;
-	}
-
-	public double getAcPhase() {
-		return acPhase;
-	}
-
-	public void setAcPhase(double _acPhase) {
-		acPhase = _acPhase;
-	}
-
-	public double getAcNoiseAmplitude() {
-		return acNoiseAmplitude;
-	}
-
-	public void setAcNoiseAmplitude(double _acNoiseAmplitude) {
-		acNoiseAmplitude = _acNoiseAmplitude;
-	}
-
-	public String getDelay() {
-		return delay;
-	}
-
-	public void setDelay(String _delay) {
-		delay = _delay;
-	}
-
-	public String getUnit0() {
-		return unit0;
-	}
-
-	public void setUnit0(String _unit0) {
-		unit0 = _unit0;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
deleted file mode 100644
index 5d5f39ef6775206ae224162ac8ee0aff567675de..0000000000000000000000000000000000000000
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/* 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.eln.sca_eln;
-
-import myutil.GraphicLib;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import ui.*;
-import ui.eln.ELNConnectingPoint;
-import ui.util.IconManager;
-import ui.window.JDialogELNComponentIndependentVoltageSource;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Class ELNComponentIndependentVoltageSource
- * Independent voltage source to be used in ELN diagrams
- * Creation: 15/06/2018
- * @version 1.0 15/06/2018
- * @author Irina Kit Yan LEE
- */
-
-public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent {
-    protected Color myColor;
-    protected int orientation;
-	private int maxFontSize = 14;
-    private int minFontSize = 4;
-    private int currentFontSize = -1;
-//    protected int oldx, oldy;
-//    protected int currentOrientation = GraphicLib.NORTH;
-
-    private int textX = 15; // border for ports
-    private double dtextX = 0.0;
-    protected int decPoint = 3;
-
-    private int fact = 2;
-    
-	// Parameters
-	private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
-	private String delay;
-	private String unit0;
-    
-    public ELNComponentIndependentVoltageSource(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(20*fact, 40*fact);
-
-        dtextX = textX * oldScaleFactor;
-        textX = (int)dtextX;
-        dtextX = dtextX - textX;
-        
-        minWidth = 1;
-        minHeight = 1;
-
-        initConnectingPoint(true, true, 2);
-                
-        addTGConnectingPointsComment();
-
-        moveable = true;
-        editable = true;
-        removable = true;
-        userResizable = false;
-        value = tdp.findELNComponentName("VSource");
-        
-        myImageIcon = IconManager.imgic1206;
-        
-        // Initialization of vsource attributes
-        setInitValue(0.0);
-        setOffset(0.0);
-        setAmplitude(0.0);
-        setFrequency(0.0);
-        setUnit0("Hz");
-        setPhase(0.0);
-        setDelay("sc_core::SC_ZERO_TIME");
-        setAcAmplitude(0.0);
-        setAcPhase(0.0);
-        setAcNoiseAmplitude(0.0);
-    }
-
-    public void initConnectingPoint(boolean in, boolean out, int nb) {
-        nbConnectingPoint = nb;
-        connectingPoint = new TGConnectingPoint[nb];
-        connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 0.0);
-        connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 1.0);
-    }
-
-    public Color getMyColor() {
-        return myColor;
-    }
-
-    public void internalDrawing(Graphics g) {
-        Font f = g.getFont();
-        Font fold = f;
-        
-//    	if ((x != oldx) | (oldy != y)) {
-//            // Component has moved!
-//            manageMove();
-//            oldx = x;
-//            oldy = y;
-//        }
-
-    	if (this.rescaled && !this.tdp.isScaled()) {
-            this.rescaled = false;
-            // Must set the font size...
-            // Incrementally find the biggest font not greater than max_font size
-            // If font is less than min_font, no text is displayed
-
-            int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
-            f = f.deriveFont((float) maxCurrentFontSize);
-
-            while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
-            	if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
-            		break;
-            	}
-                maxCurrentFontSize--;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-
-            if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
-                maxCurrentFontSize++;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-            g.setFont(f);
-            this.currentFontSize = maxCurrentFontSize;
-        } else {
-            f = f.deriveFont(this.currentFontSize);
-    	}
-
-        // Zoom is assumed to be computed
-    	Color c = g.getColor();
-        int [] ptx0 = {x+width/2, x+width/2};
-        int [] pty0 = {y, y+height};
-        g.drawPolygon(ptx0, pty0, 2);
-        int [] ptx1 = {x+width/2+width/4, x+width/2+width/4+width/8, x+width/2+width/4+width/8, x+width/2+width/4+width/8, x+width/2+width/4+width/8, x+width};
-        int [] pty1 = {y+height/4-height/8, y+height/4-height/8, y+height/4-height/8-width/8, y+height/4-height/8+width/8, y+height/4-height/8, y+height/4-height/8};
-        g.drawPolygon(ptx1, pty1, 6);
-        int [] ptx2 = {x+width/2+width/4, x+width};
-        int [] pty2 = {y+3*height/4+height/8, y+3*height/4+height/8};
-        g.drawPolygon(ptx2, pty2, 2);
-        g.drawOval(x, y+height/4, width, height/2);
-        g.setColor(c);
-      
-    	// Set font size
-        int attributeFontSize = this.currentFontSize * 5 / 6;
-        int w = g.getFontMetrics().stringWidth(value);
-        g.setFont(f.deriveFont((float) attributeFontSize));
-        g.setFont(f);
-        g.setFont(f.deriveFont(Font.BOLD));
-    	g.drawString(value, x+(width-w)/2, y-height/(4*fact));
-
-        g.setFont(fold);
-    }
-
-//    public void manageMove() {
-//        if (father != null) {
-//            Point p = GraphicLib.putPointOnRectangle(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//
-//            x = p.x - width/2;
-//            y = p.y - height/2;
-//
-//            setMoveCd(x, y);
-//
-//            int orientation = GraphicLib.getCloserOrientation(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//            if (orientation != currentOrientation) {
-////                setOrientation(orientation);
-//            }
-//        }
-//    }
-
-    // TGConnecting points ..
-    // TODO : change the orientation of the component
-//    public void setOrientation(int orientation) {
-//        currentOrientation = orientation;
-//        double w0, h0, w1, h1;
-//
-////        switch(orientation) {
-//////        case GraphicLib.NORTH:
-//////            w0 = 0.5;
-//////            h0 = 0.0;
-//////            break;
-////        case GraphicLib.WEST:
-////            w0 = 0.0;
-////            h0 = 0.5;
-////            break;
-//////        case GraphicLib.SOUTH:
-//////            w0 = 0.5;
-//////            h0 = 1.0;
-//////            break;
-////        case GraphicLib.EAST:
-////        default:
-////            w0 = 1.0;
-////            h0 = 0.5;
-////        }
-//
-//        w0 = 0.0;
-//        h0 = 0.5;
-//        w1 = 1.0;
-//        h1 = 0.5;
-//        System.out.println(connectingPoint.length);
-//		((ELNConnectingPoint) connectingPoint[0]).setW(w0);
-//		((ELNConnectingPoint) connectingPoint[0]).setH(h0);
-//		((ELNConnectingPoint) connectingPoint[1]).setW(w1);
-//		((ELNConnectingPoint) connectingPoint[1]).setH(h1);
-//    }
-
-    public TGComponent isOnOnlyMe(int _x, int _y) {
-        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
-            return this;
-        }
-        return null;
-    }
-    
-    public int getType() {
-    	return TGComponentManager.ELN_INDEPENDENT_VOLTAGE_SOURCE;
-    }
-
-    public boolean editOndoubleClick(JFrame frame) {
-    	JDialogELNComponentIndependentVoltageSource jde = new JDialogELNComponentIndependentVoltageSource(this);
-    	jde.setVisible(true);
-        return true;
-    }
-    
-    public StringBuffer encode(String data) {
-    	StringBuffer databuf = new StringBuffer(data);
-    	StringBuffer buffer = new StringBuffer("");
-        for(int pos = 0; pos != data.length(); pos++) {
-        	char c = databuf.charAt(pos);
-            switch(c) {
-                case '\u03BC' : 
-                	buffer.append("&#x3BC;");      
-                	break;
-                default :   
-                	buffer.append(databuf.charAt(pos)); 
-                	break;
-            }
-        }
-        return buffer;
-    }
-
-    protected String translateExtraParam() {
-        StringBuffer sb = new StringBuffer("<extraparam>\n");
-        sb.append("<attributes init_value=\"" + initValue);
-        sb.append("\" offset=\"" + offset);
-        sb.append("\" amplitude=\"" + amplitude);
-        sb.append("\" frequency=\"" + frequency);
-        sb.append("\" unit0=\"" + encode(unit0));
-        sb.append("\" phase=\"" + phase);
-        sb.append("\" delay=\"" + delay);
-        sb.append("\" ac_amplitude=\"" + acAmplitude);
-        sb.append("\" ac_phase=\"" + acPhase);
-		sb.append("\" ac_noise_amplitude=\"" + acNoiseAmplitude + "\"");
-        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;
-            
-            double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
-        	String delay;
-        	String unit0;
-
-            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("attributes")) {
-                            	initValue = Double.parseDouble(elt.getAttribute("init_value"));
-                            	offset = Double.parseDouble(elt.getAttribute("offset"));
-                            	amplitude = Double.parseDouble(elt.getAttribute("amplitude"));
-                            	frequency = Double.parseDouble(elt.getAttribute("frequency"));
-                            	unit0 = elt.getAttribute("unit0");
-                            	phase = Double.parseDouble(elt.getAttribute("phase"));
-                            	delay = elt.getAttribute("delay");
-                            	acAmplitude = Double.parseDouble(elt.getAttribute("ac_amplitude"));
-                            	acPhase = Double.parseDouble(elt.getAttribute("ac_phase"));
-                            	acNoiseAmplitude = Double.parseDouble(elt.getAttribute("ac_noise_amplitude"));
-								setInitValue(initValue);
-								setOffset(offset);
-								setAmplitude(amplitude);
-								setFrequency(frequency);
-                            	setUnit0(unit0);
-                            	setPhase(phase);
-								setDelay(delay);
-								setAcAmplitude(acAmplitude);
-								setAcPhase(acPhase);
-								setAcNoiseAmplitude(acNoiseAmplitude);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new MalformedModelingException();
-        }
-    }
-
-    public int getDefaultConnector() {
-        return TGComponentManager.ELN_CONNECTOR;
-    }
-
-	public double getInitValue() {
-		return initValue;
-	}
-
-	public void setInitValue(double _initValue) {
-		initValue = _initValue;
-	}
-
-	public double getOffset() {
-		return offset;
-	}
-
-	public void setOffset(double _offset) {
-		offset = _offset;
-	}
-
-	public double getAmplitude() {
-		return amplitude;
-	}
-
-	public void setAmplitude(double _amplitude) {
-		amplitude = _amplitude;
-	}
-
-	public double getFrequency() {
-		return frequency;
-	}
-
-	public void setFrequency(double _frequency) {
-		frequency = _frequency;
-	}
-
-	public double getPhase() {
-		return phase;
-	}
-
-	public void setPhase(double _phase) {
-		phase = _phase;
-	}
-
-	public double getAcAmplitude() {
-		return acAmplitude;
-	}
-
-	public void setAcAmplitude(double _acAmplitude) {
-		acAmplitude = _acAmplitude;
-	}
-
-	public double getAcPhase() {
-		return acPhase;
-	}
-
-	public void setAcPhase(double _acPhase) {
-		acPhase = _acPhase;
-	}
-
-	public double getAcNoiseAmplitude() {
-		return acNoiseAmplitude;
-	}
-
-	public void setAcNoiseAmplitude(double _acNoiseAmplitude) {
-		acNoiseAmplitude = _acNoiseAmplitude;
-	}
-
-	public String getDelay() {
-		return delay;
-	}
-
-	public void setDelay(String _delay) {
-		delay = _delay;
-	}
-
-	public String getUnit0() {
-		return unit0;
-	}
-
-	public void setUnit0(String _unit0) {
-		unit0 = _unit0;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentNullor.java b/src/main/java/ui/eln/sca_eln/ELNComponentNullor.java
deleted file mode 100644
index 07cdfc52430d761f025882e0196bc91cc67a0d71..0000000000000000000000000000000000000000
--- a/src/main/java/ui/eln/sca_eln/ELNComponentNullor.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* 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.eln.sca_eln;
-
-import myutil.GraphicLib;
-
-import ui.*;
-import ui.eln.ELNConnectingPoint;
-import ui.util.IconManager;
-import ui.window.JDialogELNComponentNullor;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Class ELNComponentNullor
- * Nullor to be used in ELN diagrams
- * Creation: 13/06/2018
- * @version 1.0 13/06/2018
- * @author Irina Kit Yan LEE
- */
-
-public class ELNComponentNullor extends TGCScalableWithInternalComponent {
-    protected Color myColor;
-    protected int orientation;
-	private int maxFontSize = 14;
-    private int minFontSize = 4;
-    private int currentFontSize = -1;
-//    protected int oldx, oldy;
-//    protected int currentOrientation = GraphicLib.NORTH;
-
-    private int textX = 15; // border for ports
-    private double dtextX = 0.0;
-    protected int decPoint = 3;
-
-    private int fact = 2;
-    
-    public ELNComponentNullor(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(60*fact, 40*fact);
-
-        dtextX = textX * oldScaleFactor;
-        textX = (int)dtextX;
-        dtextX = dtextX - textX;
-        
-        minWidth = 1;
-        minHeight = 1;
-
-        initConnectingPoint(4);
-                
-        addTGConnectingPointsComment();
-
-        moveable = true;
-        editable = true;
-        removable = true;
-        userResizable = false;
-        value = tdp.findELNComponentName("Nullor_");
-        
-        myImageIcon = IconManager.imgic1206;
-    }
-
-    public void initConnectingPoint(int nb) {
-        nbConnectingPoint = nb;
-        connectingPoint = new TGConnectingPoint[nb];
-        connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0);
-        connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0, 0.0);
-        connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 1.0);
-        connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 1.0, 1.0);
-    }
-
-    public Color getMyColor() {
-        return myColor;
-    }
-
-    public void internalDrawing(Graphics g) {
-        Font f = g.getFont();
-        Font fold = f;
-        
-//    	if ((x != oldx) | (oldy != y)) {
-//            // Component has moved!
-//            manageMove();
-//            oldx = x;
-//            oldy = y;
-//        }
-
-    	if (this.rescaled && !this.tdp.isScaled()) {
-            this.rescaled = false;
-            // Must set the font size...
-            // Incrementally find the biggest font not greater than max_font size
-            // If font is less than min_font, no text is displayed
-
-            int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
-            f = f.deriveFont((float) maxCurrentFontSize);
-
-            while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
-            	if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
-            		break;
-            	}
-                maxCurrentFontSize--;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-
-            if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
-                maxCurrentFontSize++;
-                f = f.deriveFont((float) maxCurrentFontSize);
-            }
-            g.setFont(f);
-            this.currentFontSize = maxCurrentFontSize;
-        } else {
-            f = f.deriveFont(this.currentFontSize);
-    	}
-
-        // Zoom is assumed to be computed
-        Color c = g.getColor();
-        int [] ptx0 = {x, x+2*width/6, x+2*width/6, x+2*width/6};
-        int [] pty0 = {y, y, y+height/4, y};
-        g.drawPolygon(ptx0, pty0, 4);
-        int [] ptx1 = {x, x+2*width/6, x+2*width/6, x+2*width/6};
-        int [] pty1 = {y+height, y+height, y+3*height/4, y+height};
-        g.drawPolygon(ptx1, pty1, 4);
-        g.drawArc(x+2*width/6-width/12, y+height/4, width/6, height/2, 0, 360);
-        int [] ptx2 = {x+width, x+4*width/6, x+4*width/6, x+4*width/6};
-        int [] pty2 = {y, y, y+height/4, y};
-        g.drawPolygon(ptx2, pty2, 4);
-        int [] ptx3 = {x+width, x+4*width/6, x+4*width/6, x+4*width/6};
-        int [] pty3 = {y+height, y+height, y+3*height/4, y+height};
-        g.drawPolygon(ptx3, pty3, 4);
-        g.drawOval(x+4*width/6-width/12, y+height/4, width/6, width/6);
-        g.drawOval(x+4*width/6-width/12, y+height/2, width/6, width/6);
-        g.setColor(c);
-      
-    	// Set font size
-        int attributeFontSize = this.currentFontSize * 5 / 6;
-        int w = g.getFontMetrics().stringWidth(value);
-        g.setFont(f.deriveFont((float) attributeFontSize));
-        g.setFont(f);
-    	g.setFont(f.deriveFont(Font.BOLD));
-    	g.drawString(value, x + (width - w)/2, y-height/(4*fact));
-
-        g.setFont(fold);
-    }
-
-//    public void manageMove() {
-//        if (father != null) {
-//            Point p = GraphicLib.putPointOnRectangle(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//
-//            x = p.x - width/2;
-//            y = p.y - height/2;
-//
-//            setMoveCd(x, y);
-//
-//            int orientation = GraphicLib.getCloserOrientation(x+(width/2), y+(height/2), father.getX(), father.getY(), father.getWidth(), father.getHeight());
-//            if (orientation != currentOrientation) {
-////                setOrientation(orientation);
-//            }
-//        }
-//    }
-
-    // TGConnecting points ..
-    // TODO : change the orientation of the component
-//    public void setOrientation(int orientation) {
-//        currentOrientation = orientation;
-//        double w0, h0, w1, h1;
-//
-////        switch(orientation) {
-//////        case GraphicLib.NORTH:
-//////            w0 = 0.5;
-//////            h0 = 0.0;
-//////            break;
-////        case GraphicLib.WEST:
-////            w0 = 0.0;
-////            h0 = 0.5;
-////            break;
-//////        case GraphicLib.SOUTH:
-//////            w0 = 0.5;
-//////            h0 = 1.0;
-//////            break;
-////        case GraphicLib.EAST:
-////        default:
-////            w0 = 1.0;
-////            h0 = 0.5;
-////        }
-//
-//        w0 = 0.0;
-//        h0 = 0.5;
-//        w1 = 1.0;
-//        h1 = 0.5;
-//        System.out.println(connectingPoint.length);
-//		((ELNConnectingPoint) connectingPoint[0]).setW(w0);
-//		((ELNConnectingPoint) connectingPoint[0]).setH(h0);
-//		((ELNConnectingPoint) connectingPoint[1]).setW(w1);
-//		((ELNConnectingPoint) connectingPoint[1]).setH(h1);
-//    }
-
-    public TGComponent isOnOnlyMe(int _x, int _y) {
-        if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
-            return this;
-        }
-        return null;
-    }
-    
-    public int getType() {
-    	return TGComponentManager.ELN_NULLOR;
-    }
-
-    public boolean editOndoubleClick(JFrame frame) {
-    	JDialogELNComponentNullor jde = new JDialogELNComponentNullor(this);
-    	jde.setVisible(true);
-        return true;
-    }
-
-//    protected String translateExtraParam() {
-//        StringBuffer sb = new StringBuffer("<extraparam>\n");
-//        sb.append("<attributes value=\"" + val + "\"");
-//        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;
-//            
-//            double value;
-//
-//            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("attributes")) {
-//                            	value = Double.parseDouble(elt.getAttribute("value"));
-//								setVal(value);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            throw new MalformedModelingException();
-//        }
-//    }
-
-    public int getDefaultConnector() {
-        return TGComponentManager.ELN_CONNECTOR;
-    }
-}
\ No newline at end of file