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 3998c48913d06826b70a7d8f736dfbaf25ba581d Merge: b987ea6 58bd046 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:22 2015 +0000 Merge branch 'release/4.0-RC4' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/protocol/TuttiProtocols.java | 10 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/SpeciesParserFormatter.java | 22 +- .../tutti/service/export/ExportCatchContext.java | 50 +-- .../genericformat/GenericFormatContextSupport.java | 10 +- .../genericformat/GenericFormatExportContext.java | 2 +- .../GenericFormatImportEntityParserFactory.java | 2 +- .../GenericFormatReferentialImportResult.java | 6 +- ...enericFormatReferentialSpeciesImportResult.java | 77 +++++ .../exportactions/CreateCatchBatchRowsAction.java | 13 +- .../importactions/ImportCatchAction.java | 37 ++- .../importactions/ImportProtocolAction.java | 6 +- .../ImportReferentialSpeciesAction.java | 10 +- .../importactions/RestoreAfterImportAction.java | 35 +- .../importactions/RestoreAfterValidateAction.java | 3 + .../ReferentialTemporarySpeciesService.java | 4 +- .../consumer/CsvConsumerForTemporarySpecies.java | 4 +- .../service/referential/csv/SpeciesModel.java | 22 +- .../tutti/service/referential/csv/SpeciesRow.java | 14 + .../producer/CsvProducerForTemporarySpecies.java | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/help/fr/config.html | Bin 15560 -> 7634 bytes .../src/main/help/fr/editFishingOperation.html | Bin 135058 -> 59101 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 21122 -> 9585 bytes .../src/main/help/fr/editSampleCategory.html | Bin 7262 -> 3042 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 29980 -> 15427 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 10688 -> 4907 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 6128 -> 2066 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 16034 -> 6626 bytes .../catches/actions/ComputeBatchWeightsAction.java | 366 ++++++++++++++------- .../catches/benthos/BenthosBatchTableModel.java | 8 +- .../benthos/create/CreateBenthosBatchUI.css | 1 + .../create/CreateIndividualObservationBatchUI.css | 1 + .../catches/species/SpeciesBatchTableModel.java | 8 +- .../species/create/CreateSpeciesBatchUI.css | 1 + .../util/actions/ShowComboBoxPopupActions.java | 5 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- 42 files changed, 521 insertions(+), 220 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.