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 58d072b687f3bc25fb3a297195f29b30cdb49f51 Merge: 5da69d1 e2fe4ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 18 15:08:23 2016 +0100 Fixes #8043 Merge branch 'feature/8043' into develop .../CalcifiedPiecesSamplingDefinitionBean.java | 22 + ...dualObservationBatchPersistenceServiceImpl.java | 1 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 57 +- .../service/samplingCache/CruiseSamplingCache.java | 257 +++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 73 +++ .../service/samplingCache/SamplingListener.java | 14 + .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/home/actions/EditCatchesAction.java | 1 + .../IndividualObservationBatchRowModel.java | 9 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 196 ++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 14 +- .../frequency/SpeciesFrequencyUIHandler.java | 591 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 1 + .../actions/CancelEditSpeciesFrequencyAction.java | 3 + .../frequency/actions/RemoveObservationAction.java | 3 + .../actions/ResetSpeciesFrequencyAction.java | 7 +- .../protocol/actions/SaveProtocolAction.java | 2 + .../util/table/CaracteristicColumnIdentifier.java | 2 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 + 20 files changed, 947 insertions(+), 317 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.