From 60a45b6b4a154cc13886dcada09d8d3da34ec527 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Fri, 3 Aug 2018 12:33:53 +0200
Subject: [PATCH] update file's name (eln)
---
src/main/java/ui/ELNPanelTranslator.java | 4 ++--
src/main/java/ui/TGComponentManager.java | 4 ++--
src/main/java/ui/eln/ELNModule.java | 14 +++++++-------
...leTerminalInout.java => ELNModuleTerminal.java} | 4 ++--
.../java/ui/window/JDialogELNModuleTerminal.java | 6 +++---
5 files changed, 16 insertions(+), 16 deletions(-)
rename src/main/java/ui/eln/{ELNModuleTerminalInout.java => ELNModuleTerminal.java} (97%)
diff --git a/src/main/java/ui/ELNPanelTranslator.java b/src/main/java/ui/ELNPanelTranslator.java
index 0a6b55a8cd..afac8d77e2 100644
--- a/src/main/java/ui/ELNPanelTranslator.java
+++ b/src/main/java/ui/ELNPanelTranslator.java
@@ -509,9 +509,9 @@ public class ELNPanelTranslator {
elnModule.addTDF_vsource(elnTDF_vsource);
elnComponents.add(elnTDF_vsource);
}
- List<ELNModuleTerminalInout> moduleTerminals = module.getAllModuleTerminal();
+ List<ELNModuleTerminal> moduleTerminals = module.getAllModuleTerminal();
for (int j = 0; j < moduleTerminals.size(); j++) {
- ELNModuleTerminalInout moduleTerminal = moduleTerminals.get(j);
+ ELNModuleTerminal moduleTerminal = moduleTerminals.get(j);
String name = moduleTerminal.getValue();
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index 14342d20b4..cb8125de6e 100644
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -1337,7 +1337,7 @@ public class TGComponentManager {
tgc = new ELNModule(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
case ELN_MODULE_TERMINAL:
- tgc = new ELNModuleTerminalInout(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ tgc = new ELNModuleTerminal(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
case ELN_TDF_VOLTAGE_SOURCE:
tgc = new ELNComponentVoltageSourceTDF(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
@@ -1793,7 +1793,7 @@ public class TGComponentManager {
return ELN_TDF_CURRENT_SINK;
} else if (tgc instanceof ELNModule) {
return ELN_MODULE;
- } else if (tgc instanceof ELNModuleTerminalInout) {
+ } else if (tgc instanceof ELNModuleTerminal) {
return ELN_MODULE_TERMINAL;
} else if (tgc instanceof ELNComponentVoltageSourceTDF) {
return ELN_TDF_VOLTAGE_SOURCE;
diff --git a/src/main/java/ui/eln/ELNModule.java b/src/main/java/ui/eln/ELNModule.java
index 31d23f5211..bc592b2333 100644
--- a/src/main/java/ui/eln/ELNModule.java
+++ b/src/main/java/ui/eln/ELNModule.java
@@ -247,7 +247,7 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
if (tgc instanceof ELNComponentNodeRef) {
return true;
}
- if (tgc instanceof ELNModuleTerminalInout) {
+ if (tgc instanceof ELNModuleTerminal) {
return true;
}
if (tgc instanceof SysCAMSPortDE) {
@@ -358,7 +358,7 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
addInternalComponent(tgc, 0);
return true;
}
- if (tgc instanceof ELNModuleTerminalInout) {
+ if (tgc instanceof ELNModuleTerminal) {
tgc.setFather(this);
tgc.setDrawingZone(true);
tgc.resizeWithFather();
@@ -431,7 +431,7 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
if (tgcomponent[i] instanceof ELNComponentNodeRef) {
tgcomponent[i].resizeWithFather();
}
- if (tgcomponent[i] instanceof ELNModuleTerminalInout) {
+ if (tgcomponent[i] instanceof ELNModuleTerminal) {
tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof SysCAMSPortDE) {
@@ -610,11 +610,11 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
return list;
}
- public java.util.List<ELNModuleTerminalInout> getAllModuleTerminal() {
- java.util.List<ELNModuleTerminalInout> list = new ArrayList<ELNModuleTerminalInout>();
+ public java.util.List<ELNModuleTerminal> getAllModuleTerminal() {
+ java.util.List<ELNModuleTerminal> list = new ArrayList<ELNModuleTerminal>();
for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNModuleTerminalInout) {
- list.add((ELNModuleTerminalInout)(tgcomponent[i]));
+ if (tgcomponent[i] instanceof ELNModuleTerminal) {
+ list.add((ELNModuleTerminal)(tgcomponent[i]));
}
}
return list;
diff --git a/src/main/java/ui/eln/ELNModuleTerminalInout.java b/src/main/java/ui/eln/ELNModuleTerminal.java
similarity index 97%
rename from src/main/java/ui/eln/ELNModuleTerminalInout.java
rename to src/main/java/ui/eln/ELNModuleTerminal.java
index 6dca904253..ad23bb2497 100644
--- a/src/main/java/ui/eln/ELNModuleTerminalInout.java
+++ b/src/main/java/ui/eln/ELNModuleTerminal.java
@@ -55,7 +55,7 @@ import java.awt.*;
* @author Irina Kit Yan LEE
*/
-public class ELNModuleTerminalInout extends TGCScalableWithInternalComponent implements SwallowedTGComponent, LinkedReference {
+public class ELNModuleTerminal extends TGCScalableWithInternalComponent implements SwallowedTGComponent, LinkedReference {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -68,7 +68,7 @@ public class ELNModuleTerminalInout extends TGCScalableWithInternalComponent imp
private double dtextX = 0.0;
protected int decPoint = 3;
- public ELNModuleTerminalInout(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public ELNModuleTerminal(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(10, 10);
diff --git a/src/main/java/ui/window/JDialogELNModuleTerminal.java b/src/main/java/ui/window/JDialogELNModuleTerminal.java
index 2f0391252c..d25cd2971f 100644
--- a/src/main/java/ui/window/JDialogELNModuleTerminal.java
+++ b/src/main/java/ui/window/JDialogELNModuleTerminal.java
@@ -38,7 +38,7 @@
package ui.window;
-import ui.eln.ELNModuleTerminalInout;
+import ui.eln.ELNModuleTerminal;
import ui.util.*;
import java.awt.*;
import java.awt.event.*;
@@ -58,9 +58,9 @@ public class JDialogELNModuleTerminal extends JDialog implements ActionListener
private JTextField nameTextField;
- private ELNModuleTerminalInout term;
+ private ELNModuleTerminal term;
- public JDialogELNModuleTerminal(ELNModuleTerminalInout term) {
+ public JDialogELNModuleTerminal(ELNModuleTerminal term) {
this.setTitle("Setting Module Terminal Attributes");
this.setLocationRelativeTo(null);
this.setVisible(true);
--
GitLab