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 3dd567ba497b74d0a634e5fd5126e93f391a3b4a Merge: 17e4207 0da3fda Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 15:23:41 2015 +0200 fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++++ .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 1 + .../resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../java/fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 ++-- .../genericformat/GenericFormatCsvFileResult.java | 17 ++++++++++++++++- .../genericformat/GenericFormatImportConfiguration.java | 13 +++++++++++++ .../genericformat/GenericFormatImportRequest.java | 4 ++++ .../tutti/service/genericformat/csv/CatchModel.java | 4 ++-- .../importactions/ImportActionSupport.java | 13 +++++++++++++ .../importactions/ValidateAccidentalCatchAction.java | 11 ++++++++++- .../importactions/ValidateCatchAction.java | 11 ++++++++++- .../importactions/ValidateGearCaracteristicAction.java | 11 ++++++++++- .../ValidateIndividualObservationAction.java | 11 ++++++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++++++- .../importactions/ValidateOperationAction.java | 11 ++++++++++- .../importactions/ValidateParameterAction.java | 11 ++++++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++++++- .../resources/ftl/genericFormatValidateReport_fr.ftl | 3 +++ .../ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../genericformat/GenericFormatImportUIModel.java | 4 +++- .../actions/GenericFormatValidateAction.java | 3 ++- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 24 files changed, 157 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.