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 50f07c7c218c1fa632fc511381cc995a6b5612d1 Merge: 524e139 bac64af Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:21:48 2016 +0200 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop ...cesSamplingAlgorithmEntryNotFoundException.java | 6 +- .../service/sampling/CruiseSamplingCache.java | 395 +++++++++------------ .../IndividualObservationSamplingCacheRequest.java | 80 +++++ .../IndividualObservationSamplingStatus.java | 3 +- ...lObservationSamplingStatusExceptionSupport.java | 15 +- ...NotDefinedOnIndividualObservationException.java | 6 +- .../ZoneNotDefinedOnFishingOperationException.java | 6 +- .../IndividualObservationBatchRowModel.java | 21 +- .../IndividualObservationBatchRowState.java | 38 +- .../IndividualObservationBatchTableHandler.java | 375 +++++++++++-------- .../IndividualObservationBatchTableModel.java | 14 +- .../IndividualObservationBatchUIModel.java | 8 + ...dividualObservationToSamplingCacheResolver.java | 147 ++++++++ .../frequency/IndividualObservationUICache.java | 371 ++++++------------- .../frequency/SamplingNotificationZoneHandler.java | 8 +- .../frequency/SamplingNotificationZoneModel.java | 27 +- .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../frequency/SpeciesFrequencyUIHandler.java | 223 +++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 135 +++---- .../actions/ApplySpeciesFrequencyRafaleAction.java | 51 +-- .../actions/CancelEditSpeciesFrequencyAction.java | 15 +- .../frequency/actions/EditSampleCodeAction.java | 52 +-- .../frequency/actions/RemoveObservationAction.java | 8 +- .../actions/ResetSpeciesFrequencyAction.java | 13 +- 25 files changed, 989 insertions(+), 1036 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.