This is an automated email from the git hooks/post-receive script. New commit to branch feature/8059 in repository tutti. See http://git.codelutin.com/tutti.git commit 5e7fecebe5ae70720e303884450c95bf88323a21 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 11:47:38 2016 +0100 on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) --- .../fr/ifremer/tutti/persistence/entities/CaracteristicMap.java | 4 ++++ .../individualobservation/IndividualObservationBatchRowModel.java | 6 +++--- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java index 10d1184..655b511 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java @@ -43,4 +43,8 @@ public class CaracteristicMap extends LinkedHashMap<Caracteristic, Serializable> } return result; } + + public boolean hasNotNullValues() { + return values().stream().filter(value -> value != null).count() > 0; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index b6be073..81ab5fc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -375,9 +375,9 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel public boolean isEmpty() { return getSize() == null - && getWeight() == null && getCaracteristics().isEmpty() - && (getCaracteristics() == null || getCaracteristics().isEmpty()) - && (getDefaultCaracteristics() == null || getDefaultCaracteristics().isEmpty()) + && getWeight() == null + && (getCaracteristics() == null || !getCaracteristics().hasNotNullValues()) + && (getDefaultCaracteristics() == null || !getDefaultCaracteristics().hasNotNullValues()) && getComment() == null && (getAttachment() == null || getAttachment().isEmpty()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 8ad71d4..ddb1a82 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -765,7 +765,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa boolean result = true; - if (rows != null) { + if (rows != null) { for (SpeciesFrequencyRowModel row : rows) { if (row.isEmpty()) { @@ -780,7 +780,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa // une ligne non vide et complete a ete trouvee // on ne peut plus editer result = false; - + break; } } @@ -795,6 +795,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa // une ligne non vide et complete a ete trouvee // on ne peut plus editer result = false; + break; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.