This is an automated email from the git hooks/post-receive script. New commit to branch feature/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6d07c54881f83c3be96656c65cb11836fe264378 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 6 16:03:52 2016 +0200 Fix merge --- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index 132a019..e1d5c86 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -317,7 +317,7 @@ public class CruiseSamplingCache implements Closeable { fireSamplingNeeded(event); } - fireResumeUpdated(event); + fireSummaryUpdated(event); } } @@ -394,7 +394,7 @@ public class CruiseSamplingCache implements Closeable { if (cpsDefinitionOpt.isPresent()) { SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); - fireResumeUpdated(event); + fireSummaryUpdated(event); } addSamplingCode(species.getReferenceTaxonId(), samplingCode); @@ -595,7 +595,7 @@ public class CruiseSamplingCache implements Closeable { if (cpsDefinitionOpt.isPresent()) { SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); - fireResumeUpdated(event); + fireSummaryUpdated(event); } removeSamplingCode(species.getReferenceTaxonId(), samplingCode); @@ -744,13 +744,13 @@ public class CruiseSamplingCache implements Closeable { } } - protected void fireResumeUpdated(SamplingEvent event) { + protected void fireSummaryUpdated(SamplingEvent event) { SamplingListener[] samplingListeners = listeners.getListeners(SamplingListener.class); if (samplingListeners.length > 0) { for (SamplingListener listener : samplingListeners) { - listener.resumeUpdated(event); + listener.summaryUpdated(event); } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.