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 3f32dfdacdeeeaa65b74e109f4dd59d182d9162e Merge: e8d61cd de610b6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:41 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/referential/CaracteristicBean.java | 45 ++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 6 +- .../service/export/cps/SamplingNumberRowModel.java | 13 +- .../tutti/service/sampling/CacheExtractedKey.java | 18 +- .../service/sampling/CruiseSamplingCache.java | 778 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 21 +- .../sampling/CruiseSamplingInternalCache.java | 32 +- .../tutti/service/sampling/SamplingEvent.java | 7 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 23 +- .../tutti/ui/swing/content/MainUIHandler.java | 56 +- .../content/actions/EditCatchesSupportAction.java | 8 +- .../catches/actions/ComputeBatchWeightsAction.java | 35 +- .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchTableModel.java | 69 +- .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/IndividualObservationUICache.java | 152 ++-- .../frequency/SpeciesFrequencyTableModel.java | 167 +++++ .../frequency/SpeciesFrequencyUIHandler.java | 305 +++----- .../species/frequency/SpeciesFrequencyUIModel.java | 84 ++- .../frequency/actions/RemoveObservationAction.java | 27 +- .../actions/EditFishingOperationAction.java | 31 + .../content/protocol/EditProtocolUIHandler.java | 11 + .../content/protocol/EditProtocolUIModel.java | 6 +- .../MoveDownCaracteristicMappingAction.java | 8 +- .../actions/MoveUpCaracteristicMappingAction.java | 8 +- .../util/table/AbstractTuttiTableUIHandler.java | 109 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 34 files changed, 1218 insertions(+), 874 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.