From 4c1f49ddd3754f95e434da8f9dc490433c84a23e Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Tue, 10 Jul 2018 16:38:45 +0200
Subject: [PATCH] fixed space (eln)

---
 .../ui/eln/sca_eln/ELNComponentCapacitor.java |   9 +-
 .../sca_eln/ELNComponentIdealTransformer.java | 843 ++++++----------
 .../ELNComponentIndependentCurrentSource.java |   9 +-
 .../ELNComponentIndependentVoltageSource.java | 519 ++++------
 .../ui/eln/sca_eln/ELNComponentInductor.java  |  18 +-
 .../ui/eln/sca_eln/ELNComponentResistor.java  |   9 +-
 .../sca_eln/ELNComponentTransmissionLine.java | 636 ++++--------
 ...mponentVoltageControlledCurrentSource.java | 936 ++++++------------
 ...mponentVoltageControlledVoltageSource.java | 930 ++++++-----------
 9 files changed, 1313 insertions(+), 2596 deletions(-)

diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
index 5285825269..8853d09a3c 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
@@ -112,17 +112,14 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent	impl
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y + height / 2 - height / 8, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y + height / 2 - height / 8, this.minX, this.maxX, this.minY, this.maxY,	false, this.father, this.tdp);
 			term0.setValue("p");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 8, true, false);
-			term1 = new ELNPortTerminal(x + width - height / 4, y + height / 2 - height / 8, this.minX, this.maxX,
-					this.minY, this.maxY, false, this.father, this.tdp);
+			term1 = new ELNPortTerminal(x + width - height / 4, y + height / 2 - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("n");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1, x + width - height / 4, y + height / 2 - height / 8, true,
-					false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - height / 4, y + height / 2 - height / 8, true, false);
 			old = width;
 			width = height;
 			height = old;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
index ea065c544f..d9fe04d95b 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
@@ -51,16 +51,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
- * Class ELNComponentIdealTransformer Ideal transformer to be used in ELN
- * diagrams Creation: 13/06/2018
- * 
+ * Class ELNComponentIdealTransformer 
+ * Ideal transformer to be used in ELN diagrams 
+ * Creation: 13/06/2018
  * @version 1.0 13/06/2018
  * @author Irina Kit Yan LEE
  */
 
-public class ELNComponentIdealTransformer extends
-		TGCScalableWithInternalComponent implements ActionListener,
-		SwallowTGComponent, ELNComponent {
+public class ELNComponentIdealTransformer extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, ELNComponent {
 	protected Color myColor;
 	protected int orientation;
 	private int maxFontSize = 14;
@@ -74,8 +72,7 @@ public class ELNComponentIdealTransformer extends
 	private double ratio;
 
 	private int position = 0;
-	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false,
-			fh_1_3 = false;
+	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
 	private int old;
 	private boolean first, f = true;
 
@@ -84,9 +81,7 @@ public class ELNComponentIdealTransformer extends
 	private ELNPortTerminal term2;
 	private ELNPortTerminal term3;
 
-	public ELNComponentIdealTransformer(int _x, int _y, int _minX, int _maxX,
-			int _minY, int _maxY, boolean _pos, TGComponent _father,
-			TDiagramPanel _tdp) {
+	public ELNComponentIdealTransformer(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(100, 100);
@@ -115,36 +110,25 @@ public class ELNComponentIdealTransformer extends
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY,
-					this.maxY, false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("p1");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
 
-			term1 = new ELNPortTerminal(x + width - width / 10, y, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term1 = new ELNPortTerminal(x + width - width / 10, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("p2");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1,
-					x + width - width / 10, y, true, false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - width / 10, y, true, false);
 
-			term2 = new ELNPortTerminal(x, y + height - height / 10, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term2 = new ELNPortTerminal(x, y + height - height / 10, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term2.setValue("n1");
 			getTDiagramPanel().getComponentList().add(term2);
-			term2.getTDiagramPanel().addComponent(term2, x,
-					y + height - height / 10, true, false);
+			term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 10, true, false);
 
-			term3 = new ELNPortTerminal(x + width - width / 10, y + height
-					- height / 10, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term3 = new ELNPortTerminal(x + width - width / 10, y + height - height / 10, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term3.setValue("n2");
 			getTDiagramPanel().getComponentList().add(term3);
-			term3.getTDiagramPanel().addComponent(term3,
-					x + width - width / 10, y + height - height / 10, true,
-					false);
+			term3.getTDiagramPanel().addComponent(term3, x + width - width / 10, y + height - height / 10, true, false);
 			old = width;
 			width = height;
 			height = old;
@@ -156,10 +140,7 @@ public class ELNComponentIdealTransformer extends
 
 		if (this.rescaled && !this.tdp.isScaled()) {
 			this.rescaled = false;
-			int maxCurrentFontSize = Math.max(
-					0,
-					Math.min(this.height,
-							(int) (this.maxFontSize * this.tdp.getZoom())));
+			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)) {
@@ -214,30 +195,19 @@ public class ELNComponentIdealTransformer extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 10, y, true);
 				term2.setMoveCd(x, y + height - height / 10, true);
-				term3.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -247,30 +217,19 @@ public class ELNComponentIdealTransformer extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 10, y, true);
 				term3.setMoveCd(x, y + height - height / 10, true);
-				term2.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -280,30 +239,19 @@ public class ELNComponentIdealTransformer extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 10, y, true);
 				term0.setMoveCd(x, y + height - height / 10, true);
-				term1.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -313,30 +261,19 @@ public class ELNComponentIdealTransformer extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 10, y, true);
 				term1.setMoveCd(x, y + height - height / 10, true);
-				term0.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 		} else if (position == 1) {
 			if (first == false) {
@@ -370,30 +307,19 @@ public class ELNComponentIdealTransformer extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 10, y, true);
 				term3.setMoveCd(x, y + height - height / 10, true);
-				term1.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -403,30 +329,19 @@ public class ELNComponentIdealTransformer extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 10, y, true);
 				term2.setMoveCd(x, y + height - height / 10, true);
-				term0.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -436,30 +351,19 @@ public class ELNComponentIdealTransformer extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 10, y, true);
 				term1.setMoveCd(x, y + height - height / 10, true);
-				term3.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -469,30 +373,19 @@ public class ELNComponentIdealTransformer extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 10, y, true);
 				term0.setMoveCd(x, y + height - height / 10, true);
-				term2.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 		} else if (position == 2) {
 			if (first == false) {
@@ -526,30 +419,19 @@ public class ELNComponentIdealTransformer extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 10, y, true);
 				term1.setMoveCd(x, y + height - height / 10, true);
-				term0.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -559,30 +441,19 @@ public class ELNComponentIdealTransformer extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 10, y, true);
 				term0.setMoveCd(x, y + height - height / 10, true);
-				term1.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -592,30 +463,19 @@ public class ELNComponentIdealTransformer extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 10, y, true);
 				term3.setMoveCd(x, y + height - height / 10, true);
-				term2.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -625,30 +485,19 @@ public class ELNComponentIdealTransformer extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 10, y, true);
 				term2.setMoveCd(x, y + height - height / 10, true);
-				term3.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 		} else if (position == 3) {
 			if (first == false) {
@@ -682,30 +531,19 @@ public class ELNComponentIdealTransformer extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 10, y, true);
 				term0.setMoveCd(x, y + height - height / 10, true);
-				term2.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -715,30 +553,19 @@ public class ELNComponentIdealTransformer extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 10, y, true);
 				term1.setMoveCd(x, y + height - height / 10, true);
-				term3.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -748,30 +575,19 @@ public class ELNComponentIdealTransformer extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 10, y, true);
 				term2.setMoveCd(x, y + height - height / 10, true);
-				term0.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -781,30 +597,19 @@ public class ELNComponentIdealTransformer extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 10, y, true);
 				term3.setMoveCd(x, y + height - height / 10, true);
-				term1.setMoveCd(x + width - width / 10, y + height - height
-						/ 10, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 		}
 		g.setColor(c);
@@ -813,236 +618,172 @@ public class ELNComponentIdealTransformer extends
 
 	private void rotateTop(Graphics g) {
 		int[] ptx0 = { x, x + width / 5, x + width / 5, x + width / 5 };
-		int[] pty0 = { y + height / 20, y + height / 20, y + height / 5,
-				y + height / 20 };
+		int[] pty0 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
 		g.drawPolygon(ptx0, pty0, 4);
 		int[] ptx1 = { x, x + width / 5, x + width / 5, x + width / 5 };
-		int[] pty1 = { y + height - height / 20, y + height - height / 20,
-				y + 4 * height / 5, y + height - height / 20 };
+		int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5,
+				y + height - height / 20 };
 		g.drawPolygon(ptx1, pty1, 4);
-		int[] ptx2 = { x + width, x + 4 * width / 5, x + 4 * width / 5,
-				x + 4 * width / 5 };
-		int[] pty2 = { y + height / 20, y + height / 20, y + height / 5,
-				y + height / 20 };
+		int[] ptx2 = { x + width, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5 };
+		int[] pty2 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
 		g.drawPolygon(ptx2, pty2, 4);
-		int[] ptx3 = { x + width, x + 4 * width / 5, x + 4 * width / 5,
-				x + 4 * width / 5 };
-		int[] pty3 = { y + height - height / 20, y + height - height / 20,
-				y + 4 * height / 5, y + height - height / 20 };
+		int[] ptx3 = { x + width, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5 };
+		int[] pty3 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5,
+				y + height - height / 20 };
 		g.drawPolygon(ptx3, pty3, 4);
 		g.drawArc(x, y + height / 5, 2 * width / 5, height / 5, 270, 180);
 		g.drawArc(x, y + 2 * height / 5, 2 * width / 5, height / 5, 270, 180);
 		g.drawArc(x, y + 3 * height / 5, 2 * width / 5, height / 5, 270, 180);
