This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6492f787d0230ff0e6414fb0caa9ab0e063995d5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 7 14:54:10 2015 +0100 no more need of decoratorService to export vessels --- .../tutti/service/genericformat/GlobalExportContext.java | 2 +- .../tutti/service/genericformat/csv/OperationModel.java | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GlobalExportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GlobalExportContext.java index d449c18..15c228d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GlobalExportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GlobalExportContext.java @@ -116,7 +116,7 @@ public class GlobalExportContext implements Closeable { this.producerForSurvey = new CsvProducerForSurvey(basedir, SurveyModel.forExport(csvSeparator)); this.producerForGearCaracteristics = new CsvProducerForGearCaracteristics(basedir, GearCaracteristicModel.forExport(csvSeparator, decoratorService)); - this.producerForOperation = new CsvProducerForOperation(basedir, OperationModel.forExport(csvSeparator, decoratorService)); + this.producerForOperation = new CsvProducerForOperation(basedir, OperationModel.forExport(csvSeparator)); this.producerForIndividualObservation = new CsvProducerForIndividualObservation(basedir, IndividualObservationModel.forExport(csvSeparator)); this.producerForSpecies = new CsvProducerForSpecies(basedir, SpeciesExportModel.forExport(csvSeparator), speciesById); this.producerForCatch = new CsvProducerForCatch(basedir, CatchModel.forExport(csvSeparator, sampleCategoryModel, decoratorService)); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java index 8dd47a5..39f12c4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java @@ -30,12 +30,9 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; +import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; -import org.nuiton.decorator.Decorator; /** * Model of a operation export. @@ -45,10 +42,10 @@ import org.nuiton.decorator.Decorator; */ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> { - public static OperationModel forExport(char separator, DecoratorService decoratorService) { + public static OperationModel forExport(char separator) { OperationModel exportModel = new OperationModel(separator); - exportModel.forExport(decoratorService); + exportModel.forExport(); return exportModel; } @@ -77,9 +74,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> } - protected void forExport(DecoratorService decoratorService) { - - Decorator<Vessel> vesselDecorator = decoratorService.getDecoratorByType(Vessel.class); + protected void forExport() { newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR); newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.