diff --git a/src/main/java/syscamstranslator/SysCAMSSpecification.java b/src/main/java/syscamstranslator/SysCAMSSpecification.java index 32e7efae711716c4c6cd075d679768f8474b1327..1a065f57bc66c212c4928710fac8c77eebea6180 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 735b830a8bfdb1f418453d5e5db3b0c77b73c03e..2eb3f2fdf92a23d9ef69a296241aff0e7aac0b48 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) {