This is an automated email from the git hooks/post-receive script. New commit to branch feature/8219 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ce022f74ef2690517d376c7d773c2b5d79eceb80 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 4 11:58:30 2016 +0200 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) --- .../IndividualObservationBatchTableModel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 fb5dc78..3e272c1 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 @@ -104,7 +104,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab protected Caracteristic lengthstepCaracteristic; - protected Optional<Caracteristic> maturityCaracteristic; + protected Optional<Caracteristic> maturityCaracteristic = Optional.empty(); protected Caracteristic sexCaracteristic; @@ -172,9 +172,15 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab } public void setMaturityCaracteristic(Optional<Caracteristic> maturityCaracteristic) { + if (this.maturityCaracteristic.isPresent()) { + defaultCaracteristicsMap.remove(this.maturityCaracteristic.get()); + } this.maturityCaracteristic = maturityCaracteristic; + if (maturityCaracteristic.isPresent()) { + defaultCaracteristicsMap.put(maturityCaracteristic.get(), null); + } if (rows != null) { - rows.forEach(row -> row.setLengthStepCaracteristic(lengthstepCaracteristic)); + rows.forEach(row -> row.setMaturityCaracteristic(maturityCaracteristic)); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.