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 e8d61cd6b999d1659d371362bbd342d6d3bc190f Merge: 262b35a 92d6e9a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 6 18:05:32 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + ...dividualObservationBatchPersistenceService.java | 10 + ...dualObservationBatchPersistenceServiceImpl.java | 49 ++++ .../service/util/SamplePersistenceHelper.java | 82 ++++-- .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++ .../main/java/fr/ifremer/tutti/util/Weights.java | 5 +- .../src/main/resources/queries-failsafe.hbm.xml | 36 +++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 5 + .../cps/CalcifiedPiecesSamplingExportService.java | 109 ++++++++ .../service/export/cps/SamplingNumberRowModel.java | 90 +++++++ .../tutti/service/sampling/CacheExtractedKey.java | 109 ++++++++ .../service/sampling/CruiseSamplingCache.java | 287 +++++++++++++------- .../sampling/CruiseSamplingCacheLoader.java | 4 +- .../sampling/CruiseSamplingInternalCache.java | 99 +++++-- .../tutti/service/sampling/SamplingCodePrefix.java | 11 +- .../tutti/service/sampling/SamplingEvent.java | 6 +- .../tutti/service/sampling/SamplingListener.java | 2 +- .../resources/i18n/tutti-service_en_GB.properties | 12 + .../resources/i18n/tutti-service_fr_FR.properties | 16 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../ui/swing/content/home/SelectCruiseUI.jcss | 10 +- .../CalcifiedPiecesSamplingReportAction.java | 141 ++++++++++ .../IndividualObservationBatchTableModel.java | 52 ++-- .../SamplingCodeCellEditor.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 3 +- .../frequency/IndividualObservationUICache.java | 277 +++++++++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 13 +- .../species/frequency/SpeciesFrequencyUI.jcss | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 296 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 64 ++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 28 +- .../actions/CancelEditSpeciesFrequencyAction.java | 2 + .../frequency/actions/EditSampleCodeAction.java | 102 ++++++- .../frequency/actions/RemoveObservationAction.java | 7 +- .../actions/ResetSpeciesFrequencyAction.java | 4 + .../swing/util/WideDataBeanFilterableComboBox.java | 25 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 13 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 49 files changed, 1650 insertions(+), 443 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.