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 9e9dbf7443af9c9b44cffa62a2090be0267a076c Merge: 68fe8e2 dadc607 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 13:38:45 2016 +0200 livrable #8192 Merge branch 'feature/8192' into develop .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 -- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ---- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../CruiseSamplingCache.java | 9 ++-- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 2 +- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++++++++ .../{samplingCache => sampling}/SamplingEvent.java | 2 +- .../SamplingListener.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 -- .../IndividualObservationBatchRowModel.java | 43 ++--------------- .../IndividualObservationBatchTableModel.java | 22 ++++++--- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +-- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 6 +-- .../frequency/SpeciesFrequencyUIHandler.java | 11 +++-- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 ++- 23 files changed, 114 insertions(+), 92 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.