diff --git a/src/main/java/elntranslator/ELNTComponentCapacitor.java b/src/main/java/elntranslator/ELNTComponentCapacitor.java index 975d6051d1e9ff61c3429368e6d89b8302f8e23e..27932ae8bf848c20a0f416d8923365cf8b9a5167 100644 --- a/src/main/java/elntranslator/ELNTComponentCapacitor.java +++ b/src/main/java/elntranslator/ELNTComponentCapacitor.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentCapacitor extends ELNTComponent { +public class ELNTComponentCapacitor extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double val, q0; private String unit0, unit1; diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSinkDE.java b/src/main/java/elntranslator/ELNTComponentCurrentSinkDE.java index 18737b7b014f03c7df200ed84d133dae064d79f4..a76230fcdf34b1c9fa7d2be77104937d02276eec 100644 --- a/src/main/java/elntranslator/ELNTComponentCurrentSinkDE.java +++ b/src/main/java/elntranslator/ELNTComponentCurrentSinkDE.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentCurrentSinkDE extends ELNTComponent { +public class ELNTComponentCurrentSinkDE extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java b/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java index e747dff39b3052686af1f73d6c803a59bdcde1a5..f12685a13252fb5d19b37dc61f7d9cb8bb423678 100644 --- a/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java +++ b/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentCurrentSinkTDF extends ELNTComponent { +public class ELNTComponentCurrentSinkTDF extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSourceDE.java b/src/main/java/elntranslator/ELNTComponentCurrentSourceDE.java index a9862a4a973c7bf25a42be6794c6705f43b2e17e..b549553d76b7f9538e6319dec99efd54d4dac1f6 100644 --- a/src/main/java/elntranslator/ELNTComponentCurrentSourceDE.java +++ b/src/main/java/elntranslator/ELNTComponentCurrentSourceDE.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentCurrentSourceDE extends ELNTComponent { +public class ELNTComponentCurrentSourceDE extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java b/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java index bb66ec85238e6549210c7b84a0e7d472bc531105..0eb6fb5b3592cf8e36789e235f1189e15424d8d1 100644 --- a/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java +++ b/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentCurrentSourceTDF extends ELNTComponent { +public class ELNTComponentCurrentSourceTDF extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentIdealTransformer.java b/src/main/java/elntranslator/ELNTComponentIdealTransformer.java index 0b95c6c3b57a17aa23ae5b90cc7e4a951545e695..e2485fedc3e4d57d331fdfab72cdc1f5f8ed894d 100644 --- a/src/main/java/elntranslator/ELNTComponentIdealTransformer.java +++ b/src/main/java/elntranslator/ELNTComponentIdealTransformer.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentIdealTransformer extends ELNTComponent { +public class ELNTComponentIdealTransformer extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double ratio; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java b/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java index a02f1fd5e07a2dea9616e95957eb75fb89f9c67b..a5697164fe4e990737da04cfcb138f6ee2f56155 100644 --- a/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java +++ b/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentIndependentCurrentSource extends ELNTComponent { +public class ELNTComponentIndependentCurrentSource extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude; private String delay; diff --git a/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java b/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java index 6e98bab7748272f3e731d8736c0e1550d5b87960..4fe9495c7ad3606a91783ed954965e1aecccf03f 100644 --- a/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java +++ b/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentIndependentVoltageSource extends ELNTComponent { +public class ELNTComponentIndependentVoltageSource extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude; private String delay; diff --git a/src/main/java/elntranslator/ELNTComponentInductor.java b/src/main/java/elntranslator/ELNTComponentInductor.java index 57c53c527e4695aa18ca9287579874a24bc3a13b..806cb21c4c680b6c5ec10e8fde3304d31e82d126 100644 --- a/src/main/java/elntranslator/ELNTComponentInductor.java +++ b/src/main/java/elntranslator/ELNTComponentInductor.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentInductor extends ELNTComponent { +public class ELNTComponentInductor extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double val, phi0; private String unit0, unit1; diff --git a/src/main/java/elntranslator/ELNTComponentResistor.java b/src/main/java/elntranslator/ELNTComponentResistor.java index fb604ef3f819075c3953d98446376506dfbd0b18..ab88e0b6f603f8350516a9751d4b722040e78071 100644 --- a/src/main/java/elntranslator/ELNTComponentResistor.java +++ b/src/main/java/elntranslator/ELNTComponentResistor.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentResistor extends ELNTComponent { +public class ELNTComponentResistor extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double val; private String unit; diff --git a/src/main/java/elntranslator/ELNTComponentTransmissionLine.java b/src/main/java/elntranslator/ELNTComponentTransmissionLine.java index 2649cc6b886c4475c2ee3a90994ae7975daff7e9..140788fdfcdd201ebc9886acecb3d48dbbdbfa77 100644 --- a/src/main/java/elntranslator/ELNTComponentTransmissionLine.java +++ b/src/main/java/elntranslator/ELNTComponentTransmissionLine.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentTransmissionLine extends ELNTComponent { +public class ELNTComponentTransmissionLine extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double z0, delta0; private String delay; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java b/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java index e3c1e1a00f77d9242b520bc19add324be01ca917..52015c1427cced2e81c09109ec579b2f1875f724 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageControlledCurrentSource extends ELNTComponent { +public class ELNTComponentVoltageControlledCurrentSource extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double val; private String unit; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java b/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java index a1c98ca1860413539946f0889a06f656fcfcf601..f6a2d9bc373b4c1748cf1be01321062fbf81194b 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageControlledVoltageSource extends ELNTComponent { +public class ELNTComponentVoltageControlledVoltageSource extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double val; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSinkDE.java b/src/main/java/elntranslator/ELNTComponentVoltageSinkDE.java index a7d7a013b332ce2807e98d76dacede5763c52ba4..cc238400bb0867c088161611ffb0249bc7abe7be 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageSinkDE.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageSinkDE.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageSinkDE extends ELNTComponent { +public class ELNTComponentVoltageSinkDE extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java b/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java index 5af3bb9dc449fcca3ed16c3abadf75d8e453060d..5f2b4c023744068c2b012c601501bc3fa0aefa81 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageSinkTDF extends ELNTComponent { +public class ELNTComponentVoltageSinkTDF extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSourceDE.java b/src/main/java/elntranslator/ELNTComponentVoltageSourceDE.java index 85a43917ae26851a6c50205c5b80b17bb03b98c7..f36c1465755b1b7dc5279c92a1bd4489485c6ba9 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageSourceDE.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageSourceDE.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageSourceDE extends ELNTComponent { +public class ELNTComponentVoltageSourceDE extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java b/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java index 4f81aa9c57771e57db53b7813f7f4f32c4c33a14..4bc0e3781d15d66517b0f946e90ac482dba6d631 100644 --- a/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java +++ b/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java @@ -48,7 +48,7 @@ import java.util.LinkedList; * @author Irina Kit Yan LEE */ -public class ELNTComponentVoltageSourceTDF extends ELNTComponent { +public class ELNTComponentVoltageSourceTDF extends ELNTComponent implements ELNTPrimitiveComponent { private String name; private double scale; private LinkedList<ELNTConnectingPoint> cp; diff --git a/src/main/java/elntranslator/ELNTPrimitiveComponent.java b/src/main/java/elntranslator/ELNTPrimitiveComponent.java new file mode 100644 index 0000000000000000000000000000000000000000..c32a57d4613df82626d38d1f8e32cee0dbee0aa8 --- /dev/null +++ b/src/main/java/elntranslator/ELNTPrimitiveComponent.java @@ -0,0 +1,5 @@ +package elntranslator; + +public interface ELNTPrimitiveComponent { + +} diff --git a/src/main/java/elntranslator/toELN/ModuleCode.java b/src/main/java/elntranslator/toELN/ModuleCode.java index f46b668b230c23b6401016c09edc7a8a7966f9ad..d0bd61ab7eb4919edfd656cd90b447c94a2ffe61 100644 --- a/src/main/java/elntranslator/toELN/ModuleCode.java +++ b/src/main/java/elntranslator/toELN/ModuleCode.java @@ -448,12 +448,12 @@ public class ModuleCode { || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentVoltageSinkTDF || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentCurrentSourceTDF || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentCurrentSinkTDF)) - || (connectors.get(i).get_p1().getComponent() instanceof ELNTModulePortDE + || (connectors.get(i).get_p1().getComponent() instanceof ELNTModulePortTDF && (connectors.get(i).get_p2().getComponent() instanceof ELNTComponentVoltageSourceTDF || connectors.get(i).get_p2().getComponent() instanceof ELNTComponentVoltageSinkTDF || connectors.get(i).get_p2().getComponent() instanceof ELNTComponentCurrentSourceTDF || connectors.get(i).get_p2().getComponent() instanceof ELNTComponentCurrentSinkTDF)) - || (connectors.get(i).get_p2().getComponent() instanceof ELNTModulePortDE + || (connectors.get(i).get_p2().getComponent() instanceof ELNTModulePortTDF && (connectors.get(i).get_p1().getComponent() instanceof ELNTComponentVoltageSourceTDF || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentVoltageSinkTDF || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentCurrentSourceTDF @@ -479,9 +479,9 @@ public class ModuleCode { || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentCurrentSourceDE || connectors.get(i).get_p1().getComponent() instanceof ELNTComponentCurrentSinkDE)) || (connectors.get(i).get_p1().getComponent() instanceof ELNTMidPortTerminal - && connectors.get(i).get_p2().getComponent() instanceof ELNTComponent) + && connectors.get(i).get_p2().getComponent() instanceof ELNTPrimitiveComponent) || (connectors.get(i).get_p2().getComponent() instanceof ELNTMidPortTerminal - && connectors.get(i).get_p1().getComponent() instanceof ELNTComponent))) { + && connectors.get(i).get_p1().getComponent() instanceof ELNTPrimitiveComponent))) { nodes.add(connectors.get(i)); } } @@ -523,6 +523,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -552,6 +576,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -560,11 +608,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -590,6 +638,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -619,6 +691,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -627,11 +723,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -657,6 +753,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -686,6 +806,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -694,11 +838,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -724,6 +868,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -753,6 +921,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -761,11 +953,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -791,6 +983,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -820,6 +1036,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -828,11 +1068,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -858,6 +1098,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -887,6 +1151,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -895,11 +1183,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -925,6 +1213,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -954,6 +1266,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -962,11 +1298,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -992,6 +1328,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1021,6 +1381,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1029,11 +1413,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1059,6 +1443,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1088,6 +1496,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1096,11 +1528,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1126,6 +1558,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1155,6 +1611,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1163,11 +1643,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1193,6 +1673,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1222,6 +1726,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1230,11 +1758,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1260,6 +1788,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1289,6 +1841,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1297,11 +1873,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1327,6 +1903,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1356,6 +1956,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1364,11 +1988,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1394,6 +2018,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1423,6 +2071,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1431,11 +2103,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1461,6 +2133,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1490,6 +2186,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1498,11 +2218,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1528,6 +2248,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1557,6 +2301,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1565,11 +2333,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1595,6 +2363,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p2().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p2().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p2().getComponent().getName() + ");" + CR; @@ -1624,6 +2416,30 @@ public class ModuleCode { if (!connectors.get(k).getName().equals("")) { corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR; } else { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + LinkedList<ELNTMidPortTerminal> mids = connectors.get(k).getMidPortTerminal(); + boolean stop = false; + for (ELNTMidPortTerminal mid : mids) { + for (int l = 0; l < connectors.size(); l++) { + if (connectors.get(l).get_p1().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } else if (connectors.get(l).get_p2().getComponent().equals(mid)) { + if (!searchName(connectors.get(l)).equals("")) { + corpsModule = corpsModule + searchName(connectors.get(l)) + ");" + CR; + stop = true; + break; + } + } + } + if (stop == true) { + break; + } + } + } if (connectors.get(k).get_p1().getComponent() instanceof ELNTModuleTerminal) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; @@ -1632,11 +2448,11 @@ public class ModuleCode { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortDE) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortDE) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } - if (connectors.get(k).get_p2().getComponent() instanceof ELNTModulePortTDF) { + if (connectors.get(k).get_p1().getComponent() instanceof ELNTModulePortTDF) { corpsModule = corpsModule + connectors.get(k).get_p1().getComponent().getName() + ");" + CR; } @@ -1699,7 +2515,13 @@ public class ModuleCode { } private static String searchName(ELNTConnector connector) { - if (connector.get_p1().getComponent() instanceof ELNTComponent) { + if (connector.get_p1().getComponent() instanceof ELNTPrimitiveComponent) { + if (connector.get_p2().getComponent() instanceof ELNTModulePortTDF) { + return connector.get_p2().getComponent().getName(); + } + if (connector.get_p2().getComponent() instanceof ELNTModulePortDE) { + return connector.get_p2().getComponent().getName(); + } if (connector.get_p2().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p2().getComponent().getName(); } @@ -1711,6 +2533,12 @@ public class ModuleCode { return searchName(c); } } + if (connector.get_p1().getComponent() instanceof ELNTModulePortTDF) { + return connector.get_p1().getComponent().getName(); + } + if (connector.get_p1().getComponent() instanceof ELNTModulePortDE) { + return connector.get_p1().getComponent().getName(); + } if (connector.get_p1().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p1().getComponent().getName(); } @@ -1718,13 +2546,19 @@ public class ModuleCode { return connector.get_p1().getComponent().getName(); } if (connector.get_p1().getComponent() instanceof ELNTMidPortTerminal) { + if (connector.get_p2().getComponent() instanceof ELNTModulePortTDF) { + return connector.get_p2().getComponent().getName(); + } + if (connector.get_p2().getComponent() instanceof ELNTModulePortDE) { + return connector.get_p2().getComponent().getName(); + } if (connector.get_p2().getComponent() instanceof ELNTModuleTerminal) { return connector.get_p2().getComponent().getName(); } if (connector.get_p2().getComponent() instanceof ELNTComponentNodeRef) { return connector.get_p2().getComponent().getName(); } - if (connector.get_p2().getComponent() instanceof ELNTComponent) { + if (connector.get_p2().getComponent() instanceof ELNTPrimitiveComponent) { ELNTConnector c = ((ELNTMidPortTerminal) connector.get_p1().getComponent()).getConnector(); return searchName(c); }