This is an automated email from the git hooks/post-receive script. New commit to branch feature/8145 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 63ec6b1ac53336c9e91e1108aa0c64e4245f975b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 19 16:36:03 2016 +0100 Amélioration de l'API dans DataContext --- .../main/java/fr/ifremer/tutti/service/TuttiDataContext.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index c345ab6..1306dae 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -51,6 +51,7 @@ import java.io.Closeable; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -323,7 +324,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { } if (cruise != null && - !cruise.getProgram().getId().equals(oldProgramId)) { + !cruise.getProgram().getId().equals(oldProgramId)) { // not matchin program, reset cruise id cruise = null; @@ -418,7 +419,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { } public boolean isFishingOperationFilled() { - return fishingOperationId!=null; + return fishingOperationId != null; } public boolean isCruiseSamplingCacheLoaded() { @@ -535,14 +536,13 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return service.getProtocol(); } - public CruiseSamplingCache getCruiseSamplingCache() { - return cruiseSamplingCache; + public Optional<CruiseSamplingCache> getOptionalCruiseSamplingCache() { + return Optional.ofNullable(isCruiseSamplingCacheLoaded() ? cruiseSamplingCache : null); } public void loadCruiseSamplingCache() { checkOpened(); - if (!isCruiseSamplingCacheLoaded() - && isProtocolFilled() && isCruiseFilled()) { + if (!isCruiseSamplingCacheLoaded() && isProtocolFilled() && isCruiseFilled()) { TuttiProtocol protocol = getProtocol(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.