This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e3e9198e74893a475bedf30215f50127dc3270d7 Merge: bd2cea1 6104691 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 22 09:14:53 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.6-alpha-1' into 'master' pom.xml | 11 +- .../AllegroCampagne-Specifications.odt | Bin 1039537 -> 1206634 bytes .../AllegroCampagne-Specifications.pdf | Bin 1880559 -> 2146280 bytes tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 19 ++- .../tutti/persistence/TuttiPersistenceImpl.java | 10 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 10 ++ .../service/CatchBatchPersistenceService.java | 19 +++ .../service/CatchBatchPersistenceServiceImpl.java | 59 +++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 10 ++ .../genericformat/GenericFormatArchive.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 6 +- .../filtered-resources/tutti-help-fr.properties | 7 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 6 +- .../genericformat/GenericFormatImportUIModel.java | 4 +- .../actions/GenericFormatImportAction.java | 4 +- .../genericformat/tree/CruiseSelectTreeNode.java | 19 +++ .../tree/OperationSelectTreeNode.java | 6 + .../genericformat/tree/ProgramSelectTreeNode.java | 25 ++- .../operation/FishingOperationsUIHandler.java | 4 + .../catches/species/BenthosBatchUISupportImpl.java | 11 +- .../catches/species/EditSpeciesBatchPanelUI.jaxx | 1 + .../species/EditSpeciesBatchPanelUIHandler.java | 25 +++ .../catches/species/SpeciesBatchUISupportImpl.java | 11 +- .../catches/species/edit/SpeciesBatchRowModel.java | 19 ++- .../species/edit/SpeciesBatchUIHandler.java | 2 +- .../edit/actions/CreateSpeciesMelagAction.java | 14 +- .../edit/actions/RenameSpeciesBatchAction.java | 52 ++++++ .../species/frequency/SpeciesFrequencyUI.jaxx | 9 + .../species/frequency/SpeciesFrequencyUI.jcss | 25 ++- .../frequency/SpeciesFrequencyUIHandler.java | 85 ++++++++-- .../species/frequency/SpeciesFrequencyUIModel.java | 76 ++++++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 7 +- .../actions/SaveAndStaySpeciesFrequencyAction.java | 74 ++++++++ .../SearchSpeciesInPrevOrNextCatchesAction.java | 188 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 12 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 18 +- tutti-ui-swing/src/main/resources/spy.properties | 26 +++ 42 files changed, 825 insertions(+), 61 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.