-		g.drawArc(x + 3 * width / 5, y + height / 5, 2 * width / 5, height / 5,
-				90, 180);
-		g.drawArc(x + 3 * width / 5, y + 2 * height / 5, 2 * width / 5,
-				height / 5, 90, 180);
-		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, 2 * width / 5,
-				height / 5, 90, 180);
-		g.drawOval(x + 2 * width / 5 - width / 20, y + width / 20, width / 10,
-				width / 10);
-		g.fillOval(x + 2 * width / 5 - width / 20, y + width / 20, width / 10,
-				width / 10);
-		g.drawOval(x + 3 * width / 5 - width / 20, y + width / 20, width / 10,
-				width / 10);
-		g.fillOval(x + 3 * width / 5 - width / 20, y + width / 20, width / 10,
-				width / 10);
-		g.drawArc(x + width / 5 + width / 10, y + 4 * height / 5,
-				2 * width / 5, height / 5, 180, 180);
+		g.drawArc(x + 3 * width / 5, y + height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawArc(x + 3 * width / 5, y + 2 * height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawOval(x + 2 * width / 5 - width / 20, y + width / 20, width / 10, width / 10);
+		g.fillOval(x + 2 * width / 5 - width / 20, y + width / 20, width / 10, width / 10);
+		g.drawOval(x + 3 * width / 5 - width / 20, y + width / 20, width / 10, width / 10);
+		g.fillOval(x + 3 * width / 5 - width / 20, y + width / 20, width / 10, width / 10);
+		g.drawArc(x + width / 5 + width / 10, y + 4 * height / 5, 2 * width / 5, height / 5, 180, 180);
 		int[] ptx4 = { x + width / 5 + width / 10, x + width / 5 + width / 10,
 				x + width / 5 + width / 10 + width / 10 };
-		int[] pty4 = { y + 4 * height / 5 + height / 10 + height / 10,
-				y + 4 * height / 5 + height / 10,
+		int[] pty4 = { y + 4 * height / 5 + height / 10 + height / 10, y + 4 * height / 5 + height / 10,
 				y + 4 * height / 5 + height / 10 };
 		g.drawPolygon(ptx4, pty4, 3);
 		g.fillPolygon(ptx4, pty4, 3);
-		int[] ptx5 = { x + width / 5 + width / 10 + 2 * width / 5,
-				x + width / 5 + width / 10 + 2 * width / 5,
+		int[] ptx5 = { x + width / 5 + width / 10 + 2 * width / 5, x + width / 5 + width / 10 + 2 * width / 5,
 				x + width / 5 + width / 10 + 2 * width / 5 - width / 10 };
-		int[] pty5 = { y + 4 * height / 5 + height / 10 + height / 10,
-				y + 4 * height / 5 + height / 10,
+		int[] pty5 = { y + 4 * height / 5 + height / 10 + height / 10, y + 4 * height / 5 + height / 10,
 				y + 4 * height / 5 + height / 10 };
 		g.drawPolygon(ptx5, pty5, 3);
 		g.fillPolygon(ptx5, pty5, 3);
 
 		int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
 		int h = g.getFontMetrics().getAscent();
-		g.drawString(Double.toString(ratio), x + (width - w) / 2, y + height
-				+ height / 10 + h);
+		g.drawString(Double.toString(ratio), x + (width - w) / 2, y + height + height / 10 + h);
 	}
 
 	private void rotateBottom(Graphics g) {
 		int[] ptx0 = { x, x + width / 5, x + width / 5, x + width / 5 };
-		int[] pty0 = { y + height / 20, y + height / 20, y + height / 5,
-				y + height / 20 };
+		int[] pty0 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
 		g.drawPolygon(ptx0, pty0, 4);
 		int[] ptx1 = { x, x + width / 5, x + width / 5, x + width / 5 };
-		int[] pty1 = { y + height - height / 20, y + height - height / 20,
-				y + 4 * height / 5, y + height - height / 20 };
+		int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5,
+				y + height - height / 20 };
 		g.drawPolygon(ptx1, pty1, 4);
-		int[] ptx2 = { x + width, x + 4 * width / 5, x + 4 * width / 5,
-				x + 4 * width / 5 };
-		int[] pty2 = { y + height / 20, y + height / 20, y + height / 5,
-				y + height / 20 };
+		int[] ptx2 = { x + width, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5 };
+		int[] pty2 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
 		g.drawPolygon(ptx2, pty2, 4);
-		int[] ptx3 = { x + width, x + 4 * width / 5, x + 4 * width / 5,
-				x + 4 * width / 5 };
-		int[] pty3 = { y + height - height / 20, y + height - height / 20,
-				y + 4 * height / 5, y + height - height / 20 };
+		int[] ptx3 = { x + width, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5 };
+		int[] pty3 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5,
+				y + height - height / 20 };
 		g.drawPolygon(ptx3, pty3, 4);
 		g.drawArc(x, y + height / 5, 2 * width / 5, height / 5, 270, 180);
 		g.drawArc(x, y + 2 * height / 5, 2 * width / 5, height / 5, 270, 180);
 		g.drawArc(x, y + 3 * height / 5, 2 * width / 5, height / 5, 270, 180);
-		g.drawArc(x + 3 * width / 5, y + height / 5, 2 * width / 5, height / 5,
-				90, 180);
-		g.drawArc(x + 3 * width / 5, y + 2 * height / 5, 2 * width / 5,
-				height / 5, 90, 180);
-		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, 2 * width / 5,
-				height / 5, 90, 180);
-		g.drawOval(x + 2 * width / 5 - width / 20, y + width - width / 20
-				- width / 10, width / 10, width / 10);
-		g.fillOval(x + 2 * width / 5 - width / 20, y + width - width / 20
-				- width / 10, width / 10, width / 10);
-		g.drawOval(x + 3 * width / 5 - width / 20, y + width - width / 20
-				- width / 10, width / 10, width / 10);
-		g.fillOval(x + 3 * width / 5 - width / 20, y + width - width / 20
-				- width / 10, width / 10, width / 10);
-		g.drawArc(x + width / 5 + width / 10, y, 2 * width / 5, height / 5, 0,
-				180);
+		g.drawArc(x + 3 * width / 5, y + height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawArc(x + 3 * width / 5, y + 2 * height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, 2 * width / 5, height / 5, 90, 180);
+		g.drawOval(x + 2 * width / 5 - width / 20, y + width - width / 20 - width / 10, width / 10, width / 10);
+		g.fillOval(x + 2 * width / 5 - width / 20, y + width - width / 20 - width / 10, width / 10, width / 10);
+		g.drawOval(x + 3 * width / 5 - width / 20, y + width - width / 20 - width / 10, width / 10, width / 10);
+		g.fillOval(x + 3 * width / 5 - width / 20, y + width - width / 20 - width / 10, width / 10, width / 10);
+		g.drawArc(x + width / 5 + width / 10, y, 2 * width / 5, height / 5, 0, 180);
 		int[] ptx4 = { x + width / 5 + width / 10, x + width / 5 + width / 10,
 				x + width / 5 + width / 10 + width / 10 };
-		int[] pty4 = { y + height / 5 - height / 10 - height / 10,
-				y + height / 5 - height / 10, y + height / 5 - height / 10 };
+		int[] pty4 = { y + height / 5 - height / 10 - height / 10, y + height / 5 - height / 10,
+				y + height / 5 - height / 10 };
 		g.drawPolygon(ptx4, pty4, 3);
 		g.fillPolygon(ptx4, pty4, 3);
-		int[] ptx5 = { x + width / 5 + width / 10 + 2 * width / 5,
-				x + width / 5 + width / 10 + 2 * width / 5,
+		int[] ptx5 = { x + width / 5 + width / 10 + 2 * width / 5, x + width / 5 + width / 10 + 2 * width / 5,
 				x + width / 5 + width / 10 + 2 * width / 5 - width / 10 };
-		int[] pty5 = { y + height / 5 - height / 10 - height / 10,
-				y + height / 5 - height / 10, y + height / 5 - height / 10 };
+		int[] pty5 = { y + height / 5 - height / 10 - height / 10, y + height / 5 - height / 10,
+				y + height / 5 - height / 10 };
 		g.drawPolygon(ptx5, pty5, 3);
 		g.fillPolygon(ptx5, pty5, 3);
 
 		int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
-		g.drawString(Double.toString(ratio), x + (width - w) / 2, y - height
-				/ 20);
+		g.drawString(Double.toString(ratio), x + (width - w) / 2, y - height / 20);
 	}
 
 	private void rotateRight(Graphics g) {
-		int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5,
-				x + width / 20 };
+		int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
 		int[] pty0 = { y, y + height / 5, y + height / 5, y + height / 5 };
 		g.drawPolygon(ptx0, pty0, 4);
-		int[] ptx1 = { x + width - width / 20, x + width - width / 20,
-				x + 4 * width / 5, x + width - width / 20 };
+		int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5, x + width - width / 20 };
 		int[] pty1 = { y, y + height / 5, y + height / 5, y + height / 5 };
 		g.drawPolygon(ptx1, pty1, 4);
-		int[] ptx2 = { x + width / 20, x + width / 20, x + width / 5,
-				x + width / 20 };
-		int[] pty2 = { y + height, y + 4 * height / 5, y + 4 * height / 5,
-				y + 4 * height / 5 };
+		int[] ptx2 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
+		int[] pty2 = { y + height, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5 };
 		g.drawPolygon(ptx2, pty2, 4);
-		int[] ptx3 = { x + width - width / 20, x + width - width / 20,
-				x + 4 * width / 5, x + width - width / 20 };
-		int[] pty3 = { y + height, y + 4 * height / 5, y + 4 * height / 5,
-				y + 4 * height / 5 };
+		int[] ptx3 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5, x + width - width / 20 };
+		int[] pty3 = { y + height, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5 };
 		g.drawPolygon(ptx3, pty3, 4);
 		g.drawArc(x + width / 5, y, width / 5, 2 * height / 5, 180, 180);
 		g.drawArc(x + 2 * width / 5, y, width / 5, 2 * height / 5, 180, 180);
 		g.drawArc(x + 3 * width / 5, y, width / 5, 2 * height / 5, 180, 180);
-		g.drawArc(x + width / 5, y + 3 * height / 5, width / 5, 2 * height / 5,
-				0, 180);
-		g.drawArc(x + 2 * width / 5, y + 3 * height / 5, width / 5,
-				2 * height / 5, 0, 180);
-		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, width / 5,
-				2 * height / 5, 0, 180);
-		g.drawOval(x + width - width / 10 - width / 20, y + 2 * height / 5
-				- height / 20, width / 10, height / 10);
-		g.fillOval(x + width - width / 10 - width / 20, y + 2 * height / 5
-				- height / 20, width / 10, height / 10);
-		g.drawOval(x + width - width / 10 - width / 20, y + 3 * height / 5
-				- height / 20, width / 10, height / 10);
-		g.fillOval(x + width - width / 10 - width / 20, y + 3 * height / 5
-				- height / 20, width / 10, height / 10);
-		g.drawArc(x, y + height / 5 + height / 10, width / 5, 2 * height / 5,
-				90, 180);
-		int[] ptx4 = { x + width / 5 - width / 10 - width / 10,
-				x + width / 5 - width / 10, x + width / 5 - width / 10 };
-		int[] pty4 = { y + height / 5 + height / 10,
-				y + height / 5 + height / 10,
+		g.drawArc(x + width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawArc(x + 2 * width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawOval(x + width - width / 10 - width / 20, y + 2 * height / 5 - height / 20, width / 10, height / 10);
+		g.fillOval(x + width - width / 10 - width / 20, y + 2 * height / 5 - height / 20, width / 10, height / 10);
+		g.drawOval(x + width - width / 10 - width / 20, y + 3 * height / 5 - height / 20, width / 10, height / 10);
+		g.fillOval(x + width - width / 10 - width / 20, y + 3 * height / 5 - height / 20, width / 10, height / 10);
+		g.drawArc(x, y + height / 5 + height / 10, width / 5, 2 * height / 5, 90, 180);
+		int[] ptx4 = { x + width / 5 - width / 10 - width / 10, x + width / 5 - width / 10,
+				x + width / 5 - width / 10 };
+		int[] pty4 = { y + height / 5 + height / 10, y + height / 5 + height / 10,
 				y + height / 5 + height / 10 + height / 10 };
 		g.drawPolygon(ptx4, pty4, 3);
 		g.fillPolygon(ptx4, pty4, 3);
-		int[] ptx5 = { x + width / 5 - width / 10 - width / 10,
-				x + width / 5 - width / 10, x + width / 5 - width / 10 };
-		int[] pty5 = { y + height / 5 + height / 10 + 2 * height / 5,
-				y + height / 5 + height / 10 + 2 * height / 5,
+		int[] ptx5 = { x + width / 5 - width / 10 - width / 10, x + width / 5 - width / 10,
+				x + width / 5 - width / 10 };
+		int[] pty5 = { y + height / 5 + height / 10 + 2 * height / 5, y + height / 5 + height / 10 + 2 * height / 5,
 				y + height / 5 + height / 10 + 2 * height / 5 - height / 10 };
 		g.drawPolygon(ptx5, pty5, 3);
 		g.fillPolygon(ptx5, pty5, 3);
 
 		int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
 		int h = g.getFontMetrics().getAscent();
-		g.drawString(Double.toString(ratio), x - width / 10 - w, y + height / 2
-				+ h / 2);
+		g.drawString(Double.toString(ratio), x - width / 10 - w, y + height / 2 + h / 2);
 	}
 
 	private void rotateLeft(Graphics g) {
-		int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5,
-				x + width / 20 };
+		int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
 		int[] pty0 = { y, y + height / 5, y + height / 5, y + height / 5 };
 		g.drawPolygon(ptx0, pty0, 4);
-		int[] ptx1 = { x + width - width / 20, x + width - width / 20,
-				x + 4 * width / 5, x + width - width / 20 };
+		int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5, x + width - width / 20 };
 		int[] pty1 = { y, y + height / 5, y + height / 5, y + height / 5 };
 		g.drawPolygon(ptx1, pty1, 4);
-		int[] ptx2 = { x + width / 20, x + width / 20, x + width / 5,
-				x + width / 20 };
-		int[] pty2 = { y + height, y + 4 * height / 5, y + 4 * height / 5,
-				y + 4 * height / 5 };
+		int[] ptx2 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
+		int[] pty2 = { y + height, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5 };
 		g.drawPolygon(ptx2, pty2, 4);
-		int[] ptx3 = { x + width - width / 20, x + width - width / 20,
-				x + 4 * width / 5, x + width - width / 20 };
-		int[] pty3 = { y + height, y + 4 * height / 5, y + 4 * height / 5,
-				y + 4 * height / 5 };
+		int[] ptx3 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5, x + width - width / 20 };
+		int[] pty3 = { y + height, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5 };
 		g.drawPolygon(ptx3, pty3, 4);
 		g.drawArc(x + width / 5, y, width / 5, 2 * height / 5, 180, 180);
 		g.drawArc(x + 2 * width / 5, y, width / 5, 2 * height / 5, 180, 180);
 		g.drawArc(x + 3 * width / 5, y, width / 5, 2 * height / 5, 180, 180);
-		g.drawArc(x + width / 5, y + 3 * height / 5, width / 5, 2 * height / 5,
-				0, 180);
-		g.drawArc(x + 2 * width / 5, y + 3 * height / 5, width / 5,
-				2 * height / 5, 0, 180);
-		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, width / 5,
-				2 * height / 5, 0, 180);
-		g.drawOval(x + width / 20, y + 2 * height / 5 - height / 20,
-				width / 10, height / 10);
-		g.fillOval(x + width / 20, y + 2 * height / 5 - height / 20,
-				width / 10, height / 10);
-		g.drawOval(x + width / 20, y + 3 * height / 5 - height / 20,
-				width / 10, height / 10);
-		g.fillOval(x + width / 20, y + 3 * height / 5 - height / 20,
-				width / 10, height / 10);
-		g.drawArc(x + 4 * width / 5, y + height / 5 + height / 10, width / 5,
-				2 * height / 5, 270, 180);
-		int[] ptx4 = { x + 4 * width / 5 + width / 10 + width / 10,
-				x + 4 * width / 5 + width / 10, x + 4 * width / 5 + width / 10 };
-		int[] pty4 = { y + height / 5 + height / 10,
-				y + height / 5 + height / 10,
+		g.drawArc(x + width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawArc(x + 2 * width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawArc(x + 3 * width / 5, y + 3 * height / 5, width / 5, 2 * height / 5, 0, 180);
+		g.drawOval(x + width / 20, y + 2 * height / 5 - height / 20, width / 10, height / 10);
+		g.fillOval(x + width / 20, y + 2 * height / 5 - height / 20, width / 10, height / 10);
+		g.drawOval(x + width / 20, y + 3 * height / 5 - height / 20, width / 10, height / 10);
+		g.fillOval(x + width / 20, y + 3 * height / 5 - height / 20, width / 10, height / 10);
+		g.drawArc(x + 4 * width / 5, y + height / 5 + height / 10, width / 5, 2 * height / 5, 270, 180);
+		int[] ptx4 = { x + 4 * width / 5 + width / 10 + width / 10, x + 4 * width / 5 + width / 10,
+				x + 4 * width / 5 + width / 10 };
+		int[] pty4 = { y + height / 5 + height / 10, y + height / 5 + height / 10,
 				y + height / 5 + height / 10 + height / 10 };
 		g.drawPolygon(ptx4, pty4, 3);
 		g.fillPolygon(ptx4, pty4, 3);
-		int[] ptx5 = { x + 4 * width / 5 + width / 10 + width / 10,
-				x + 4 * width / 5 + width / 10, x + 4 * width / 5 + width / 10 };
-		int[] pty5 = { y + height / 5 + height / 10 + 2 * height / 5,
-				y + height / 5 + height / 10 + 2 * height / 5,
+		int[] ptx5 = { x + 4 * width / 5 + width / 10 + width / 10, x + 4 * width / 5 + width / 10,
+				x + 4 * width / 5 + width / 10 };
+		int[] pty5 = { y + height / 5 + height / 10 + 2 * height / 5, y + height / 5 + height / 10 + 2 * height / 5,
 				y + height / 5 + height / 10 + 2 * height / 5 - height / 10 };
 		g.drawPolygon(ptx5, pty5, 3);
 		g.fillPolygon(ptx5, pty5, 3);
 
 		int h = g.getFontMetrics().getAscent();
-		g.drawString(Double.toString(ratio), x + width + width / 10, y + height
-				/ 2 + h / 2);
+		g.drawString(Double.toString(ratio), x + width + width / 10, y + height / 2 + h / 2);
 	}
 
 	public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -1057,8 +798,7 @@ public class ELNComponentIdealTransformer extends
 	}
 
 	public boolean editOndoubleClick(JFrame frame) {
-		JDialogELNComponentIdealTransformer jde = new JDialogELNComponentIdealTransformer(
-				this);
+		JDialogELNComponentIdealTransformer jde = new JDialogELNComponentIdealTransformer(this);
 		jde.setVisible(true);
 		return true;
 	}
@@ -1079,8 +819,7 @@ public class ELNComponentIdealTransformer extends
 		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;
@@ -1099,24 +838,15 @@ public class ELNComponentIdealTransformer extends
 						if (n2.getNodeType() == Node.ELEMENT_NODE) {
 							elt = (Element) n2;
 							if (elt.getTagName().equals("attributes")) {
-								ratio = Double.parseDouble(elt
-										.getAttribute("ratio"));
-								position = Integer.parseInt(elt
-										.getAttribute("position"));
-								width = Integer.parseInt(elt
-										.getAttribute("width"));
-								height = Integer.parseInt(elt
-										.getAttribute("height"));
-								fv_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fv_0_2"));
-								fv_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fv_1_3"));
-								fh_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fh_0_2"));
-								fh_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fh_1_3"));
-								first = Boolean.parseBoolean(elt
-										.getAttribute("first"));
+								ratio = Double.parseDouble(elt.getAttribute("ratio"));
+								position = Integer.parseInt(elt.getAttribute("position"));
+								width = Integer.parseInt(elt.getAttribute("width"));
+								height = Integer.parseInt(elt.getAttribute("height"));
+								fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+								fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+								fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+								fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+								first = Boolean.parseBoolean(elt.getAttribute("first"));
 								setRatio(ratio);
 								setPosition(position);
 								this.width = width;
@@ -1136,8 +866,7 @@ public class ELNComponentIdealTransformer extends
 		}
 	}
 
-	public void addActionToPopupMenu(JPopupMenu componentMenu,
-			ActionListener menuAL, int x, int y) {
+	public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
 		componentMenu.addSeparator();
 
 		JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
index 2fa0c2ab9e..33d64694b3 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
@@ -119,17 +119,14 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("p");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
-			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX,
-					this.minY, this.maxY, false, this.father, this.tdp);
+			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("n");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true,
-					false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
 			old = width;
 			width = height;
 			height = old;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
index 1b53f37300..7f711a6ead 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
@@ -51,16 +51,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
- * Class ELNComponentIndependentVoltageSource Independent voltage source to be
- * used in ELN diagrams Creation: 15/06/2018
- * 
+ * 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 implements ActionListener,
-		SwallowTGComponent, ELNComponent {
+public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, ELNComponent {
 	protected Color myColor;
 	protected int orientation;
 	private int maxFontSize = 14;
@@ -71,23 +69,19 @@ public class ELNComponentIndependentVoltageSource extends
 	private double dtextX = 0.0;
 	protected int decPoint = 3;
 
-	private double initValue, offset, amplitude, frequency, phase, acAmplitude,
-			acPhase, acNoiseAmplitude;
+	private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
 	private String delay;
 	private String unit0;
 
 	private int position = 0;
-	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false,
-			fh_1_3 = false;
+	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
 	private int old;
 	private boolean first, f = true;
 
 	private ELNPortTerminal term0;
 	private ELNPortTerminal term1;
 
-	public ELNComponentIndependentVoltageSource(int _x, int _y, int _minX,
-			int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
-			TDiagramPanel _tdp) {
+	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(40, 80);
@@ -125,21 +119,14 @@ public class ELNComponentIndependentVoltageSource extends
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4,
-					this.minX, this.maxX, this.minY, this.maxY, false,
-					this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("p");
 			getTDiagramPanel().getComponentList().add(term0);
-			term0.getTDiagramPanel().addComponent(term0, x,
-					y + height / 2 - height / 4, true, false);
-			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2
-					- height / 4, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
+			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("n");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1,
-					x + width - height / 2, y + height / 2 - height / 4, true,
-					false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
 			old = width;
 			width = height;
 			height = old;
@@ -151,10 +138,7 @@ public class ELNComponentIndependentVoltageSource extends
 
 		if (this.rescaled && !this.tdp.isScaled()) {
 			this.rescaled = false;
-			int maxCurrentFontSize = Math.max(
-					0,
-					Math.min(this.height,
-							(int) (this.maxFontSize * this.tdp.getZoom())));
+			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)) {
@@ -201,19 +185,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
 				rotateTop(g);
 				term0.setMoveCd(x + width / 2 - width / 12, y, true);
-				term1.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
+				term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
 				g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term1.getValue(), x + width / 2 + width / 2, y
-						+ height + sh1);
+				g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -221,19 +199,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
 				rotateBottomFlip(g);
 				term0.setMoveCd(x + width / 2 - width / 12, y, true);
-				term1.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
+				term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
 				g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term1.getValue(), x + width / 2 + width / 2, y
-						+ height + sh1);
+				g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -241,19 +213,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
 				rotateTopFlip(g);
 				term1.setMoveCd(x + width / 2 - width / 12, y, true);
-				term0.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
+				term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
 				g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term0.getValue(), x + width / 2 + width / 2, y
-						+ height + sh0);
+				g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -261,19 +227,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
 				rotateBottom(g);
 				term1.setMoveCd(x + width / 2 - width / 12, y, true);
-				term0.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
+				term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
 				g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term0.getValue(), x + width / 2 + width / 2, y
-						+ height + sh0);
+				g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
 			}
 		} else if (position == 1) {
 			if (first == false) {
@@ -301,20 +261,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
 				rotateRight(g);
 				term1.setMoveCd(x, y + height / 2 - height / 12, true);
-				term0.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height
-						/ 4 + sh0);
-				g.drawString(term0.getValue(), x + width, y + height / 2
-						+ height / 4 + sh1);
+				term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
+				g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -322,20 +275,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
 				rotateRightFlip(g);
 				term1.setMoveCd(x, y + height / 2 - height / 12, true);
-				term0.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height
-						/ 4 + sh0);
-				g.drawString(term0.getValue(), x + width, y + height / 2
-						+ height / 4 + sh1);
+				term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
+				g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -343,20 +289,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
 				rotateLeftFlip(g);
 				term0.setMoveCd(x, y + height / 2 - height / 12, true);
