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 1bfceae604be8288a326e68db7aee85b8a813f4e Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 17:10:43 2016 +0100 on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) --- .../IndividualObservationBatchRowModel.java | 9 +++++ .../IndividualObservationBatchTableModel.java | 6 +--- .../frequency/SpeciesFrequencyUIHandler.java | 3 ++ .../species/frequency/SpeciesFrequencyUIModel.java | 39 +++++++++++++++------- 4 files changed, 40 insertions(+), 17 deletions(-) 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 8a3de05..b6be073 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 @@ -372,4 +372,13 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel this.attachment.remove(attachment); firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); } + + public boolean isEmpty() { + return getSize() == null + && getWeight() == null && getCaracteristics().isEmpty() + && (getCaracteristics() == null || getCaracteristics().isEmpty()) + && (getDefaultCaracteristics() == null || getDefaultCaracteristics().isEmpty()) + && getComment() == null + && (getAttachment() == null || getAttachment().isEmpty()); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index 0826e25..de460d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -129,11 +129,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab for (int i = rows.size() - 1 ; i >= 0 ; i--) { IndividualObservationBatchRowModel row = rows.get(i); // if the row has no data set, then it could be the empty row we are looking for - if (row.getWeight() == null - && row.getSize() == null - && (row.getCaracteristics() == null || row.getCaracteristics().isEmpty()) - && row.getComment() == null - && (row.getAttachment() == null || row.getAttachment().isEmpty())) { + if (row.isEmpty()) { result = row; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 73c1d78..dca0707 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -229,6 +229,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } getModel().recomputeIndividualObservationRowValidState(row); + getModel().recomputeCanEditLengthStep(); } }; @@ -1277,6 +1278,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci tableModel.addNewRow(); } } + + getModel().recomputeCanEditLengthStep(); }); } 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 2527646..8ad71d4 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,25 +765,40 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa boolean result = true; - for (SpeciesFrequencyRowModel row : rows) { + if (rows != null) { + for (SpeciesFrequencyRowModel row : rows) { + + if (row.isEmpty()) { + // la ligne est vide + continue; + } + if (row.getLengthStep() == null || row.getNumber() == null) { + // la ligne n'est pas complete + continue; + } + + // une ligne non vide et complete a ete trouvee + // on ne peut plus editer + result = false; - if (row.isEmpty()) { - // la ligne est vide - continue; - } - if (row.getLengthStep() == null || row.getNumber() == null) { - // la ligne n'est pas complete - continue; } + } - // une ligne non vide et complete a ete trouvee - // on ne peut plus editer - result = false; + if (individualObservationRows != null) { + for (IndividualObservationBatchRowModel row : individualObservationRows) { + if (row.isEmpty()) { + // la ligne est vide + continue; + } + + // une ligne non vide et complete a ete trouvee + // on ne peut plus editer + result = false; + } } setCanEditLengthStep(result); - } public void computeRowWeightWithRtp(SpeciesFrequencyRowModel row) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.