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 b0e531ffe132889e942659e7c506a768de602d78 Merge: cf65593 abb60a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 10:59:41 2016 +0200 Livrable #8256 Merge branch 'feature/8256' into develop .../entities/data/FishingOperationBean.java | 14 +- .../ifremer/tutti/service/PersistenceService.java | 129 +++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 216 ++++------ .../cps/CalcifiedPiecesSamplingExportService.java | 39 +- .../tutti/service/sampling/CruiseCache.java | 141 +++++++ .../tutti/service/sampling/CruiseCacheAble.java | 46 +++ .../tutti/service/sampling/CruiseCacheLoader.java | 149 +++++++ .../service/sampling/CruiseSamplingCache.java | 451 ++++++++++----------- .../sampling/CruiseSamplingCacheLoader.java | 156 ------- .../tutti/service/sampling/SamplingCodeCache.java | 113 ++++++ .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 18 +- .../content/actions/EditCatchesSupportAction.java | 24 +- .../content/cruise/actions/SaveCruiseAction.java | 7 +- .../CalcifiedPiecesSamplingReportAction.java | 30 +- .../SamplingCodeCellEditor.java | 20 +- .../IndividualObservationBatchTableHandler.java | 38 +- .../frequency/IndividualObservationUICache.java | 205 ++++++---- .../protocol/actions/SaveProtocolAction.java | 6 +- 18 files changed, 1059 insertions(+), 743 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.