From a79c4506a1dc2cb6efc0c264391dc0cb46abbbd1 Mon Sep 17 00:00:00 2001
From: "Irina Lee [m1]" <irina.lee@etu.upmc.fr>
Date: Mon, 16 Jul 2018 12:23:15 +0200
Subject: [PATCH] fixed prroblem (syscams/eln)
---
.../SysCAMSSpecification.java | 4 ++--
src/main/java/ui/eln/ELNModule.java | 19 ++-----------------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/java/syscamstranslator/SysCAMSSpecification.java b/src/main/java/syscamstranslator/SysCAMSSpecification.java
index 32e7efae71..1a065f57bc 100644
--- a/src/main/java/syscamstranslator/SysCAMSSpecification.java
+++ b/src/main/java/syscamstranslator/SysCAMSSpecification.java
@@ -164,6 +164,6 @@ public class SysCAMSSpecification{
}
public int getNbConnector(){
- return (getAllConnector()).size();
+ return (getAllConnectorCluster()).size();
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNModule.java b/src/main/java/ui/eln/ELNModule.java
index 735b830a8b..2eb3f2fdf9 100644
--- a/src/main/java/ui/eln/ELNModule.java
+++ b/src/main/java/ui/eln/ELNModule.java
@@ -204,10 +204,8 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
if (tgc instanceof ELNComponentNodeRef) {
return true;
}
- if (!(tgc.getFather() instanceof ELNModule)) {
- if (tgc instanceof ELNPortTerminal) {
- return true;
- }
+ if (tgc instanceof ELNModuleTerminal) {
+ return true;
}
return false;
}
@@ -261,19 +259,6 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
}
public java.util.List<ELNModuleTerminal> getAllPorts() {
- java.util.List<ELNModuleTerminal> ret = new LinkedList<ELNModuleTerminal>();
- ELNModuleTerminal port;
-
- for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNModuleTerminal) {
- port = (ELNModuleTerminal)tgcomponent[i];
- ret.add(port);
- }
- }
- return ret;
- }
-
- public java.util.List<ELNModuleTerminal> getAllInternalPorts() {
java.util.List<ELNModuleTerminal> list = new ArrayList<ELNModuleTerminal>();
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ELNModuleTerminal) {
--
GitLab