From fd98c634814afd887dc040fc3776902c295e3828 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Thu, 9 Aug 2018 11:57:47 +0200
Subject: [PATCH] rename ELNComponent to ELNPrimitiveComponent (eln)
---
src/main/java/ui/eln/ELNComponent.java | 5 -----
src/main/java/ui/eln/ELNConnector.java | 12 ++++++------
src/main/java/ui/eln/ELNPrimitiveComponent.java | 5 +++++
.../java/ui/eln/sca_eln/ELNComponentCapacitor.java | 2 +-
.../ui/eln/sca_eln/ELNComponentIdealTransformer.java | 2 +-
.../ELNComponentIndependentCurrentSource.java | 2 +-
.../ELNComponentIndependentVoltageSource.java | 2 +-
.../java/ui/eln/sca_eln/ELNComponentInductor.java | 2 +-
.../java/ui/eln/sca_eln/ELNComponentResistor.java | 2 +-
.../ui/eln/sca_eln/ELNComponentTransmissionLine.java | 2 +-
.../ELNComponentVoltageControlledCurrentSource.java | 2 +-
.../ELNComponentVoltageControlledVoltageSource.java | 2 +-
.../sca_eln_sca_de/ELNComponentCurrentSinkDE.java | 2 +-
.../sca_eln_sca_de/ELNComponentCurrentSourceDE.java | 2 +-
.../sca_eln_sca_de/ELNComponentVoltageSinkDE.java | 2 +-
.../sca_eln_sca_de/ELNComponentVoltageSourceDE.java | 2 +-
.../sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java | 2 +-
.../ELNComponentCurrentSourceTDF.java | 2 +-
.../sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java | 2 +-
.../ELNComponentVoltageSourceTDF.java | 2 +-
20 files changed, 28 insertions(+), 28 deletions(-)
delete mode 100644 src/main/java/ui/eln/ELNComponent.java
create mode 100644 src/main/java/ui/eln/ELNPrimitiveComponent.java
diff --git a/src/main/java/ui/eln/ELNComponent.java b/src/main/java/ui/eln/ELNComponent.java
deleted file mode 100644
index 5c3b72da30..0000000000
--- 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 19c16fb2e7..43b094576a 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 0000000000..712d2657db
--- /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 9429e0f1b8..b11e4023b6 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 2934a908c2..dedda5b0a3 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 76c95f747b..049ab73c30 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 f211f3ee04..35762a5d75 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 ad95dcbd85..02f649d07c 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 6ea92b14d8..354af03fbd 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 a079fe145e..1c55f9a32d 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 5e2f3fb05b..8a7efa12f2 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 44ed9134a8..8b9300eac5 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 9f0b6527c1..535a0e058d 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 37a9d4942a..642d872438 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 e150a55f2b..787b7dc577 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 99b6c4bf82..0dd413c189 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 ce3b883ba5..1b16fa043f 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 f7e085fdbb..0d04469607 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 034cc6ebca..2f9506fe6f 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 db01fdd177..543592b806 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;
--
GitLab