diff --git a/src/main/java/elntranslator/ELNSpecification.java b/src/main/java/elntranslator/ELNSpecification.java index 759fffcb25c55e5c3db8d06bcf7dabf1d6976591..bea04473f2b5905b218d43b55912374e90b2a967 100644 --- a/src/main/java/elntranslator/ELNSpecification.java +++ b/src/main/java/elntranslator/ELNSpecification.java @@ -227,11 +227,11 @@ public class ELNSpecification{ return inductors; } - public LinkedList<ELNTComponentNodeRef> getAllComponentNodeRef(){ - LinkedList<ELNTComponentNodeRef> nodeRefs = new LinkedList<ELNTComponentNodeRef>(); + public LinkedList<ELNTNodeRef> getAllComponentNodeRef(){ + LinkedList<ELNTNodeRef> nodeRefs = new LinkedList<ELNTNodeRef>(); for (ELNTComponent nodeRef : elnComponents) { - if (nodeRef instanceof ELNTComponentNodeRef) { - nodeRefs.add((ELNTComponentNodeRef) nodeRef); + if (nodeRef instanceof ELNTNodeRef) { + nodeRefs.add((ELNTNodeRef) nodeRef); } } return nodeRefs; diff --git a/src/main/java/elntranslator/ELNTModule.java b/src/main/java/elntranslator/ELNTModule.java index 887ef9450b7f7340539fb2fe6358ade0d1eac949..e0c3e970fd61348758d71cd83e45f37ba08812a6 100644 --- a/src/main/java/elntranslator/ELNTModule.java +++ b/src/main/java/elntranslator/ELNTModule.java @@ -56,7 +56,7 @@ public class ELNTModule extends ELNTComponent { private LinkedList<ELNTComponentIndependentCurrentSource> isource; private LinkedList<ELNTComponentIndependentVoltageSource> vsource; private LinkedList<ELNTComponentInductor> inductor; - private LinkedList<ELNTComponentNodeRef> nodeRef; + private LinkedList<ELNTNodeRef> nodeRef; private LinkedList<ELNTComponentResistor> resistor; private LinkedList<ELNTComponentTransmissionLine> transmissionLine; private LinkedList<ELNTComponentVoltageControlledCurrentSource> vccs; @@ -82,7 +82,7 @@ public class ELNTModule extends ELNTComponent { isource = new LinkedList<ELNTComponentIndependentCurrentSource>(); vsource = new LinkedList<ELNTComponentIndependentVoltageSource>(); inductor = new LinkedList<ELNTComponentInductor>(); - nodeRef = new LinkedList<ELNTComponentNodeRef>(); + nodeRef = new LinkedList<ELNTNodeRef>(); resistor = new LinkedList<ELNTComponentResistor>(); transmissionLine = new LinkedList<ELNTComponentTransmissionLine>(); vccs = new LinkedList<ELNTComponentVoltageControlledCurrentSource>(); @@ -145,11 +145,11 @@ public class ELNTModule extends ELNTComponent { inductor.add(_inductor); } - public LinkedList<ELNTComponentNodeRef> getNodeRef() { + public LinkedList<ELNTNodeRef> getNodeRef() { return nodeRef; } - public void addNodeRef(ELNTComponentNodeRef _nodeRef){ + public void addNodeRef(ELNTNodeRef _nodeRef){ nodeRef.add(_nodeRef); } diff --git a/src/main/java/elntranslator/ELNTComponentNodeRef.java b/src/main/java/elntranslator/ELNTNodeRef.java similarity index 93% rename from src/main/java/elntranslator/ELNTComponentNodeRef.java rename to src/main/java/elntranslator/ELNTNodeRef.java index 548bc524714a759f7ae1d1fc22f3d35c0e779787..dc6a76fed21a2599ece7870c6470348cedbefc0f 100644 --- a/src/main/java/elntranslator/ELNTComponentNodeRef.java +++ b/src/main/java/elntranslator/ELNTNodeRef.java @@ -39,19 +39,19 @@ package elntranslator; /** - * Class ELNTComponentNodeRef + * Class ELNTNodeRef * Parameters of a ELN primitive component : node ref * Creation: 23/07/2018 * @version 1.0 23/07/2018 * @author Irina Kit Yan LEE */ -public class ELNTComponentNodeRef extends ELNTComponent { +public class ELNTNodeRef extends ELNTComponent { private String name; private ELNTModule module; - public ELNTComponentNodeRef(String _name, ELNTModule _module) { + public ELNTNodeRef(String _name, ELNTModule _module) { name = _name; module = _module; } diff --git a/src/main/java/elntranslator/toELN/ModuleCode.java b/src/main/java/elntranslator/toELN/ModuleCode.java index d0bd61ab7eb4919edfd656cd90b447c94a2ffe61..3ec34d1334655138bd1aa2030130f6e494834ed3 100644 --- a/src/main/java/elntranslator/toELN/ModuleCode.java +++ b/src/main/java/elntranslator/toELN/ModuleCode.java @@ -498,7 +498,7 @@ public class ModuleCode { } } - LinkedList<ELNTComponentNodeRef> nodeRefs = module.getNodeRef(); + LinkedList<ELNTNodeRef> nodeRefs = module.getNodeRef(); if (nodeRefs.size() >= 1) { if (cpt == 0) { corpsModule = corpsModule + "\t: " + nodeRefs.get(0).getName() + "(\"" + nodeRefs.get(0).getName() @@ -551,7 +551,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -604,7 +604,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -666,7 +666,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -719,7 +719,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -781,7 +781,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -834,7 +834,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -896,7 +896,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -949,7 +949,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1011,7 +1011,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1064,7 +1064,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1126,7 +1126,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1179,7 +1179,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1241,7 +1241,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1294,7 +1294,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1356,7 +1356,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1409,7 +1409,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1471,7 +1471,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1524,7 +1524,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1586,7 +1586,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1639,7 +1639,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1701,7 +1701,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1754,7 +1754,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1816,7 +1816,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1869,7 +1869,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1931,7 +1931,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -1984,7 +1984,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -2046,7 +2046,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -2099,7 +2099,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -2161,7 +2161,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -2214,7 +2214,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -2276,7 +2276,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -2329,7 +2329,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -2391,7 +2391,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; } @@ -2444,7 +2444,7 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTNodeRef) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -2525,7 +2525,7 @@ public class ModuleCode { if (connector.get_p2().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p2().getComponent().getName(); } - if (connector.get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connector.get_p2().getComponent() instanceof ELNTNodeRef) { return connector.get_p2().getComponent().getName(); } if (connector.get_p2().getComponent() instanceof ELNTMidPortTerminal) { @@ -2542,7 +2542,7 @@ public class ModuleCode { if (connector.get_p1().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p1().getComponent().getName(); } - if (connector.get_p1().getComponent() instanceof ELNTComponentNodeRef) { + if (connector.get_p1().getComponent() instanceof ELNTNodeRef) { return connector.get_p1().getComponent().getName(); } if (connector.get_p1().getComponent() instanceof ELNTMidPortTerminal) { @@ -2555,7 +2555,7 @@ public class ModuleCode { if (connector.get_p2().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p2().getComponent().getName(); } - if (connector.get_p2().getComponent() instanceof ELNTComponentNodeRef) { + if (connector.get_p2().getComponent() instanceof ELNTNodeRef) { return connector.get_p2().getComponent().getName(); } if (connector.get_p2().getComponent() instanceof ELNTPrimitiveComponent) { diff --git a/src/main/java/ui/ELNPanelTranslator.java b/src/main/java/ui/ELNPanelTranslator.java index a141b31208cd511fe006548d128cce3123f432f1..b6bd1ff9f9f5e37effc4cdd040303cb09f379b44 100644 --- a/src/main/java/ui/ELNPanelTranslator.java +++ b/src/main/java/ui/ELNPanelTranslator.java @@ -395,7 +395,7 @@ public class ELNPanelTranslator { String name = nodeRef.getValue(); - ELNTComponentNodeRef elnNodeRef = new ELNTComponentNodeRef(name, elnModule); + ELNTNodeRef elnNodeRef = new ELNTNodeRef(name, elnModule); elnMap.put(nodeRef, elnNodeRef); elnModule.addNodeRef(elnNodeRef);