-				term1.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height
-						/ 4 + sh1);
-				g.drawString(term1.getValue(), x + width, y + height / 2
-						+ height / 4 + sh0);
+				term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
+				g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -364,20 +303,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
 				rotateLeft(g);
 				term0.setMoveCd(x, y + height / 2 - height / 12, true);
-				term1.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height
-						/ 4 + sh1);
-				g.drawString(term1.getValue(), x + width, y + height / 2
-						+ height / 4 + sh0);
+				term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
+				g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
 			}
 		} else if (position == 2) {
 			if (first == false) {
@@ -403,19 +335,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
 				rotateBottom(g);
 				term1.setMoveCd(x + width / 2 - width / 12, y, true);
-				term0.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
+				term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
 				g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term0.getValue(), x + width / 2 + width / 2, y
-						+ height + sh0);
+				g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -423,19 +349,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
 				rotateTopFlip(g);
 				term1.setMoveCd(x + width / 2 - width / 12, y, true);
-				term0.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
+				term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
 				g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term0.getValue(), x + width / 2 + width / 2, y
-						+ height + sh0);
+				g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -443,19 +363,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
 				rotateBottomFlip(g);
 				term0.setMoveCd(x + width / 2 - width / 12, y, true);
-				term1.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
+				term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
 				g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term1.getValue(), x + width / 2 + width / 2, y
