branch feature/8203 updated (64fa1d8 -> c380fac)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 64fa1d8 flag pour ne pas afficher les notifs quand on charge le lot ou qu'on reset (refs #8203) new c380fac on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c380fac21c8aff493b226da70124ee9c08c98da5 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 6 17:15:21 2016 +0200 on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) Summary of changes: .../frequency/IndividualObservationUICache.java | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 c380fac21c8aff493b226da70124ee9c08c98da5 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 6 17:15:21 2016 +0200 on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) --- .../frequency/IndividualObservationUICache.java | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java index 8c2853e..2c3942a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java @@ -137,28 +137,30 @@ public class IndividualObservationUICache implements Closeable { @Override public void samplingNeeded(SamplingEvent event) { - CalcifiedPiecesSamplingDefinition cpsDef = event.getCpsDef(); - if (log.isInfoEnabled()) { - log.info("samplingNeeded for " + cpsDef); - } + if (uiModel.isCanDisplayNotifications()) { + CalcifiedPiecesSamplingDefinition cpsDef = event.getCpsDef(); + if (log.isInfoEnabled()) { + log.info("samplingNeeded for " + cpsDef); + } - int nbForOperation = event.getNbSamplingForOperation(); - int nbForZone = event.getNbSamplingForZone(); - int nbForCruise = event.getNbSamplingForCruise(); + int nbForOperation = event.getNbSamplingForOperation(); + int nbForZone = event.getNbSamplingForZone(); + int nbForCruise = event.getNbSamplingForCruise(); - if (log.isInfoEnabled()) { + if (log.isInfoEnabled()) { - Integer operationLimitation = cpsDef.getOperationLimitation(); - Integer zoneLimitation = cpsDef.getZoneLimitation(); - Integer maxByLenghtStep = cpsDef.getMaxByLenghtStep(); + Integer operationLimitation = cpsDef.getOperationLimitation(); + Integer zoneLimitation = cpsDef.getZoneLimitation(); + Integer maxByLenghtStep = cpsDef.getMaxByLenghtStep(); - log.info(String.format("nbForOperation: %d/%s - nbForZone: %d/%s - nbForCruise: %d/%s", - nbForOperation, operationLimitation == null ? "∞" : operationLimitation, - nbForZone, zoneLimitation == null ? "∞" : zoneLimitation, - nbForCruise, maxByLenghtStep == null ? "∞" : maxByLenghtStep)); - } + log.info(String.format("nbForOperation: %d/%s - nbForZone: %d/%s - nbForCruise: %d/%s", + nbForOperation, operationLimitation == null ? "∞" : operationLimitation, + nbForZone, zoneLimitation == null ? "∞" : zoneLimitation, + nbForCruise, maxByLenghtStep == null ? "∞" : maxByLenghtStep)); + } - ui.getSamplingWarningLabel().setVisible(true); + ui.getSamplingWarningLabel().setVisible(true); + } } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm