From 1a3da3a736d047e8691482c5ab13d9398f99d250 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Mon, 6 Aug 2018 15:53:02 +0200
Subject: [PATCH] fix problem with nodes (eln)
---
.../java/elntranslator/toELN/ModuleCode.java | 47 +++++++++----------
1 file changed, 21 insertions(+), 26 deletions(-)
diff --git a/src/main/java/elntranslator/toELN/ModuleCode.java b/src/main/java/elntranslator/toELN/ModuleCode.java
index 45bfe49fd3..94c58a39a7 100644
--- a/src/main/java/elntranslator/toELN/ModuleCode.java
+++ b/src/main/java/elntranslator/toELN/ModuleCode.java
@@ -370,35 +370,30 @@ public class ModuleCode {
LinkedList<ELNTConnector> nodes = new LinkedList<ELNTConnector>();
for (int i = 0; i < connectors.size(); i++) {
if (!connectors.get(i).getName().equals("")) {
- if (!((connectors.get(i).get_p1().getComponent() instanceof ELNTModulePortTDF && (connectors.get(i)
- .get_p2().getComponent() instanceof ELNTComponentVoltageSourceTDF
+ if (!((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 ELNTModulePortTDF && (connectors
- .get(i).get_p1().getComponent() instanceof ELNTClusterPortTDF
- || 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_p2().getComponent() instanceof ELNTClusterPortDE
- || 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_p1().getComponent() instanceof ELNTClusterPortDE
- || 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 ELNTMidPortTerminal
- && connectors.get(i).get_p2().getComponent() instanceof ELNTComponent)
- || (connectors.get(i).get_p2().getComponent() instanceof ELNTMidPortTerminal
- && connectors.get(i).get_p1().getComponent() instanceof ELNTComponent)))) {
+ || (connectors.get(i).get_p2().getComponent() instanceof ELNTModulePortTDF
+ && (connectors.get(i).get_p1().getComponent() instanceof ELNTClusterPortTDF
+ || 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_p2().getComponent() instanceof ELNTClusterPortDE
+ || 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_p1().getComponent() instanceof ELNTClusterPortDE
+ || 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 ELNTMidPortTerminal
+ && connectors.get(i).get_p2().getComponent() instanceof ELNTComponent)
+ || (connectors.get(i).get_p2().getComponent() instanceof ELNTMidPortTerminal
+ && connectors.get(i).get_p1().getComponent() instanceof ELNTComponent))) {
nodes.add(connectors.get(i));
}
}
--
GitLab