-						+ height + sh1);
+				g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -463,19 +377,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
 				rotateTop(g);
 				term0.setMoveCd(x + width / 2 - width / 12, y, true);
-				term1.setMoveCd(x + width / 2 - width / 12, y + height - height
-						/ 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(1.0);
+				term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
 				g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
-				g.drawString(term1.getValue(), x + width / 2 + width / 2, y
-						+ height + sh1);
+				g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
 			}
 		} else if (position == 3) {
 			if (first == false) {
@@ -503,20 +411,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
 				rotateLeft(g);
 				term0.setMoveCd(x, y + height / 2 - height / 12, true);
-				term1.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height
-						/ 4 + sh1);
-				g.drawString(term1.getValue(), x + width, y + height / 2
-						+ height / 4 + sh0);
+				term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
+				g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -524,20 +425,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
 				rotateLeftFlip(g);
 				term0.setMoveCd(x, y + height / 2 - height / 12, true);
-				term1.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height
-						/ 4 + sh1);
-				g.drawString(term1.getValue(), x + width, y + height / 2
-						+ height / 4 + sh0);
+				term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
+				g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -545,20 +439,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
 				rotateRightFlip(g);
 				term1.setMoveCd(x, y + height / 2 - height / 12, true);
-				term0.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height
-						/ 4 + sh0);
-				g.drawString(term0.getValue(), x + width, y + height / 2
-						+ height / 4 + sh1);
+				term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
+				g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -566,20 +453,13 @@ public class ELNComponentIndependentVoltageSource extends
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
 				rotateRight(g);
 				term1.setMoveCd(x, y + height / 2 - height / 12, true);
-				term0.setMoveCd(x + width - width / 8, y + height / 2 - height
-						/ 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height
-						/ 4 + sh0);
-				g.drawString(term0.getValue(), x + width, y + height / 2
-						+ height / 4 + sh1);
+				term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
+				g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
 			}
 		}
 		g.setColor(c);
@@ -590,20 +470,15 @@ public class ELNComponentIndependentVoltageSource extends
 		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,
+		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,
+		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 };
+		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);
 	}
@@ -612,17 +487,12 @@ public class ELNComponentIndependentVoltageSource extends
 		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,
+		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 + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8 + width / 8,
-				y + 3 * height / 4 + height / 8 - width / 8,
-				y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8 };
+		int[] pty1 = { y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8,
+				y + 3 * height / 4 + height / 8 + width / 8, y + 3 * height / 4 + height / 8 - width / 8,
+				y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8 };
 		g.drawPolygon(ptx1, pty1, 6);
 		int[] ptx2 = { x + width / 2 + width / 4, x + width };
 		int[] pty2 = { y + height / 8, y + height / 8 };
@@ -634,17 +504,12 @@ public class ELNComponentIndependentVoltageSource extends
 		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,
+		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 };
-		int[] pty1 = { y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8 + width / 8,
-				y + 3 * height / 4 + height / 8 - width / 8,
-				y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8 };
+		int[] pty1 = { y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8,
+				y + 3 * height / 4 + height / 8 + width / 8, y + 3 * height / 4 + height / 8 - width / 8,
+				y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8 };
 		g.drawPolygon(ptx1, pty1, 6);
 		int[] ptx2 = { x + width / 2 - width / 4, x };
 		int[] pty2 = { y + height / 4 - height / 8, y + height / 4 - height / 8 };
@@ -656,18 +521,14 @@ public class ELNComponentIndependentVoltageSource extends
 		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,
+		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 };
-		int[] pty1 = { y + height / 8, y + height / 8,
-				y + height / 8 + width / 8, y + height / 8 - width / 8,
+		int[] pty1 = { y + height / 8, y + height / 8, y + height / 8 + width / 8, y + height / 8 - width / 8,
 				y + height / 8, y + height / 8 };
 		g.drawPolygon(ptx1, pty1, 6);
 		int[] ptx2 = { x + width / 2 - width / 4, x };
-		int[] pty2 = { y + 3 * height / 4 + height / 8,
-				y + 3 * height / 4 + height / 8 };
+		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);
 	}
@@ -676,14 +537,10 @@ public class ELNComponentIndependentVoltageSource extends
 		int[] ptx0 = { x, x + width };
 		int[] pty0 = { y + height / 2, y + height / 2 };
 		g.drawPolygon(ptx0, pty0, 2);
-		int[] ptx1 = { x + width - width / 8, x + width - width / 8,
-				x + width - width / 8 - height / 8,
-				x + width - width / 8 + height / 8, x + width - width / 8,
-				x + width - width / 8 };
-		int[] pty1 = { y + height / 2 + height / 4,
-				y + height / 2 + height / 4 + height / 8,
-				y + height / 2 + height / 4 + height / 8,
-				y + height / 2 + height / 4 + height / 8,
+		int[] ptx1 = { x + width - width / 8, x + width - width / 8, x + width - width / 8 - height / 8,
+				x + width - width / 8 + height / 8, x + width - width / 8, x + width - width / 8 };
+		int[] pty1 = { y + height / 2 + height / 4, y + height / 2 + height / 4 + height / 8,
+				y + height / 2 + height / 4 + height / 8, y + height / 2 + height / 4 + height / 8,
 				y + height / 2 + height / 4 + height / 8, y + height };
 		g.drawPolygon(ptx1, pty1, 6);
 		int[] ptx2 = { x + width / 8, x + width / 8 };
@@ -696,13 +553,10 @@ public class ELNComponentIndependentVoltageSource extends
 		int[] ptx0 = { x, x + width };
 		int[] pty0 = { y + height / 2, y + height / 2 };
 		g.drawPolygon(ptx0, pty0, 2);
-		int[] ptx1 = { x + width - width / 8, x + width - width / 8,
-				x + width - width / 8 - height / 8,
-				x + width - width / 8 + height / 8, x + width - width / 8,
-				x + width - width / 8 };
-		int[] pty1 = { y + height / 4, y + height / 4 - height / 8,
-				y + height / 4 - height / 8, y + height / 4 - height / 8,
-				y + height / 4 - height / 8, y };
+		int[] ptx1 = { x + width - width / 8, x + width - width / 8, x + width - width / 8 - height / 8,
+				x + width - width / 8 + height / 8, x + width - width / 8, x + width - width / 8 };
+		int[] pty1 = { y + height / 4, y + height / 4 - height / 8, y + height / 4 - height / 8,
+				y + height / 4 - height / 8, y + height / 4 - height / 8, y };
 		g.drawPolygon(ptx1, pty1, 6);
 		int[] ptx2 = { x + width / 8, x + width / 8 };
 		int[] pty2 = { y + height / 4, y };
@@ -714,18 +568,13 @@ public class ELNComponentIndependentVoltageSource extends
 		int[] ptx0 = { x, x + width };
 		int[] pty0 = { y + height / 2, y + height / 2 };
 		g.drawPolygon(ptx0, pty0, 2);
-		int[] ptx1 = { x + width / 4 - width / 8, x + width / 4 - width / 8,
-				x + width / 4 - width / 8 - height / 8,
-				x + width / 4 - width / 8 + height / 8,
-				x + width / 4 - width / 8, x + width / 4 - width / 8 };
-		int[] pty1 = { y + height / 2 - height / 4,
-				y + height / 2 - height / 4 - height / 8,
-				y + height / 2 - height / 4 - height / 8,
-				y + height / 2 - height / 4 - height / 8,
+		int[] ptx1 = { x + width / 4 - width / 8, x + width / 4 - width / 8, x + width / 4 - width / 8 - height / 8,
+				x + width / 4 - width / 8 + height / 8, x + width / 4 - width / 8, x + width / 4 - width / 8 };
+		int[] pty1 = { y + height / 2 - height / 4, y + height / 2 - height / 4 - height / 8,
+				y + height / 2 - height / 4 - height / 8, y + height / 2 - height / 4 - height / 8,
 				y + height / 2 - height / 4 - height / 8, y };
 		g.drawPolygon(ptx1, pty1, 6);
-		int[] ptx2 = { x + 3 * width / 4 + width / 8,
-				x + 3 * width / 4 + width / 8 };
+		int[] ptx2 = { x + 3 * width / 4 + width / 8, x + 3 * width / 4 + width / 8 };
 		int[] pty2 = { y + height / 2 - height / 4, y };
 		g.drawPolygon(ptx2, pty2, 2);
 		g.drawOval(x + width / 4, y, width / 2, height);
@@ -735,18 +584,13 @@ public class ELNComponentIndependentVoltageSource extends
 		int[] ptx0 = { x, x + width };
 		int[] pty0 = { y + height / 2, y + height / 2 };
 		g.drawPolygon(ptx0, pty0, 2);
-		int[] ptx1 = { x + width / 4 - width / 8, x + width / 4 - width / 8,
-				x + width / 4 - width / 8 - height / 8,
-				x + width / 4 - width / 8 + height / 8,
-				x + width / 4 - width / 8, x + width / 4 - width / 8 };
-		int[] pty1 = { y + height / 2 + height / 4,
-				y + height / 2 + height / 4 + height / 8,
-				y + height / 2 + height / 4 + height / 8,
-				y + height / 2 + height / 4 + height / 8,
+		int[] ptx1 = { x + width / 4 - width / 8, x + width / 4 - width / 8, x + width / 4 - width / 8 - height / 8,
+				x + width / 4 - width / 8 + height / 8, x + width / 4 - width / 8, x + width / 4 - width / 8 };
+		int[] pty1 = { y + height / 2 + height / 4, y + height / 2 + height / 4 + height / 8,
+				y + height / 2 + height / 4 + height / 8, y + height / 2 + height / 4 + height / 8,
 				y + height / 2 + height / 4 + height / 8, y + height };
 		g.drawPolygon(ptx1, pty1, 6);
-		int[] ptx2 = { x + 3 * width / 4 + width / 8,
-				x + 3 * width / 4 + width / 8 };
+		int[] ptx2 = { x + 3 * width / 4 + width / 8, x + 3 * width / 4 + width / 8 };
 		int[] pty2 = { y + height / 2 + height / 4, y + height };
 		g.drawPolygon(ptx2, pty2, 2);
 		g.drawOval(x + width / 4, y, width / 2, height);
@@ -764,8 +608,7 @@ public class ELNComponentIndependentVoltageSource extends
 	}
 
 	public boolean editOndoubleClick(JFrame frame) {
-		JDialogELNComponentIndependentVoltageSource jde = new JDialogELNComponentIndependentVoltageSource(
-				this);
+		JDialogELNComponentIndependentVoltageSource jde = new JDialogELNComponentIndependentVoltageSource(this);
 		jde.setVisible(true);
 		return true;
 	}
@@ -812,8 +655,7 @@ public class ELNComponentIndependentVoltageSource extends
 		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;
@@ -834,40 +676,24 @@ public class ELNComponentIndependentVoltageSource extends
 						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"));
+								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"));
+								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"));
-								position = Integer.parseInt(elt
-										.getAttribute("position"));
-								width = Integer.parseInt(elt
-										.getAttribute("width"));
-								height = Integer.parseInt(elt
-										.getAttribute("height"));
-								fv_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fv_0_2"));
-								fv_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fv_1_3"));
-								fh_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fh_0_2"));
-								fh_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fh_1_3"));
-								first = Boolean.parseBoolean(elt
-										.getAttribute("first"));
+								acAmplitude = Double.parseDouble(elt.getAttribute("ac_amplitude"));
+								acPhase = Double.parseDouble(elt.getAttribute("ac_phase"));
+								acNoiseAmplitude = Double.parseDouble(elt.getAttribute("ac_noise_amplitude"));
+								position = Integer.parseInt(elt.getAttribute("position"));
+								width = Integer.parseInt(elt.getAttribute("width"));
+								height = Integer.parseInt(elt.getAttribute("height"));
+								fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+								fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+								fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+								fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+								first = Boolean.parseBoolean(elt.getAttribute("first"));
 								setInitValue(initValue);
 								setOffset(offset);
 								setAmplitude(amplitude);
@@ -896,8 +722,7 @@ public class ELNComponentIndependentVoltageSource extends
 		}
 	}
 
-	public void addActionToPopupMenu(JPopupMenu componentMenu,
-			ActionListener menuAL, int x, int y) {
+	public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
 		componentMenu.addSeparator();
 
 		JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
index bbb5784c04..470383016b 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
@@ -80,9 +80,8 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
 
 	private ELNPortTerminal term0;
 	private ELNPortTerminal term1;
-	
-	public ELNComponentInductor(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
+
+	public ELNComponentInductor(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(100, 20);
@@ -114,23 +113,20 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY,	false, this.father, this.tdp);
 			term0.setValue("p");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
-			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX,
-					this.minY, this.maxY, false, this.father, this.tdp);
+			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("n");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true,
-					false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
 			old = width;
 			width = height;
 			height = old;
 			f = false;
 		}
-		
+
 		Font f = g.getFont();
 		Font fold = f;
 
@@ -756,7 +752,7 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
 	public void setFirst(boolean _first) {
 		first = _first;
 	}
-	
+
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
 		return tgc instanceof ELNPortTerminal;
 	}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
index 87b9ff8ab2..068cb7a988 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
@@ -110,17 +110,14 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY,	false, this.father, this.tdp);
 			term0.setValue("p");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
-			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX,
-					this.minY, this.maxY, false, this.father, this.tdp);
+			term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("n");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true,
-					false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
 			old = width;
 			width = height;
 			height = old;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
index ce0d07df4d..c41ef05d45 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
@@ -51,16 +51,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
- * Class ELNComponentTransmissionLine Transmission line to be used in ELN
- * diagrams Creation: 15/06/2018
- * 
+ * Class ELNComponentTransmissionLine 
+ * Transmission line to be used in ELN diagrams 
+ * Creation: 15/06/2018
  * @version 1.0 15/06/2018
  * @author Irina Kit Yan LEE
  */
 
