Author: chatellier Date: 2010-12-07 13:15:53 +0000 (Tue, 07 Dec 2010) New Revision: 374 Log: Switch signature to data container Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-07 13:13:56 UTC (rev 373) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-07 13:15:53 UTC (rev 374) @@ -2195,14 +2195,14 @@ * sur tous les traits d'une année (ou tous les années si regroupé) * * @param project project - * @param selection data container + * @param dataContainer data container * @return matrix 4 dimension */ - public MatrixND getLengthStructure(Project project, Selection selection) { + public MatrixND getLengthStructure(Project project, AbstractDataContainer dataContainer) { // load map traitname > stratename Map<String, String> haulAndStratas = new HashMap<String, String>(); - Iterator<String[]> itHaul = selection.getHaul().iterator(); + Iterator<String[]> itHaul = dataContainer.getHaul().iterator(); itHaul.next(); // skip header while (itHaul.hasNext()) { String[] tuple = itHaul.next(); @@ -2219,9 +2219,8 @@ Set<String> strataSet = new HashSet<String>(); Set<String> yearSet = new HashSet<String>(); - Iterator<String[]> itData = selection.getLength().iterator(); + Iterator<String[]> itData = dataContainer.getLength().iterator(); itData.next(); // skip header - while (itData.hasNext()) { String[] tuple = itData.next();