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 c2d4a8af53efb4e093be6b7729d6af7d9a9d06e4 Merge: 2feb60c 12408e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 14:42:14 2015 +0200 fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop .../tutti/persistence/entities/data/Cruises.java | 31 ++ .../entities/data/FishingOperations.java | 19 + .../tutti/persistence/model/CruiseDataModel.java | 14 + .../tutti/persistence/model/DataModelSupport.java | 19 + .../tutti/persistence/model/ProgramDataModel.java | 14 + .../genericformat/GenericFormatArchive.java | 40 +- .../genericformat/GenericFormatContextSupport.java | 108 ++-- .../GenericFormatImportConfiguration.java | 139 +++++- .../GenericFormatImportCruiseContext.java | 101 +++- .../GenericFormatImportCruiseResult.java | 2 +- .../GenericFormatImportOperationContext.java | 13 + .../GenericFormatImportOperationResult.java | 9 +- .../genericformat/GenericFormatImportRequest.java | 93 +++- .../genericformat/GenericFormatImportService.java | 69 +-- .../GenericFormatImportValidationHelper.java | 74 ++- .../genericformat/GenericFormatResultSupport.java | 11 + .../GenericFormatValidateFileContext.java | 64 ++- .../GenericFormatValidateFileResult.java | 1 + .../GenericformatImportPersistenceHelper.java | 277 +++++++++++ .../GenericformatImportPersitenceHelper.java | 550 --------------------- .../consumer/CsvConsumerForAccidentalCatch.java | 44 +- .../consumer/CsvConsumerForCatch.java | 26 +- .../consumer/CsvConsumerForGearCaracteristic.java | 55 +-- .../CsvConsumerForIndividualObservation.java | 44 +- .../consumer/CsvConsumerForMarineLitter.java | 14 +- .../consumer/CsvConsumerForOperation.java | 81 +-- .../consumer/CsvConsumerForParameter.java | 57 +-- .../consumer/CsvConsumerForSurvey.java | 12 +- .../service/genericformat/csv/OperationModel.java | 18 +- .../importactions/DoCheckWeightAction.java | 2 +- .../importactions/DoCleanWeightAction.java | 1 + .../importactions/ImportAccidentalCatchAction.java | 95 +++- .../importactions/ImportCatchAction.java | 223 ++++++++- .../ImportGearCaracteristicAction.java | 57 ++- .../ImportIndividualObservationAction.java | 95 +++- .../importactions/ImportMarineLitterAction.java | 95 +++- .../importactions/ImportOperationAction.java | 171 ++++++- .../importactions/ImportParameterAction.java | 87 +++- .../importactions/ImportProtocolAction.java | 46 +- .../importactions/ImportReferentialGearAction.java | 32 +- .../ImportReferentialPersonAction.java | 32 +- .../ImportReferentialSpeciesAction.java | 32 +- .../ImportReferentialVesselAction.java | 31 +- .../importactions/ImportSurveyAction.java | 167 ++++++- .../importactions/ImpotSampleCategoryAction.java | 10 +- .../importactions/LoadAttachmentsAction.java | 9 +- .../ValidateAccidentalCatchAction.java | 2 +- .../importactions/ValidateCatchAction.java | 2 +- .../ValidateGearCaracteristicAction.java | 6 +- .../ValidateIndividualObservationAction.java | 2 +- .../importactions/ValidateMarineLitterAction.java | 2 +- .../importactions/ValidateOperationAction.java | 11 +- .../importactions/ValidateParameterAction.java | 2 +- .../importactions/ValidateSurveyAction.java | 35 +- .../resources/i18n/tutti-service_en_GB.properties | 17 + .../resources/i18n/tutti-service_fr_FR.properties | 33 +- .../genericformat/GenericFormatArchiveTest.java | 38 ++ .../GenericFormatImportServiceTest.java | 12 +- .../GenericFormatImportServiceValidTest.java | 13 +- .../genericFormat/test_countLines/oneEmptyLine.txt | 0 .../genericFormat/test_countLines/oneLine.txt | 1 + .../genericFormat/test_countLines/twoLines.txt | 2 + .../test_countLines/twoLines_secondEmpty.txt | 1 + .../genericFormat/test_countLines/zeroLines.txt | 0 .../filtered-resources/tutti-help-fr.properties | 14 +- .../genericformat/GenericFormatExportUI.css | 21 +- .../genericformat/GenericFormatExportUI.jaxx | 33 +- .../GenericFormatExportUIHandler.java | 32 +- .../genericformat/GenericFormatExportUIModel.java | 15 +- .../genericformat/GenericFormatImportUI.css | 102 ++++ .../genericformat/GenericFormatImportUI.jaxx | 43 +- .../GenericFormatImportUIHandler.java | 69 ++- .../genericformat/GenericFormatImportUIModel.java | 161 +++++- ...ataAction.java => ExportFoldAllDataAction.java} | 9 +- .../actions/ExportSelectAllDataAction.java | 29 ++ ...aAction.java => ExportUnfoldAllDataAction.java} | 11 +- .../actions/ExportUnselectAllDataAction.java | 29 ++ ...ataAction.java => ImportFoldAllDataAction.java} | 17 +- .../actions/ImportSelectAllDataAction.java | 29 ++ ...aAction.java => ImportUnfoldAllDataAction.java} | 19 +- .../actions/ImportUnselectAllDataAction.java | 29 ++ .../genericformat/actions/SelectAllDataAction.java | 35 -- .../actions/UnselectAllDataAction.java | 35 -- .../genericformat/tree/CruiseSelectTreeNode.java | 22 +- .../tree/DataSelectTreeCellEditor.java | 65 --- .../genericformat/tree/DataSelectTreeModel.java | 175 +++++++ .../tree/DataSelectTreeNodeSupport.java | 9 + ....java => ExportDataSelectTreeCellRenderer.java} | 6 +- ....java => ImportDataSelectTreeCellRenderer.java} | 99 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 23 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +- 91 files changed, 3137 insertions(+), 1381 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.