-public class ELNComponentTransmissionLine extends
-		TGCScalableWithInternalComponent implements ActionListener,
-		SwallowTGComponent, ELNComponent {
+public class ELNComponentTransmissionLine extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, ELNComponent {
 	protected Color myColor;
 	protected int orientation;
 	private int maxFontSize = 14;
@@ -76,8 +74,7 @@ public class ELNComponentTransmissionLine extends
 	private String unit0, unit2;
 
 	private int position = 0;
-	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false,
-			fh_1_3 = false;
+	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
 	private int old;
 	private boolean first, f = true;
 
@@ -86,9 +83,7 @@ public class ELNComponentTransmissionLine extends
 	private ELNPortTerminal term2;
 	private ELNPortTerminal term3;
 
-	public ELNComponentTransmissionLine(int _x, int _y, int _minX, int _maxX,
-			int _minY, int _maxY, boolean _pos, TGComponent _father,
-			TDiagramPanel _tdp) {
+	public ELNComponentTransmissionLine(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(120, 80);
@@ -121,36 +116,25 @@ public class ELNComponentTransmissionLine extends
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY,
-					this.maxY, false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("a1");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
 
-			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("a2");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1,
-					x + width - width / 12, y, true, false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
 
-			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term2.setValue("b1");
 			getTDiagramPanel().getComponentList().add(term2);
-			term2.getTDiagramPanel().addComponent(term2, x,
-					y + height - height / 8, true, false);
+			term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
 
-			term3 = new ELNPortTerminal(x + width - width / 12, y + height
-					- height / 8, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term3.setValue("b2");
 			getTDiagramPanel().getComponentList().add(term3);
-			term3.getTDiagramPanel().addComponent(term3,
-					x + width - width / 12, y + height - height / 8, true,
-					false);
+			term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
 			old = width;
 			width = height;
 			height = old;
@@ -162,10 +146,7 @@ public class ELNComponentTransmissionLine extends
 
 		if (this.rescaled && !this.tdp.isScaled()) {
 			this.rescaled = false;
-			int maxCurrentFontSize = Math.max(
-					0,
-					Math.min(this.height,
-							(int) (this.maxFontSize * this.tdp.getZoom())));
+			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)) {
@@ -221,30 +202,19 @@ public class ELNComponentTransmissionLine extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -253,30 +223,19 @@ public class ELNComponentTransmissionLine extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -285,30 +244,19 @@ public class ELNComponentTransmissionLine extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -317,30 +265,19 @@ public class ELNComponentTransmissionLine extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 		} else if (position == 1) {
 			if (first == false) {
@@ -375,30 +312,19 @@ public class ELNComponentTransmissionLine extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -407,30 +333,19 @@ public class ELNComponentTransmissionLine extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -439,30 +354,19 @@ public class ELNComponentTransmissionLine extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -471,30 +375,19 @@ public class ELNComponentTransmissionLine extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 		} else if (position == 2) {
 			if (first == false) {
@@ -529,30 +422,19 @@ public class ELNComponentTransmissionLine extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -561,30 +443,19 @@ public class ELNComponentTransmissionLine extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -593,30 +464,19 @@ public class ELNComponentTransmissionLine extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -625,30 +485,19 @@ public class ELNComponentTransmissionLine extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 		} else if (position == 3) {
 			if (first == false) {
@@ -683,30 +532,19 @@ public class ELNComponentTransmissionLine extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -715,30 +553,19 @@ public class ELNComponentTransmissionLine extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -747,30 +574,19 @@ public class ELNComponentTransmissionLine extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -779,30 +595,19 @@ public class ELNComponentTransmissionLine extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 		}
 		g.setColor(c);
@@ -810,31 +615,24 @@ public class ELNComponentTransmissionLine extends
 	}
 
 	private void rotateTopBottom(Graphics g) {
-		int[] ptx0 = { x, x + width / 6, x + 5 * width / 6, x + width,
-				x + 5 * width / 6, x + width / 6 };
-		int[] pty0 = { y, y + height / 2 - height / 8,
-				y + height / 2 - height / 8, y, y + height / 2 - height / 8,
+		int[] ptx0 = { x, x + width / 6, x + 5 * width / 6, x + width, x + 5 * width / 6, x + width / 6 };
+		int[] pty0 = { y, y + height / 2 - height / 8, y + height / 2 - height / 8, y, y + height / 2 - height / 8,
 				y + height / 2 - height / 8 };
 		g.drawPolygon(ptx0, pty0, 6);
-		int[] ptx1 = { x, x + width / 6, x + 5 * width / 6, x + width,
-				x + 5 * width / 6, x + width / 6 };
-		int[] pty1 = { y + height, y + height / 2 + height / 8,
-				y + height / 2 + height / 8, y + height,
+		int[] ptx1 = { x, x + width / 6, x + 5 * width / 6, x + width, x + 5 * width / 6, x + width / 6 };
+		int[] pty1 = { y + height, y + height / 2 + height / 8, y + height / 2 + height / 8, y + height,
 				y + height / 2 + height / 8, y + height / 2 + height / 8 };
 		g.drawPolygon(ptx1, pty1, 6);
 	}
 
 	private void rotateRightLeft(Graphics g) {
-		int[] ptx0 = { x, x + width / 2 - width / 8, x + width / 2 - width / 8,
-				x, x + width / 2 - width / 8, x + width / 2 - width / 8 };
-		int[] pty0 = { y, y + height / 6, y + 5 * height / 6, y + height,
-				y + 5 * height / 6, y + height / 6 };
+		int[] ptx0 = { x, x + width / 2 - width / 8, x + width / 2 - width / 8, x, x + width / 2 - width / 8,
+				x + width / 2 - width / 8 };
+		int[] pty0 = { y, y + height / 6, y + 5 * height / 6, y + height, y + 5 * height / 6, y + height / 6 };
 		g.drawPolygon(ptx0, pty0, 6);
-		int[] ptx1 = { x + width, x + width / 2 + width / 8,
-				x + width / 2 + width / 8, x + width,
+		int[] ptx1 = { x + width, x + width / 2 + width / 8, x + width / 2 + width / 8, x + width,
 				x + width / 2 + width / 8, x + width / 2 + width / 8 };
-		int[] pty1 = { y, y + height / 6, y + 5 * height / 6, y + height,
-				y + 5 * height / 6, y + height / 6 };
+		int[] pty1 = { y, y + height / 6, y + 5 * height / 6, y + height, y + 5 * height / 6, y + height / 6 };
 		g.drawPolygon(ptx1, pty1, 6);
 	}
 
@@ -850,8 +648,7 @@ public class ELNComponentTransmissionLine extends
 	}
 
 	public boolean editOndoubleClick(JFrame frame) {
-		JDialogELNComponentTransmissionLine jde = new JDialogELNComponentTransmissionLine(
-				this);
+		JDialogELNComponentTransmissionLine jde = new JDialogELNComponentTransmissionLine(this);
 		jde.setVisible(true);
 		return true;
 	}
@@ -896,8 +693,7 @@ public class ELNComponentTransmissionLine extends
 		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;
@@ -921,25 +717,16 @@ public class ELNComponentTransmissionLine extends
 								z0 = Double.parseDouble(elt.getAttribute("z0"));
 								unit0 = elt.getAttribute("unit0");
 								delay = elt.getAttribute("delay");
-								delta0 = Double.parseDouble(elt
-										.getAttribute("delta0"));
+								delta0 = Double.parseDouble(elt.getAttribute("delta0"));
 								unit2 = elt.getAttribute("unit2");
-								position = Integer.parseInt(elt
-										.getAttribute("position"));
-								width = Integer.parseInt(elt
-										.getAttribute("width"));
-								height = Integer.parseInt(elt
-										.getAttribute("height"));
-								fv_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fv_0_2"));
-								fv_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fv_1_3"));
-								fh_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fh_0_2"));
-								fh_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fh_1_3"));
-								first = Boolean.parseBoolean(elt
-										.getAttribute("first"));
+								position = Integer.parseInt(elt.getAttribute("position"));
+								width = Integer.parseInt(elt.getAttribute("width"));
+								height = Integer.parseInt(elt.getAttribute("height"));
+								fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+								fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+								fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+								fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+								first = Boolean.parseBoolean(elt.getAttribute("first"));
 								setZ0(z0);
 								setUnit0(unit0);
 								setDelay(delay);
@@ -963,8 +750,7 @@ public class ELNComponentTransmissionLine extends
 		}
 	}
 
-	public void addActionToPopupMenu(JPopupMenu componentMenu,
-			ActionListener menuAL, int x, int y) {
+	public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
 		componentMenu.addSeparator();
 
 		JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
index f989a7e6d0..76b1306958 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
@@ -51,16 +51,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
- * Class ELNComponentVoltageControlledCurrentSource Voltage controlled current
- * source to be used in ELN diagrams Creation: 13/06/2018
- * 
+ * Class ELNComponentVoltageControlledCurrentSource 
+ * Voltage controlled current source to be used in ELN diagrams 
+ * Creation: 13/06/2018
  * @version 1.0 13/06/2018
  * @author Irina Kit Yan LEE
  */
 
-public class ELNComponentVoltageControlledCurrentSource extends
-		TGCScalableWithInternalComponent implements ActionListener,
-		SwallowTGComponent, ELNComponent {
+public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, ELNComponent {
 	protected Color myColor;
 	protected int orientation;
 	private int maxFontSize = 14;
@@ -75,8 +73,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 	private String unit;
 
 	private int position = 0;
-	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false,
-			fh_1_3 = false;
+	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
 	private int old;
 	private boolean first, f = true;
 
@@ -85,9 +82,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 	private ELNPortTerminal term2;
 	private ELNPortTerminal term3;
 
-	public ELNComponentVoltageControlledCurrentSource(int _x, int _y,
-			int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
+	public ELNComponentVoltageControlledCurrentSource(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(120, 80);
@@ -117,36 +112,25 @@ public class ELNComponentVoltageControlledCurrentSource extends
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY,
-					this.maxY, false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("ncp");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
 
-			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("np");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1,
-					x + width - width / 12, y, true, false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
 
-			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term2.setValue("ncn");
 			getTDiagramPanel().getComponentList().add(term2);
-			term2.getTDiagramPanel().addComponent(term2, x,
-					y + height - height / 8, true, false);
+			term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
 
-			term3 = new ELNPortTerminal(x + width - width / 12, y + height
-					- height / 8, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term3.setValue("nn");
 			getTDiagramPanel().getComponentList().add(term3);
-			term3.getTDiagramPanel().addComponent(term3,
-					x + width - width / 12, y + height - height / 8, true,
-					false);
+			term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
 			old = width;
 			width = height;
 			height = old;
@@ -158,10 +142,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 
 		if (this.rescaled && !this.tdp.isScaled()) {
 			this.rescaled = false;
-			int maxCurrentFontSize = Math.max(
-					0,
-					Math.min(this.height,
-							(int) (this.maxFontSize * this.tdp.getZoom())));
+			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)) {
@@ -216,30 +197,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -249,30 +219,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -282,30 +241,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -315,30 +263,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 		} else if (position == 1) {
 			if (first == false) {
@@ -372,30 +309,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -405,30 +331,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -438,30 +353,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -471,30 +375,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 		} else if (position == 2) {
 			if (first == false) {
@@ -528,30 +421,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -561,30 +443,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -594,30 +465,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -627,30 +487,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 		} else if (position == 3) {
 			if (first == false) {
@@ -684,30 +533,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -717,30 +555,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -750,30 +577,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -783,30 +599,19 @@ public class ELNComponentVoltageControlledCurrentSource extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 		}
 		g.setColor(c);
@@ -820,40 +625,27 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x, x + 2 * width / 6 };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 3 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 5 * width / 6, x + 3 * width / 6, x + 5 * width / 6,
-				x + 4 * width / 6, x + 4 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + 3 * height / 4,
-				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4,
-				y + height / 4, y + height / 16 };
+		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6, x + 3 * width / 6, x + 4 * width / 6,
+				x + 4 * width / 6, x + width, x + 4 * width / 6, x + 4 * width / 6, x + 5 * width / 6,
+				x + 3 * width / 6, x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height - height / 16, y + height - height / 16, y + height - height / 16, y + 3 * height / 4,
+				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4, y + height / 4, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 12,
-				x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 6,
-				x + 5 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8,
-				y + 3 * height / 4 - height / 8, y + 3 * height / 4,
-				y + 3 * height / 4 - height / 8,
-				y + 3 * height / 4 - height / 8 };
+		int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
+				x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
+				x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
+		int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
+				y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
 	}
@@ -865,39 +657,26 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x, x + 2 * width / 6 };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 3 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 5 * width / 6, x + 3 * width / 6, x + 5 * width / 6,
-				x + 4 * width / 6, x + 4 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + 3 * height / 4,
-				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4,
-				y + height / 4, y + height / 16 };
+		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6, x + 3 * width / 6, x + 4 * width / 6,
+				x + 4 * width / 6, x + width, x + 4 * width / 6, x + 4 * width / 6, x + 5 * width / 6,
+				x + 3 * width / 6, x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height - height / 16, y + height - height / 16, y + height - height / 16, y + 3 * height / 4,
+				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4, y + height / 4, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 12,
-				x + 5 * width / 6 + width / 12 + width / 24,
-				x + 5 * width / 6 + width / 6,
-				x + 5 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8,
-				y + height / 4 + height / 8, y + height / 4,
+		int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
+				x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
+				x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
+		int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
 				y + height / 4 + height / 8, y + height / 4 + height / 8 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
@@ -910,38 +689,26 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + 4 * width / 6, x + width };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6,
-				x + 2 * width / 6, x + 3 * width / 6, x + width / 6,
-				x + 3 * width / 6, x + 2 * width / 6, x + 2 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + 3 * height / 4,
-				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4,
-				y + height / 4, y + height / 16 };
+		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6, x + 2 * width / 6, x + 2 * width / 6, x,
+				x + 2 * width / 6, x + 2 * width / 6, x + 3 * width / 6, x + width / 6, x + 3 * width / 6,
+				x + 2 * width / 6, x + 2 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height - height / 16, y + height - height / 16, y + height - height / 16, y + 3 * height / 4,
+				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4, y + height / 4, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty3 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty4 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 12,
-				x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 6,
+		int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
+				x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
 				x + width / 6 - width / 12 - width / 24 };
-		int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8,
-				y + height / 4 + height / 8, y + height / 4,
+		int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
 				y + height / 4 + height / 8, y + height / 4 + height / 8 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
@@ -954,39 +721,27 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + 4 * width / 6, x + width };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6,
-				x + 2 * width / 6, x + 3 * width / 6, x + width / 6,
-				x + 3 * width / 6, x + 2 * width / 6, x + 2 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + 3 * height / 4,
-				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4,
-				y + height / 4, y + height / 16 };
+		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6, x + 2 * width / 6, x + 2 * width / 6, x,
+				x + 2 * width / 6, x + 2 * width / 6, x + 3 * width / 6, x + width / 6, x + 3 * width / 6,
+				x + 2 * width / 6, x + 2 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height - height / 16, y + height - height / 16, y + height - height / 16, y + 3 * height / 4,
+				y + 2 * height / 4, y + 2 * height / 4, y + 2 * height / 4, y + height / 4, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty3 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty4 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 12,
-				x + width / 6 - width / 12 - width / 24,
-				x + width / 6 - width / 6,
+		int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
+				x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
 				x + width / 6 - width / 12 - width / 24 };
-		int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8,
-				y + 3 * height / 4 - height / 8, y + 3 * height / 4,
-				y + 3 * height / 4 - height / 8,
-				y + 3 * height / 4 - height / 8 };
+		int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
+				y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
 	}
@@ -998,41 +753,27 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y, y + 2 * height / 6 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16,
-				x + 3 * width / 4, x + 2 * width / 4, x + 2 * width / 4,
-				x + 2 * width / 4, x + width / 4, x + width / 16 };
-		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 3 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 5 * height / 6, y + 3 * height / 6, y + 5 * height / 6,
-				y + 4 * height / 6, y + 4 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width - width / 16, x + width - width / 16, x + width - width / 16, x + 3 * width / 4,
+				x + 2 * width / 4, x + 2 * width / 4, x + 2 * width / 4, x + width / 4, x + width / 16 };
+		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6, y + 3 * height / 6, y + 4 * height / 6,
+				y + 4 * height / 6, y + height, y + 4 * height / 6, y + 4 * height / 6, y + 5 * height / 6,
+				y + 3 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width / 4, x + width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8,
-				x + width / 4 + width / 8, x + width / 4,
+		int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
 				x + width / 4 + width / 8, x + width / 4 + width / 8 };
