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 a44c7ebd22b25d146702628c3a2270c74ef39541 Merge: 127de03 6fa51c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 6 12:27:55 2016 +0200 Livrable #8157 Merge branch 'feature/8157' into develop .../cps/CalcifiedPiecesSamplingExportService.java | 85 ++++++++++ .../service/export/cps/SamplingNumberRowModel.java | 65 ++++++++ .../tutti/service/sampling/CacheExtractedKey.java | 75 +++++++++ .../service/sampling/CruiseSamplingCache.java | 143 ++++++++-------- .../sampling/CruiseSamplingCacheLoader.java | 4 +- .../sampling/CruiseSamplingInternalCache.java | 62 ++++++- .../tutti/service/sampling/SamplingCodePrefix.java | 7 +- .../tutti/service/sampling/SamplingEvent.java | 6 +- .../resources/i18n/tutti-service_en_GB.properties | 11 ++ .../resources/i18n/tutti-service_fr_FR.properties | 15 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../ui/swing/content/home/SelectCruiseUI.jcss | 10 +- .../CalcifiedPiecesSamplingReportAction.java | 117 ++++++++++++++ .../IndividualObservationBatchTableModel.java | 2 +- .../frequency/IndividualObservationUICache.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 179 +++++++++++---------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++ 19 files changed, 641 insertions(+), 173 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.