branch develop updated (f1d0845 -> 02f97ea)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f1d0845 libération de listeners quand on quitte l'écran new b780b8e Le sexe a changé... new 820b1e5 il se peut que ni la taille, ni le poids n'ai changé new 02f97ea Gestion de la nullité du quota dans l'algorithme The 3 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 02f97ea5a418fbb9c533025be3185fc4bd3d9b78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 17:23:31 2016 +0200 Gestion de la nullité du quota dans l'algorithme commit 820b1e595958c36fb6fef8f99c12879b6f3d4981 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 16:41:41 2016 +0200 il se peut que ni la taille, ni le poids n'ai changé commit b780b8ee3111b5f9bee2bf4a57778e65aaa2b6f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 16:41:10 2016 +0200 Le sexe a changé... Summary of changes: .../sampling/IndividualObservationSamplingStatus.java | 15 +++++++++------ .../frequency/IndividualObservationBatchTableHandler.java | 3 ++- .../frequency/IndividualObservationToFrequencyEngine.java | 9 ++++++--- 3 files changed, 17 insertions(+), 10 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit b780b8ee3111b5f9bee2bf4a57778e65aaa2b6f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 16:41:10 2016 +0200 Le sexe a changé... --- .../species/frequency/IndividualObservationBatchTableHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java index 044e782..293b87e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java @@ -297,7 +297,7 @@ public class IndividualObservationBatchTableHandler implements Closeable { CaracteristicQualitativeValue oldGender = model2.getGender(oldCaracteristicMap); CaracteristicQualitativeValue newGender = model2.getGender(source); - if (Objects.equals(oldGender, newGender)) { + if (!Objects.equals(oldGender, newGender)) { // Le sexe a changé @@ -320,6 +320,7 @@ public class IndividualObservationBatchTableHandler implements Closeable { if (!Objects.equals(oldMaturity, newMaturity)) { // La maturité a changée + Float size = source.getSize(); Float weight = source.getWeight(); CaracteristicQualitativeValue gender = model2.getGender(source); -- 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 820b1e595958c36fb6fef8f99c12879b6f3d4981 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 16:41:41 2016 +0200 il se peut que ni la taille, ni le poids n'ai changé --- .../frequency/IndividualObservationToFrequencyEngine.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java index f1993d3..c488833 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java @@ -1,7 +1,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.lang3.tuple.Pair; @@ -187,7 +186,12 @@ public class IndividualObservationToFrequencyEngine { Float oldWeight = oldState.getWeight(); boolean weightChanged = !Objects.equals(oldWeight, newWeight); - Preconditions.checkState(sizeChanged || weightChanged); + if (!sizeChanged && !weightChanged) { + + // ce cas limite peut arrive quand on passe de null à null + return null; + + } boolean oldStateValid = oldState.isValid(); boolean newStateValid = newState.isValid(); @@ -264,5 +268,4 @@ public class IndividualObservationToFrequencyEngine { } - } -- 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 02f97ea5a418fbb9c533025be3185fc4bd3d9b78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 17:23:31 2016 +0200 Gestion de la nullité du quota dans l'algorithme --- .../sampling/IndividualObservationSamplingStatus.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java index df0a8e1..dd47b50 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java @@ -111,28 +111,31 @@ public class IndividualObservationSamplingStatus { return individualObservationCountInZone; } - public int getTotalSamplingRequiredInCruise() { + public Integer getTotalSamplingRequiredInCruise() { return getCalcifiedPiecesSamplingDefinition().getMaxByLenghtStep(); } - public int getTotalSamplingRequiredInFishingOperation() { + public Integer getTotalSamplingRequiredInFishingOperation() { return getCalcifiedPiecesSamplingDefinition().getOperationLimitation(); } - public int getTotalSamplingRequiredInZone() { + public Integer getTotalSamplingRequiredInZone() { return getCalcifiedPiecesSamplingDefinition().getZoneLimitation(); } public boolean isTotalInCruiseAttained() { - return getTotalSamplingRequiredInCruise() > 0 && getSamplingCountInCruise() >= getTotalSamplingRequiredInCruise(); + Integer totalSamplingRequiredInCruise = getTotalSamplingRequiredInCruise(); + return totalSamplingRequiredInCruise != null && (totalSamplingRequiredInCruise > 0 && getSamplingCountInCruise() >= totalSamplingRequiredInCruise); } public boolean isTotalInFishingOperationAttained() { - return getTotalSamplingRequiredInFishingOperation() > 0 && getSamplingCountInFishingOperation() >= getTotalSamplingRequiredInFishingOperation(); + Integer totalSamplingRequiredInFishingOperation = getTotalSamplingRequiredInFishingOperation(); + return totalSamplingRequiredInFishingOperation != null && (totalSamplingRequiredInFishingOperation > 0 && getSamplingCountInFishingOperation() >= totalSamplingRequiredInFishingOperation); } public boolean isTotalInZoneAttained() { - return getTotalSamplingRequiredInZone() > 0 && getSamplingCountInZone() >= getTotalSamplingRequiredInZone(); + Integer totalSamplingRequiredInZone = getTotalSamplingRequiredInZone(); + return totalSamplingRequiredInZone != null && (totalSamplingRequiredInZone > 0 && getSamplingCountInZone() >= totalSamplingRequiredInZone); } public boolean isOneTotalCountIsAttained() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm