This is an automated email from the git hooks/post-receive script. New commit to branch feature/8231 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c1df9c4a3b1edabc4790490722bb01ab2843aa5e Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 11 11:46:37 2016 +0200 on ne stocke pas la caracteristique de maturité sur la ligne, on la passe à la méthode get (comme pour le sex) (refs #8231) --- .../IndividualObservationBatchRowModel.java | 10 +++------- .../IndividualObservationBatchTableModel.java | 14 +++++--------- 2 files changed, 8 insertions(+), 16 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 b57a3ed..fc39ffc 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 @@ -483,15 +483,11 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel return (CaracteristicQualitativeValue) getCaracteristicValue(sexCaracteristic); } - public Optional<Caracteristic> getMaturityCaracteristic() { - return maturityCaracteristic; + public CaracteristicQualitativeValue getMaturityState(Caracteristic maturityCaracteristic) { + return (CaracteristicQualitativeValue) getCaracteristicValue(maturityCaracteristic); } - public void setMaturityCaracteristic(Optional<Caracteristic> maturityCaracteristic) { - this.maturityCaracteristic = maturityCaracteristic; - } - - public Optional<CaracteristicQualitativeValue> getMaturityState() { + public Optional<CaracteristicQualitativeValue> getMaturityState(Optional<Caracteristic> maturityCaracteristic) { if (!maturityCaracteristic.isPresent()) { return Optional.empty(); } 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 81d0a6a..8209aa3 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 @@ -99,10 +99,10 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab protected Caracteristic lengthstepCaracteristic; - protected Optional<Caracteristic> maturityCaracteristic = Optional.empty(); - protected Caracteristic sexCaracteristic; + protected Optional<Caracteristic> maturityCaracteristic = Optional.empty(); + public IndividualObservationBatchTableModel(WeightUnit weightUnit, Collection<Caracteristic> defaultCaracteristicsSet, Caracteristic sexCaracteristic, @@ -147,9 +147,6 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab if (maturityCaracteristic.isPresent()) { defaultCaracteristicsMap.put(maturityCaracteristic.get(), null); } - if (rows != null) { - rows.forEach(row -> row.setMaturityCaracteristic(maturityCaracteristic)); - } } public void addMaturityIdentifier(ColumnIdentifier<IndividualObservationBatchRowModel> maturityIdentifer) { @@ -177,7 +174,6 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab result.setSpecies(species); result.setSamplingCodePrefix(samplingCodePrefix); result.setLengthStepCaracteristic(lengthstepCaracteristic); - result.setMaturityCaracteristic(maturityCaracteristic); if (getRowCount() > 0) { IndividualObservationBatchRowModel lastRow = getRows().get(getRowCount() - 1); @@ -185,9 +181,9 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab CaracteristicQualitativeValue gender = lastRow.getGender(sexCaracteristic); result.getDefaultCaracteristics().put(sexCaracteristic, gender); - Optional<CaracteristicQualitativeValue> maturityState = lastRow.getMaturityState(); - if (maturityCaracteristic.isPresent() && maturityState.isPresent()) { - result.getDefaultCaracteristics().put(maturityCaracteristic.get(), maturityState.get()); + if (maturityCaracteristic.isPresent()) { + CaracteristicQualitativeValue maturityState = lastRow.getMaturityState(maturityCaracteristic.get()); + result.getDefaultCaracteristics().put(maturityCaracteristic.get(), maturityState); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.