-		int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 12,
-				y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 6,
-				y + 5 * height / 6 + height / 12 + height / 24 };
+		int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
+				y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
+				y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
 	}
@@ -1044,40 +785,26 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y + 4 * height / 6, y + height };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16,
-				x + 3 * width / 4, x + 2 * width / 4, x + 2 * width / 4,
-				x + 2 * width / 4, x + width / 4, x + width / 16 };
-		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6,
-				y + height / 6, y + 2 * height / 6, y + 2 * height / 6, y,
-				y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6,
-				y + height / 6, y + 3 * height / 6, y + 2 * height / 6,
-				y + 2 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width - width / 16, x + width - width / 16, x + width - width / 16, x + 3 * width / 4,
+				x + 2 * width / 4, x + 2 * width / 4, x + 2 * width / 4, x + width / 4, x + width / 16 };
+		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6, y + height / 6, y + 2 * height / 6,
+				y + 2 * height / 6, y, y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6, y + height / 6,
+				y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty3 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width / 4, x + width / 4 };
-		int[] pty4 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8,
-				x + width / 4 + width / 8, x + width / 4,
+		int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
 				x + width / 4 + width / 8, x + width / 4 + width / 8 };
-		int[] pty5 = { y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 12,
-				y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 6,
+		int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
+				y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
 				y + height / 6 - height / 12 - height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
@@ -1090,39 +817,26 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y + 4 * height / 6, y + height };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16,
-				x + 3 * width / 4, x + 2 * width / 4, x + 2 * width / 4,
-				x + 2 * width / 4, x + width / 4, x + width / 16 };
-		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6,
-				y + height / 6, y + 2 * height / 6, y + 2 * height / 6, y,
-				y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6,
-				y + height / 6, y + 3 * height / 6, y + 2 * height / 6,
-				y + 2 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width - width / 16, x + width - width / 16, x + width - width / 16, x + 3 * width / 4,
+				x + 2 * width / 4, x + 2 * width / 4, x + 2 * width / 4, x + width / 4, x + width / 16 };
+		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6, y + height / 6, y + 2 * height / 6,
+				y + 2 * height / 6, y, y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6, y + height / 6,
+				y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty3 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty4 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8,
-				x + 3 * width / 4 - width / 8, x + 3 * width / 4,
+		int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
 				x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
-		int[] pty5 = { y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 12,
-				y + height / 6 - height / 12 - height / 24,
-				y + height / 6 - height / 6,
+		int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
+				y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
 				y + height / 6 - height / 12 - height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
@@ -1135,40 +849,27 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y, y + 2 * height / 6 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16,
-				x + 3 * width / 4, x + 2 * width / 4, x + 2 * width / 4,
-				x + 2 * width / 4, x + width / 4, x + width / 16 };
-		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 3 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 5 * height / 6, y + 3 * height / 6, y + 5 * height / 6,
-				y + 4 * height / 6, y + 4 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width - width / 16, x + width - width / 16, x + width - width / 16, x + 3 * width / 4,
+				x + 2 * width / 4, x + 2 * width / 4, x + 2 * width / 4, x + width / 4, x + width / 16 };
+		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6, y + 3 * height / 6, y + 4 * height / 6,
+				y + 4 * height / 6, y + height, y + 4 * height / 6, y + 4 * height / 6, y + 5 * height / 6,
+				y + 3 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 14);
-		int[] ptx3 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8,
-				x + 3 * width / 4 - width / 8, x + 3 * width / 4,
+		int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
 				x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
-		int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 12,
-				y + 5 * height / 6 + height / 12 + height / 24,
-				y + 5 * height / 6 + height / 6,
-				y + 5 * height / 6 + height / 12 + height / 24 };
+		int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
+				y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
+				y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		g.fillPolygon(ptx5, pty5, 6);
 	}
@@ -1225,8 +926,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		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;
@@ -1246,25 +946,16 @@ public class ELNComponentVoltageControlledCurrentSource extends
 						if (n2.getNodeType() == Node.ELEMENT_NODE) {
 							elt = (Element) n2;
 							if (elt.getTagName().equals("attributes")) {
-								value = Double.parseDouble(elt
-										.getAttribute("value"));
+								value = Double.parseDouble(elt.getAttribute("value"));
 								unit = elt.getAttribute("unit");
-								position = Integer.parseInt(elt
-										.getAttribute("position"));
-								width = Integer.parseInt(elt
-										.getAttribute("width"));
-								height = Integer.parseInt(elt
-										.getAttribute("height"));
-								fv_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fv_0_2"));
-								fv_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fv_1_3"));
-								fh_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fh_0_2"));
-								fh_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fh_1_3"));
-								first = Boolean.parseBoolean(elt
-										.getAttribute("first"));
+								position = Integer.parseInt(elt.getAttribute("position"));
+								width = Integer.parseInt(elt.getAttribute("width"));
+								height = Integer.parseInt(elt.getAttribute("height"));
+								fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+								fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+								fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+								fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+								first = Boolean.parseBoolean(elt.getAttribute("first"));
 								setVal(value);
 								setUnit(unit);
 								setPosition(position);
@@ -1285,8 +976,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 		}
 	}
 
-	public void addActionToPopupMenu(JPopupMenu componentMenu,
-			ActionListener menuAL, int x, int y) {
+	public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
 		componentMenu.addSeparator();
 
 		JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
index 062209cb2d..86acccca36 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
@@ -51,16 +51,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
- * Class ELNComponentVoltageControlledVoltageSource Voltage controlled voltage
- * source to be used in ELN diagrams Creation: 13/06/2018
- * 
+ * Class ELNComponentVoltageControlledVoltageSource 
+ * Voltage controlled voltage source to be used in ELN diagrams 
+ * Creation: 13/06/2018
  * @version 1.0 13/06/2018
  * @author Irina Kit Yan LEE
  */
 
-public class ELNComponentVoltageControlledVoltageSource extends
-		TGCScalableWithInternalComponent implements ActionListener,
-		SwallowTGComponent, ELNComponent {
+public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, ELNComponent {
 	protected Color myColor;
 	protected int orientation;
 	private int maxFontSize = 14;
@@ -74,8 +72,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 	private double val;
 
 	private int position = 0;
-	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false,
-			fh_1_3 = false;
+	private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
 	private int old;
 	private boolean first, f = true;
 
@@ -84,9 +81,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 	private ELNPortTerminal term2;
 	private ELNPortTerminal term3;
 
-	public ELNComponentVoltageControlledVoltageSource(int _x, int _y,
-			int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
-			TGComponent _father, TDiagramPanel _tdp) {
+	public ELNComponentVoltageControlledVoltageSource(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(120, 80);
@@ -115,36 +110,25 @@ public class ELNComponentVoltageControlledVoltageSource extends
 
 	public void internalDrawing(Graphics g) {
 		if (f == true) {
-			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY,
-					this.maxY, false, this.father, this.tdp);
+			term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term0.setValue("ncp");
 			getTDiagramPanel().getComponentList().add(term0);
 			term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
 
-			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term1.setValue("np");
 			getTDiagramPanel().getComponentList().add(term1);
-			term1.getTDiagramPanel().addComponent(term1,
-					x + width - width / 12, y, true, false);
+			term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
 
-			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX,
-					this.maxX, this.minY, this.maxY, false, this.father,
-					this.tdp);
+			term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term2.setValue("ncn");
 			getTDiagramPanel().getComponentList().add(term2);
-			term2.getTDiagramPanel().addComponent(term2, x,
-					y + height - height / 8, true, false);
+			term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
 
-			term3 = new ELNPortTerminal(x + width - width / 12, y + height
-					- height / 8, this.minX, this.maxX, this.minY, this.maxY,
-					false, this.father, this.tdp);
+			term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
 			term3.setValue("nn");
 			getTDiagramPanel().getComponentList().add(term3);
-			term3.getTDiagramPanel().addComponent(term3,
-					x + width - width / 12, y + height - height / 8, true,
-					false);
+			term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
 			old = width;
 			width = height;
 			height = old;
@@ -156,10 +140,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 
 		if (this.rescaled && !this.tdp.isScaled()) {
 			this.rescaled = false;
-			int maxCurrentFontSize = Math.max(
-					0,
-					Math.min(this.height,
-							(int) (this.maxFontSize * this.tdp.getZoom())));
+			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)) {
@@ -214,30 +195,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -247,30 +217,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -280,30 +239,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -313,30 +261,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 		} else if (position == 1) {
 			if (first == false) {
@@ -370,30 +307,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -403,30 +329,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -436,30 +351,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -469,30 +373,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 		} else if (position == 2) {
 			if (first == false) {
@@ -526,30 +419,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term3.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 12, y, true);
 				term1.setMoveCd(x, y + height - height / 8, true);
-				term0.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - height / 8 - sw3, y);
 				g.drawString(term2.getValue(), x + width + height / 8, y);
-				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term0.getValue(), x + width + height / 8, y
-						+ height + sh0);
+				g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
+				g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -559,30 +441,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term2.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 12, y, true);
 				term0.setMoveCd(x, y + height - height / 8, true);
-				term1.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - height / 8 - sw2, y);
 				g.drawString(term3.getValue(), x + width + height / 8, y);
-				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term1.getValue(), x + width + height / 8, y
-						+ height + sh1);
+				g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
+				g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -592,30 +463,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term1.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 12, y, true);
 				term3.setMoveCd(x, y + height - height / 8, true);
-				term2.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - height / 8 - sw1, y);
 				g.drawString(term0.getValue(), x + width + height / 8, y);
-				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term2.getValue(), x + width + height / 8, y
-						+ height + sh2);
+				g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
+				g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -625,30 +485,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term0.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 12, y, true);
 				term2.setMoveCd(x, y + height - height / 8, true);
-				term3.setMoveCd(x + width - width / 12,
-						y + height - height / 8, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - height / 8 - sw0, y);
 				g.drawString(term1.getValue(), x + width + height / 8, y);
-				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term3.getValue(), x + width + height / 8, y
-						+ height + sh3);
+				g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
+				g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
 			}
 		} else if (position == 3) {
 			if (first == false) {
@@ -682,30 +531,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term1.setMoveCd(x, y, true);
 				term3.setMoveCd(x + width - width / 8, y, true);
 				term0.setMoveCd(x, y + height - height / 12, true);
-				term2.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term1.getValue(), x - width / 8 - sw1, y);
 				g.drawString(term3.getValue(), x + width + width / 8, y);
-				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height
-						+ sh0);
-				g.drawString(term2.getValue(), x + width + width / 8, y
-						+ height + sh2);
+				g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
+				g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
 			}
 			if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -715,30 +553,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term0.setMoveCd(x, y, true);
 				term2.setMoveCd(x + width - width / 8, y, true);
 				term1.setMoveCd(x, y + height - height / 12, true);
