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 3cbcdc3f96f32ecd7abc3c19ae33119b622c3d4c Merge: 41ae140 2e3fee3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 18:22:18 2015 +0100 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop .../tutti/persistence/entities/data/Cruises.java | 18 ++- .../service/AttachmentPersistenceServiceImpl.java | 26 +++- .../FishingOperationPersistenceServiceImpl.java | 11 +- .../service/util/BatchPersistenceHelper.java | 1 + .../genericformat/GenericFormatArchive.java | 148 +++++++-------------- .../genericformat/GenericFormatContextSupport.java | 33 ++++- .../GenericFormatImportOperationContext.java | 15 +++ .../genericformat/GenericFormatImportService.java | 3 + .../GenericformatImportPersitenceHelper.java | 96 +++++++++++-- .../consumer/CsvConsumerForAccidentalCatch.java | 1 + .../consumer/CsvConsumerForAttachment.java | 29 ++++ .../consumer/CsvConsumerForCatch.java | 12 +- .../CsvConsumerForIndividualObservation.java | 1 + .../service/genericformat/csv/AttachmentRow.java | 12 ++ .../service/genericformat/csv/CatchModel.java | 4 +- .../genericformat/csv/ExportSampleCategory.java | 6 +- .../genericformat/csv/MarineLitterModel.java | 4 +- .../service/genericformat/csv/MarineLitterRow.java | 10 +- .../service/genericformat/csv/OperationModel.java | 8 +- .../service/genericformat/csv/OperationRow.java | 26 ++-- .../service/genericformat/csv/SurveyModel.java | 4 +- .../tutti/service/genericformat/csv/SurveyRow.java | 12 +- .../importactions/ImportOperationAction.java | 8 +- .../importactions/ImportSurveyAction.java | 7 +- .../importactions/LoadAttachmentsAction.java | 80 +++++++++++ .../producer/CsvProducerForSurvey.java | 1 + .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 29 files changed, 420 insertions(+), 162 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.