diff --git a/src/main/java/ui/eln/ELNComponent.java b/src/main/java/ui/eln/ELNComponent.java
deleted file mode 100644
index 5c3b72da30ae3f14312a1c576d12940e399fb259..0000000000000000000000000000000000000000
--- a/src/main/java/ui/eln/ELNComponent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package ui.eln;
-
-public interface ELNComponent {
-
-}
diff --git a/src/main/java/ui/eln/ELNConnector.java b/src/main/java/ui/eln/ELNConnector.java
index 19c16fb2e731c9b7cc0d54fb771b76edc21a83a0..43b094576aa73b29da2ae330404fffa4a3bde374 100644
--- a/src/main/java/ui/eln/ELNConnector.java
+++ b/src/main/java/ui/eln/ELNConnector.java
@@ -95,11 +95,11 @@ public class ELNConnector extends TGConnector implements ScalableTGComponent {
ELNConnectingPoint pt1 = (ELNConnectingPoint) p1;
ELNConnectingPoint pt2 = (ELNConnectingPoint) p2;
- if ((pt1.getFather() instanceof ELNComponent && pt2.getFather() instanceof ELNComponent) || (pt2.getFather() instanceof ELNComponent && pt1.getFather() instanceof ELNComponent)) {
+ if ((pt1.getFather() instanceof ELNPrimitiveComponent && pt2.getFather() instanceof ELNPrimitiveComponent) || (pt2.getFather() instanceof ELNPrimitiveComponent && pt1.getFather() instanceof ELNPrimitiveComponent)) {
g.drawLine(x1, y1, x2, y2);
editable = true;
g.drawString(value, (x1 + x2 - w) / 2, (y1 + y2) / 2);
- } else if (pt1.getFather() instanceof ELNComponent && pt2.getFather() instanceof ELNMidPortTerminal) {
+ } else if (pt1.getFather() instanceof ELNPrimitiveComponent && pt2.getFather() instanceof ELNMidPortTerminal) {
ELNConnector connector = (ELNConnector) ((ELNMidPortTerminal) pt2.getFather()).getFather();
g.drawLine(x1, y1, x2, y2);
if (connector.getValue().equals("")) {
@@ -107,7 +107,7 @@ public class ELNConnector extends TGConnector implements ScalableTGComponent {
} else {
value = connector.getValue();
}
- } else if (pt2.getFather() instanceof ELNComponent && pt1.getFather() instanceof ELNMidPortTerminal) {
+ } else if (pt2.getFather() instanceof ELNPrimitiveComponent && pt1.getFather() instanceof ELNMidPortTerminal) {
g.drawLine(x1, y1, x2, y2);
ELNConnector connector = (ELNConnector) ((ELNMidPortTerminal) pt1.getFather()).getFather();
if (connector.getValue().equals("")) {
@@ -232,8 +232,8 @@ public class ELNConnector extends TGConnector implements ScalableTGComponent {
}
private String searchName(ELNConnector c) {
- if (c.p1.getFather() instanceof ELNComponent) {
- if (c.p2.getFather() instanceof ELNComponent) {
+ if (c.p1.getFather() instanceof ELNPrimitiveComponent) {
+ if (c.p2.getFather() instanceof ELNPrimitiveComponent) {
return c.getValue();
}
if (c.p2.getFather() instanceof ELNNodeRef || c.p2.getFather() instanceof ELNModuleTerminal) {
@@ -255,7 +255,7 @@ public class ELNConnector extends TGConnector implements ScalableTGComponent {
if (c.p2.getFather() instanceof ELNNodeRef || c.p2.getFather() instanceof ELNModuleTerminal) {
return "";
}
- if (c.p2.getFather() instanceof ELNComponent) {
+ if (c.p2.getFather() instanceof ELNPrimitiveComponent) {
ELNConnector connector = (ELNConnector) ((ELNMidPortTerminal) c.p1.getFather()).getFather();
if (!connector.getValue().equals("")) {
return connector.getValue();
diff --git a/src/main/java/ui/eln/ELNPrimitiveComponent.java b/src/main/java/ui/eln/ELNPrimitiveComponent.java
new file mode 100644
index 0000000000000000000000000000000000000000..712d2657dbb68837ebebcede0bb29f504ee0dd6b
--- /dev/null
+++ b/src/main/java/ui/eln/ELNPrimitiveComponent.java
@@ -0,0 +1,5 @@
+package ui.eln;
+
+public interface ELNPrimitiveComponent {
+
+}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
index 9429e0f1b8dfc0fba2cad937282ee5721747e52b..b11e4023b6f6083497d1e1cb8b51d809d8734514 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCapacitor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCapacitor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
index 2934a908c2b62b84af273784f150068a4ba235ec..dedda5b0a3767f0f9e2b41a937cf17ad74909b84 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIdealTransformer extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIdealTransformer extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
index 76c95f747b8a0026c526c47055f6fa46c67aa5ad..049ab73c308441c1a1b7cca5dc5d2ddba4a99b75 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIndependentCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIndependentCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
index f211f3ee04619e3be7afa1938f6109cd251ed02e..35762a5d75425a101b300aa5635ade0e6f2308f5 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
index ad95dcbd85f4f717343ecd2d04c79e0afffee07d..02f649d07c2a9f7d225dcf0cb0e590bcf6571ab4 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
@@ -59,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentInductor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentInductor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
index 6ea92b14d86cc27a1ef78256c89c116b1be471bc..354af03fbd89e95f31a6acf1b0cd81607aadcb32 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentResistor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentResistor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
index a079fe145eb5b1529c612e80bd4172d8c8ad8305..1c55f9a32d81867586666dd585819674501f9586 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentTransmissionLine extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentTransmissionLine extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
index 5e2f3fb05b82fc451d3b090f64151e473c53da55..8a7efa12f25e820d7169c17b3fc9d90320162b22 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
@@ -60,7 +60,7 @@ import java.awt.geom.RoundRectangle2D;
*/
public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithInternalComponent
- implements ActionListener, SwallowedTGComponent, ELNComponent {
+ implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
index 44ed9134a83391217d2be59e4762be3882d820d2..8b9300eac5afb71354f5f73d0cae021018dd8563 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSinkDE.java b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSinkDE.java
index 9f0b6527c18612e0a17ff9c688f3582d32919fd2..535a0e058d77f2003c35a7c00f76b7994d9e798a 100644
--- a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSinkDE.java
+++ b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSinkDE.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCurrentSinkDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCurrentSinkDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSourceDE.java b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSourceDE.java
index 37a9d4942aeb70725687536ee904c33626817a2f..642d8724382d180b8f465a94cac378ade084d586 100644
--- a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSourceDE.java
+++ b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentCurrentSourceDE.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCurrentSourceDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCurrentSourceDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSinkDE.java b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSinkDE.java
index e150a55f2b9e7f92827ad6937838cc265e43afd5..787b7dc577782e75cbf0cb535ff90093a04adbd5 100644
--- a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSinkDE.java
+++ b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSinkDE.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageSinkDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageSinkDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSourceDE.java b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSourceDE.java
index 99b6c4bf82de805080c609654365742a0450b714..0dd413c1899956ce652c4f2b526d9ff988c0a159 100644
--- a/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSourceDE.java
+++ b/src/main/java/ui/eln/sca_eln_sca_de/ELNComponentVoltageSourceDE.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageSourceDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageSourceDE extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
index ce3b883ba5b86ad38a256ab4ccc553c06f7239fb..1b16fa043f508be1936c2d4b3a2c04c35af8d9fa 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
@@ -59,7 +59,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java
index f7e085fdbb11defd6e7d7480da0c1dc2ba95b069..0d04469607c86a79b2afcdbdb042ac6ab78dadc4 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java
@@ -60,7 +60,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCurrentSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCurrentSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
index 034cc6ebcad99410e01f6b877e82b9a24f605069..2f9506fe6fa9b22d26253bc44ec26cf3f2bfca98 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
@@ -60,7 +60,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java
index db01fdd1777ce67aa71b4141e41d3b43b659b4fd..543592b8066ad5d13ab3fc11ee9393638d2faf81 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java
@@ -60,7 +60,7 @@ import java.awt.geom.RoundRectangle2D;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNPrimitiveComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;