-				term3.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term0.getValue(), x - width / 8 - sw0, y);
 				g.drawString(term2.getValue(), x + width + width / 8, y);
-				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height
-						+ sh1);
-				g.drawString(term3.getValue(), x + width + width / 8, y
-						+ height + sh3);
+				g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
+				g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -748,30 +575,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term3.setMoveCd(x, y, true);
 				term1.setMoveCd(x + width - width / 8, y, true);
 				term2.setMoveCd(x, y + height - height / 12, true);
-				term0.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term3.getValue(), x - width / 8 - sw3, y);
 				g.drawString(term1.getValue(), x + width + width / 8, y);
-				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height
-						+ sh2);
-				g.drawString(term0.getValue(), x + width + width / 8, y
-						+ height + sh0);
+				g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
+				g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
 			}
 			if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
 					|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -781,30 +597,19 @@ public class ELNComponentVoltageControlledVoltageSource extends
 				term2.setMoveCd(x, y, true);
 				term0.setMoveCd(x + width - width / 8, y, true);
 				term3.setMoveCd(x, y + height - height / 12, true);
-				term1.setMoveCd(x + width - width / 8,
-						y + height - height / 12, true);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setW(0.0);
-				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setW(1.0);
-				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0)))
-						.setH(0.5);
+				term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
+				((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
+				((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
 				g.drawString(term2.getValue(), x - width / 8 - sw2, y);
 				g.drawString(term0.getValue(), x + width + width / 8, y);
-				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height
-						+ sh3);
-				g.drawString(term1.getValue(), x + width + width / 8, y
-						+ height + sh1);
+				g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
+				g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
 			}
 		}
 		g.setColor(c);
@@ -818,38 +623,29 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x, x + 2 * width / 6 };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 3 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + width, x + 4 * width / 6, x + 4 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + height / 16 };
+		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6, x + 3 * width / 6, x + 4 * width / 6,
+				x + 4 * width / 6, x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6, x + width,
+				x + 4 * width / 6, x + 4 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height / 4, y + 2 * height / 4, y + 3 * height / 4, y + height - height / 16,
+				y + height - height / 16, y + height - height / 16, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty5 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx5, pty5, 6);
-		int[] ptx6 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty6 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
@@ -861,40 +657,29 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x, x + 2 * width / 6 };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6,
-				x + 3 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6,
-				x + width, x + 4 * width / 6, x + 4 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + height / 16 };
+		int[] ptx2 = { x + width, x + 4 * width / 6, x + 4 * width / 6, x + 3 * width / 6, x + 4 * width / 6,
+				x + 4 * width / 6, x + 5 * width / 6, x + 4 * width / 6, x + 4 * width / 6, x + width,
+				x + 4 * width / 6, x + 4 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height / 4, y + 2 * height / 4, y + 3 * height / 4, y + height - height / 16,
+				y + height - height / 16, y + height - height / 16, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty5 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx5, pty5, 6);
-		int[] ptx6 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty6 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
@@ -906,40 +691,28 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + 4 * width / 6, x + width };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x + 3 * width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6,
-				x + 2 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + height / 16 };
+		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6, x + 2 * width / 6, x + 2 * width / 6,
+				x + 3 * width / 6, x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6, x + 2 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height / 4, y + 2 * height / 4, y + 3 * height / 4, y + height - height / 16,
+				y + height - height / 16, y + height - height / 16, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + height - height / 4, y + height - height / 4,
-				y + height - height / 4 + height / 16,
-				y + height - height / 4 - height / 16, y + height - height / 4,
-				y + height - height / 4 };
+		int[] pty5 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
+				y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx5, pty5, 6);
-		int[] ptx6 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty6 = { y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
@@ -951,38 +724,28 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + 4 * width / 6, x + width };
 		int[] pty1 = { y + height - height / 16, y + height - height / 16 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x + 3 * width / 6,
-				x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6,
-				x + 2 * width / 6 };
-		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4, y + height / 4,
-				y + 2 * height / 4, y + 3 * height / 4,
-				y + height - height / 16, y + height - height / 16,
-				y + height - height / 16, y + height / 16 };
+		int[] ptx2 = { x, x + 2 * width / 6, x + 2 * width / 6, x + width / 6, x + 2 * width / 6, x + 2 * width / 6,
+				x + 3 * width / 6, x + 2 * width / 6, x + 2 * width / 6, x, x + 2 * width / 6, x + 2 * width / 6 };
+		int[] pty2 = { y + height / 16, y + height / 16, y + height / 4, y + 2 * height / 4, y + 3 * height / 4,
+				y + height / 4, y + 2 * height / 4, y + 3 * height / 4, y + height - height / 16,
+				y + height - height / 16, y + height - height / 16, y + height / 16 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
-				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
+		int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
+				x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
 				x + 2 * width / 6 - width / 24 };
-		int[] pty3 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx3, pty3, 6);
-		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24,
-				x + 2 * width / 6 - width / 24 };
+		int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
 		int[] pty4 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
+		int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
 				x + 4 * width / 6 + width / 12 + width / 24 };
-		int[] pty5 = { y + height / 4, y + height / 4,
-				y + height / 4 - height / 16, y + height / 4 + height / 16,
+		int[] pty5 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
 				y + height / 4, y + height / 4 };
 		g.drawPolygon(ptx5, pty5, 6);
-		int[] ptx6 = { x + 4 * width / 6 + width / 24,
-				x + 4 * width / 6 + width / 12 + width / 24 };
+		int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
 		int[] pty6 = { y + height - height / 4, y + height - height / 4 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
@@ -994,44 +757,30 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y, y + 2 * height / 6 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16, x + width / 16 };
-		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 3 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + height, y + 4 * height / 6, y + 4 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width / 4, x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16, x + width - width / 16,
+				x + width - width / 16, x + width / 16 };
+		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6, y + 3 * height / 6, y + 4 * height / 6,
+				y + 4 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6, y + height,
+				y + 4 * height / 6, y + 4 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width / 4, x + width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty5 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] ptx5 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		int[] ptx6 = { x + width / 4, x + width / 4 };
-		int[] pty6 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
 
@@ -1042,44 +791,30 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y + 4 * height / 6, y + height };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16, x + width / 16 };
-		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6,
-				y + height / 6, y + 2 * height / 6, y + 2 * height / 6,
-				y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y,
-				y + 2 * height / 6, y + 2 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width / 4, x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16, x + width - width / 16,
+				x + width - width / 16, x + width / 16 };
+		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6, y + height / 6, y + 2 * height / 6,
+				y + 2 * height / 6, y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y, y + 2 * height / 6,
+				y + 2 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width / 4, x + width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width - width / 4, x + width - width / 4,
-				x + width - width / 4 + width / 16,
-				x + width - width / 4 - width / 16, x + width - width / 4,
-				x + width - width / 4 };
-		int[] pty5 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] ptx5 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
+				x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+		int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		int[] ptx6 = { x + width / 4, x + width / 4 };
-		int[] pty6 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
 
@@ -1090,42 +825,30 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y + 4 * height / 6, y + height };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16, x + width / 16 };
-		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6,
-				y + height / 6, y + 2 * height / 6, y + 2 * height / 6,
-				y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y,
-				y + 2 * height / 6, y + 2 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width / 4, x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16, x + width - width / 16,
+				x + width - width / 16, x + width / 16 };
+		int[] pty2 = { y, y + 2 * height / 6, y + 2 * height / 6, y + height / 6, y + 2 * height / 6,
+				y + 2 * height / 6, y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y, y + 2 * height / 6,
+				y + 2 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx5 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty5 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty6 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
 
@@ -1136,42 +859,30 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		int[] ptx1 = { x + width - width / 16, x + width - width / 16 };
 		int[] pty1 = { y, y + 2 * height / 6 };
 		g.drawPolygon(ptx1, pty1, 2);
-		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width / 4,
-				x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16,
-				x + width - width / 16, x + width - width / 16, x + width / 16 };
-		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6,
-				y + 3 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6,
-				y + height, y + 4 * height / 6, y + 4 * height / 6 };
+		int[] ptx2 = { x + width / 16, x + width / 16, x + width / 4, x + 2 * width / 4, x + 3 * width / 4,
+				x + width / 4, x + 2 * width / 4, x + 3 * width / 4, x + width - width / 16, x + width - width / 16,
+				x + width - width / 16, x + width / 16 };
+		int[] pty2 = { y + height, y + 4 * height / 6, y + 4 * height / 6, y + 3 * height / 6, y + 4 * height / 6,
+				y + 4 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6, y + height,
+				y + 4 * height / 6, y + 4 * height / 6 };
 		g.drawPolygon(ptx2, pty2, 12);
-		int[] ptx3 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
-				y + 2 * height / 6 - height / 12,
+		int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
+				y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
 				y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx3, pty3, 6);
 		int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24,
-				y + 2 * height / 6 - height / 24 };
+		int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
 		g.drawPolygon(ptx4, pty4, 2);
-		int[] ptx5 = { x + width / 4, x + width / 4,
-				x + width / 4 - width / 16, x + width / 4 + width / 16,
+		int[] ptx5 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
 				x + width / 4, x + width / 4 };
-		int[] pty5 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
-				y + 4 * height / 6 + height / 12,
+		int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
+				y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
 				y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx5, pty5, 6);
 		int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
-		int[] pty6 = { y + 4 * height / 6 + height / 24,
-				y + 4 * height / 6 + height / 12 + height / 24 };
+		int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
 		g.drawPolygon(ptx6, pty6, 2);
 	}
 
@@ -1209,8 +920,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		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;
@@ -1229,24 +939,15 @@ public class ELNComponentVoltageControlledVoltageSource extends
 						if (n2.getNodeType() == Node.ELEMENT_NODE) {
 							elt = (Element) n2;
 							if (elt.getTagName().equals("attributes")) {
-								value = Double.parseDouble(elt
-										.getAttribute("value"));
-								position = Integer.parseInt(elt
-										.getAttribute("position"));
-								width = Integer.parseInt(elt
-										.getAttribute("width"));
-								height = Integer.parseInt(elt
-										.getAttribute("height"));
-								fv_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fv_0_2"));
-								fv_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fv_1_3"));
-								fh_0_2 = Boolean.parseBoolean(elt
-										.getAttribute("fh_0_2"));
-								fh_1_3 = Boolean.parseBoolean(elt
-										.getAttribute("fh_1_3"));
-								first = Boolean.parseBoolean(elt
-										.getAttribute("first"));
+								value = Double.parseDouble(elt.getAttribute("value"));
+								position = Integer.parseInt(elt.getAttribute("position"));
+								width = Integer.parseInt(elt.getAttribute("width"));
+								height = Integer.parseInt(elt.getAttribute("height"));
+								fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+								fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+								fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+								fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+								first = Boolean.parseBoolean(elt.getAttribute("first"));
 								setVal(value);
 								setPosition(position);
 								this.width = width;
@@ -1266,8 +967,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 		}
 	}
 
-	public void addActionToPopupMenu(JPopupMenu componentMenu,
-			ActionListener menuAL, int x, int y) {
+	public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
 		componentMenu.addSeparator();
 
 		JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
-- 
GitLab