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 c636f0097109a77bdf2b04228e005e2627c22518 Merge: ed0767c 8eb2beb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:15:40 2015 +0100 fixes #6868: [IMPORT GENERIQUE] Ne plus interferer avec le modèle de catégorisation de l'application lors de l'import générique Merge branch 'feature/6868' into develop .../tutti/persistence/test/DatabaseResource.java | 11 + .../ifremer/tutti/service/PersistenceService.java | 6 + ...ntext.java => GenericFormatContextSupport.java} | 45 +- .../genericformat/GenericFormatImportContext.java | 478 +-------------------- .../GenericFormatImportEntityParserFactory.java | 4 +- .../genericformat/GenericFormatImportRequest.java | 10 +- .../genericformat/GenericFormatImportService.java | 14 +- .../GenericFormatImportValidationDataContext.java | 4 +- .../GenericFormatImportValidationHelper.java | 8 +- .../genericformat/GenericFormatResultSupport.java | 16 +- .../GenericFormatValidateFileContext.java | 13 +- .../consumer/CsvConsumerForAccidentalCatch.java | 4 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../consumer/CsvConsumerForGearCaracteristic.java | 4 +- .../CsvConsumerForIndividualObservation.java | 4 +- .../consumer/CsvConsumerForMarineLitter.java | 4 +- .../consumer/CsvConsumerForOperation.java | 4 +- .../consumer/CsvConsumerForParameter.java | 4 +- .../consumer/CsvConsumerForSampleCategory.java | 43 +- .../consumer/CsvConsumerForSurvey.java | 4 +- .../genericformat/csv/SampleCategoryRow.java | 4 + .../importactions/ImportActionSupport.java | 6 +- .../importactions/ImportProtocolAction.java | 4 +- .../importactions/ImportReferentialGearAction.java | 4 +- .../ImportReferentialPersonAction.java | 4 +- .../ImportReferentialSpeciesAction.java | 4 +- .../ImportReferentialVesselAction.java | 4 +- ...yAction.java => ImpotSampleCategoryAction.java} | 68 +-- .../importactions/RestoreAfterImportAction.java | 53 +++ .../importactions/RestoreAfterValidateAction.java | 86 ++++ .../ValidateAccidentalCatchAction.java | 4 +- .../importactions/ValidateCatchAction.java | 4 +- .../ValidateGearCaracteristicAction.java | 4 +- .../ValidateIndividualObservationAction.java | 4 +- .../importactions/ValidateMarineLitterAction.java | 4 +- .../importactions/ValidateOperationAction.java | 4 +- .../importactions/ValidateParameterAction.java | 4 +- .../importactions/ValidateSurveyAction.java | 4 +- .../resources/i18n/tutti-service_fr_FR.properties | 6 +- .../ifremer/tutti/service/ServiceDbResource.java | 17 + .../GenericFormatImportServiceValidTest.java | 55 ++- .../genericFormat/parameter/parameter.csv | 12 + 42 files changed, 393 insertions(+), 650 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.