This is an automated email from the git hooks/post-receive script. New commit to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit efb7f6354b81827ebaefaf5d3f28b6b54b68b46e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:04:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue --- .../service/sampling/CruiseSamplingCache.java | 8 +++--- .../IndividualObservationBatchTableModel.java | 5 ++-- .../frequency/IndividualObservationUICache.java | 31 +++++++--------------- .../frequency/SpeciesFrequencyUIHandler.java | 14 +++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 9 +++---- 5 files changed, 28 insertions(+), 39 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index bfde9b2..01cb50a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -794,11 +794,11 @@ public class CruiseSamplingCache implements Closeable { return maturity; } - public Boolean getMaturity(int speciesId, Optional<CaracteristicQualitativeValue> maturityQualitativeValue) { + public Boolean getMaturity(int speciesId, CaracteristicQualitativeValue maturityQualitativeValue) { Boolean maturity = null; - Optional<Caracteristic> maturityCaracteristic = Optional.ofNullable(maturityCaracteristicBySpecies.get(speciesId)); - if (maturityCaracteristic.isPresent() && maturityQualitativeValue.isPresent()) { - maturity = matureStatesByMaturityCracteristic.containsEntry(maturityCaracteristic.get().getId(), maturityQualitativeValue.get().getId()); + Caracteristic maturityCaracteristic = maturityCaracteristicBySpecies.get(speciesId); + if (maturityCaracteristic != null && maturityQualitativeValue != null) { + maturity = matureStatesByMaturityCracteristic.containsEntry(maturityCaracteristic.getId(), maturityQualitativeValue.getId()); } return maturity; } 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 f7cb8ae..8a6a924 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 @@ -37,7 +37,6 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -182,8 +181,8 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab parentModel.setGenderValueToDefaultCaracterictis(result, gender); if (parentModel.withMaturityCaracteristic()) { - Optional<CaracteristicQualitativeValue> maturityState = parentModel.getOptionalMaturityValue(lastRow); - parentModel.setMaturityValueToDefaultCaracterictis(result, maturityState.orElse(null)); + CaracteristicQualitativeValue maturityState = parentModel.getMaturityValue(lastRow); + parentModel.setMaturityValueToDefaultCaracterictis(result, maturityState); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java index f441d61..d05bd2e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java @@ -214,7 +214,7 @@ public class IndividualObservationUICache implements Closeable { public void increments(IndividualObservationBatchRowModel row) { incrementsObservationNb(uiModel.getGender(row), - uiModel.getOptionalMaturityValue(row), + uiModel.getMaturityValue(row), row.getSize(), row.getOptionalSamplingCode()); @@ -226,21 +226,10 @@ public class IndividualObservationUICache implements Closeable { * @param gender le sexe * @param maturityQualitativeValue l'état de maturité * @param lengthStep la classe de taille - */ - public void incrementsObservationNb(CaracteristicQualitativeValue gender, Optional<CaracteristicQualitativeValue> maturityQualitativeValue, float lengthStep) { - incrementsObservationNb(gender, maturityQualitativeValue, lengthStep, Optional.empty()); - } - - /** - * Ajoute une observation individuelle via ses composantes (sexe, maturité, classe de taille) dans le cache. - * - * @param gender le sexe - * @param maturityQualitativeValue l'état de maturité - * @param lengthStep la classe de taille * @param samplingCode le code de prélèvement ajouté s'il y en a un */ public void incrementsObservationNb(CaracteristicQualitativeValue gender, - Optional<CaracteristicQualitativeValue> maturityQualitativeValue, + CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep, Optional<String> samplingCode) { @@ -272,8 +261,8 @@ public class IndividualObservationUICache implements Closeable { * @param samplingCode le code de prélèvement ajouté */ public void incrementsSamplingNb(CaracteristicQualitativeValue gender, - Optional<CaracteristicQualitativeValue> maturityQualitativeValue, - Float lengthStep, + CaracteristicQualitativeValue maturityQualitativeValue, + float lengthStep, String samplingCode) { if (!on) { @@ -284,7 +273,7 @@ public class IndividualObservationUICache implements Closeable { } Boolean maturity = samplingCache.getMaturity(uiModel.getBatch().getSpecies().getReferenceTaxonId(), maturityQualitativeValue); - Integer lengthStepInMm = lengthStep == null ? null : uiModel.getLengthStepInMm(lengthStep); + int lengthStepInMm = uiModel.getLengthStepInMm(lengthStep); samplingCache.addSampling(fishingOperation, species, gender, @@ -305,7 +294,7 @@ public class IndividualObservationUICache implements Closeable { public void decrements(IndividualObservationBatchRowModel row) { decrementsObservationNb(uiModel.getGender(row), - uiModel.getOptionalMaturityValue(row), + uiModel.getMaturityValue(row), row.getSize(), row.getOptionalSamplingCode()); @@ -318,7 +307,7 @@ public class IndividualObservationUICache implements Closeable { * @param maturityQualitativeValue l'état de maturité * @param lengthStep la classe de taille */ - public void decrementsObservationNb(CaracteristicQualitativeValue gender, Optional<CaracteristicQualitativeValue> maturityQualitativeValue, float lengthStep) { + public void decrementsObservationNb(CaracteristicQualitativeValue gender, CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep) { decrementsObservationNb(gender, maturityQualitativeValue, lengthStep, Optional.empty()); } @@ -332,7 +321,7 @@ public class IndividualObservationUICache implements Closeable { * @param samplingCode le code de prélèvement supprimée */ public void decrementsObservationNb(CaracteristicQualitativeValue gender, - Optional<CaracteristicQualitativeValue> maturityQualitativeValue, + CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep, Optional<String> samplingCode) { @@ -364,7 +353,7 @@ public class IndividualObservationUICache implements Closeable { * @param samplingCode le code de prélèvement supprimé */ public void decrementsSamplingNb(CaracteristicQualitativeValue gender, - Optional<CaracteristicQualitativeValue> maturityQualitativeValue, + CaracteristicQualitativeValue maturityQualitativeValue, Float lengthStep, String samplingCode) { @@ -471,7 +460,7 @@ public class IndividualObservationUICache implements Closeable { IndividualObservationBatchRowModel selectedRow = optSelectedRow.get(); - Optional<CaracteristicQualitativeValue> maturityQualitativeValue = uiModel.getOptionalMaturityValue(selectedRow); + CaracteristicQualitativeValue maturityQualitativeValue = uiModel.getMaturityValue(selectedRow); Boolean maturity = samplingCache.getMaturity(uiModel.getBatch().getSpecies().getReferenceTaxonId(), maturityQualitativeValue); int lengthstep = uiModel.getLengthStepInMm(selectedRow.getSize()); 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 c2b8b6d..c1b2c88 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 @@ -217,7 +217,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyUIModel model = getModel(); CaracteristicQualitativeValue gender = model.getGender(row); - Optional<CaracteristicQualitativeValue> maturity = model.getOptionalMaturityValue(row); + CaracteristicQualitativeValue maturity = model.getMaturityValue(row); switch (propertyName) { case IndividualObservationBatchRowModel.PROPERTY_SIZE: { @@ -293,8 +293,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } if (model.withMaturityCaracteristic()) { - Optional<CaracteristicQualitativeValue> oldMaturity = model.getOptionalMaturityValue(oldValue); - Optional<CaracteristicQualitativeValue> newMaturity = model.getOptionalMaturityValue(newValue); + CaracteristicQualitativeValue oldMaturity = model.getMaturityValue(oldValue); + CaracteristicQualitativeValue newMaturity = model.getMaturityValue(newValue); if (log.isInfoEnabled()) { log.info("maturities : " + oldMaturity + " " + newMaturity); } @@ -316,14 +316,16 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci case IndividualObservationBatchRowModel.PROPERTY_SAMPLING_CODE: if (row.withSize()) { + float size = row.getSize(); + String oldValue = (String) evt.getOldValue(); String newValue = (String) evt.getNewValue(); if (StringUtils.isNotBlank(oldValue)) { - individualObservationUICache.decrementsSamplingNb(gender, maturity, row.getSize(), oldValue); + individualObservationUICache.decrementsSamplingNb(gender, maturity, size, oldValue); } if (StringUtils.isNotBlank(newValue)) { - individualObservationUICache.incrementsSamplingNb(gender, maturity, row.getSize(), newValue); + individualObservationUICache.incrementsSamplingNb(gender, maturity, size, newValue); } } break; @@ -420,7 +422,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci // clean log table SpeciesFrequencyLogsTableModel logsTableModel = (SpeciesFrequencyLogsTableModel) ui.getLogsTable().getModel(); - logsTableModel.setRows(Lists.<SpeciesFrequencyLogRowModel>newArrayList()); + logsTableModel.setRows(new ArrayList<>()); getModel().setModify(false); 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 93a31b7..377d728 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 @@ -51,7 +51,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; /** @@ -1092,23 +1091,23 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_MATURITY_CARACTERISTIC, oldValue, maturityCaracteristic); } - public Optional<CaracteristicQualitativeValue> getOptionalMaturityValue(IndividualObservationBatchRowModel row) { + public CaracteristicQualitativeValue getMaturityValue(IndividualObservationBatchRowModel row) { CaracteristicQualitativeValue caracteristicValue = null; if (withMaturityCaracteristic()) { caracteristicValue = row.getCaracteristicQualitativeValue(maturityCaracteristic); } - return Optional.ofNullable(caracteristicValue); + return caracteristicValue; } - public Optional<CaracteristicQualitativeValue> getOptionalMaturityValue(CaracteristicMap caracteristicMap) { + public CaracteristicQualitativeValue getMaturityValue(CaracteristicMap caracteristicMap) { CaracteristicQualitativeValue caracteristicValue = null; if (withMaturityCaracteristic()) { caracteristicValue = caracteristicMap.getQualitativeValue(maturityCaracteristic); } - return Optional.ofNullable(caracteristicValue); + return caracteristicValue; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.