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 6cca7a9fcd1a10de979289dd32258396ced405bd Merge: ec86284 d1af030 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:43 2015 +0000 Merge branch 'release/4.0-RC2' pom.xml | 2 +- src/site/rst/dbversions.rst | 2 ++ tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 +-- .../genericformat/GenericFormatCsvFileResult.java | 17 +++++++++- .../GenericFormatImportConfiguration.java | 13 ++++++++ .../genericformat/GenericFormatImportRequest.java | 4 +++ .../consumer/CsvConsumerForCatch.java | 4 +++ .../service/genericformat/csv/CatchModel.java | 12 ++++--- .../tutti/service/genericformat/csv/CatchRow.java | 38 ++++++++-------------- .../genericformat/csv/ExportSampleCategory.java | 14 +++++++- .../importactions/ImportActionSupport.java | 13 ++++++++ .../ValidateAccidentalCatchAction.java | 11 ++++++- .../importactions/ValidateCatchAction.java | 11 ++++++- .../ValidateGearCaracteristicAction.java | 11 ++++++- .../ValidateIndividualObservationAction.java | 11 ++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++- .../importactions/ValidateOperationAction.java | 11 ++++++- .../importactions/ValidateParameterAction.java | 11 ++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++- .../producer/CsvProducerForCatch.java | 10 +++--- .../ftl/genericFormatValidateReport_fr.ftl | 3 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 +++-- .../swing/content/config/TuttiConfigUIHandler.java | 3 ++ .../genericformat/GenericFormatImportUI.css | 7 +++- .../genericformat/GenericFormatImportUI.jaxx | 30 ++++++++--------- .../genericformat/GenericFormatImportUIModel.java | 7 ++-- .../actions/GenericFormatValidateAction.java | 3 +- .../genericformat/tree/DataSelectTreeModel.java | 10 +++--- .../tree/ImportDataSelectTreeCellRenderer.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 8 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 42 files changed, 249 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.