Author: tchemit Date: 2013-05-23 13:35:53 +0200 (Thu, 23 May 2013) New Revision: 992 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/992 Log: rename method Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-23 11:28:29 UTC (rev 991) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-23 11:35:53 UTC (rev 992) @@ -37,8 +37,8 @@ } } - public void prepareIndividualRowsRows(TuttiExportService.ExportContext exportContext, - List<IndividualObservationExportRow> rows) { + public void prepareIndividualRows(TuttiExportService.ExportContext exportContext, + List<IndividualObservationExportRow> rows) { for (IndividualObservationExportRow row : rows) { exportContext.addSpecies(row.getSpecies()); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-23 11:28:29 UTC (rev 991) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-23 11:35:53 UTC (rev 992) @@ -445,7 +445,7 @@ } List<IndividualObservationExportRow> rows = Lists.newArrayList(); exportContext.individualObservationModel.prepareRows(persistenceService, rows, cruise, operation); - exportContext.speciesModel.prepareIndividualRowsRows( + exportContext.speciesModel.prepareIndividualRows( exportContext, rows); exportContext.individualObservationExport.write(rows, exportContext.individualObservationWriter); @@ -726,13 +726,6 @@ speciesExport = TuttiCsvUtil.newRepeatableExport(speciesModel); } - protected void addSpecies(Species species) { - Species fullSpecies = speciesById.get(species.getId()); - SpeciesExportRow row = new SpeciesExportRow(); - row.setSpecies(fullSpecies); - speciesToExport.add(row); - } - @Override public void close() throws IOException { IOUtils.closeQuietly(surveyWriter); @@ -745,6 +738,13 @@ IOUtils.closeQuietly(speciesWriter); } + public void addSpecies(Species species) { + Species fullSpecies = speciesById.get(species.getId()); + SpeciesExportRow row = new SpeciesExportRow(); + row.setSpecies(fullSpecies); + speciesToExport.add(row); + } + public List<SpeciesExportRow> getSpeciesToExport() { List<SpeciesExportRow> result = Lists.newArrayList(speciesToExport);