branch develop updated (76a7d22 -> 6d1d0ff)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 76a7d22 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 6d1d0ff Moins utiliser les Optional + fix generic issue The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6d1d0ff4fb430818c11d9fa24a7869317a7a8597 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:37:45 2016 +0200 Moins utiliser les Optional + fix generic issue Summary of changes: .../IndividualObservationBatchRowModel.java | 5 ----- .../frequency/IndividualObservationUICache.java | 19 +++++++++---------- .../species/frequency/SpeciesFrequencyUIHandler.java | 10 +++++----- 3 files changed, 14 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6d1d0ff4fb430818c11d9fa24a7869317a7a8597 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:37:45 2016 +0200 Moins utiliser les Optional + fix generic issue --- .../IndividualObservationBatchRowModel.java | 5 ----- .../frequency/IndividualObservationUICache.java | 19 +++++++++---------- .../species/frequency/SpeciesFrequencyUIHandler.java | 10 +++++----- 3 files changed, 14 insertions(+), 20 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 1d62c39..a9ad8d0 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 @@ -48,7 +48,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Optional; /** * @author Kevin Morin - kmorin@codelutin.com @@ -382,10 +381,6 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel firePropertyChange(PROPERTY_SAMPLING_CODE, oldValue, samplingCode); } - public Optional<String> getOptionalSamplingCode() { - return Optional.ofNullable(editObject.getSamplingCode()); - } - public Integer getSamplingCodeId() { return SamplingCodePrefix.extractSamplingCodeIdFromSamplingCode(getSamplingCode()); } 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 3ebe8b7..8dc68e5 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 @@ -46,7 +46,6 @@ import java.beans.PropertyChangeListener; import java.io.Closeable; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.TreeSet; @@ -216,7 +215,7 @@ public class IndividualObservationUICache implements Closeable { incrementsObservationNb(uiModel.getGender(row), uiModel.getMaturityValue(row), row.getSize(), - row.getOptionalSamplingCode()); + row.getSamplingCode()); } @@ -231,7 +230,7 @@ public class IndividualObservationUICache implements Closeable { public void incrementsObservationNb(CaracteristicQualitativeValue gender, CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep, - Optional<String> samplingCode) { + String samplingCode) { if (!on) { if (log.isDebugEnabled()) { @@ -247,8 +246,8 @@ public class IndividualObservationUICache implements Closeable { maturity, uiModel.getLengthStepInMm(lengthStep)); - if (samplingCode.isPresent()) { - incrementsSamplingNb(gender, maturityQualitativeValue, lengthStep, samplingCode.get()); + if (samplingCode!=null) { + incrementsSamplingNb(gender, maturityQualitativeValue, lengthStep, samplingCode); } } @@ -296,7 +295,7 @@ public class IndividualObservationUICache implements Closeable { decrementsObservationNb(uiModel.getGender(row), uiModel.getMaturityValue(row), row.getSize(), - row.getOptionalSamplingCode()); + row.getSamplingCode()); } @@ -309,7 +308,7 @@ public class IndividualObservationUICache implements Closeable { */ public void decrementsObservationNb(CaracteristicQualitativeValue gender, CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep) { - decrementsObservationNb(gender, maturityQualitativeValue, lengthStep, Optional.empty()); + decrementsObservationNb(gender, maturityQualitativeValue, lengthStep, null); } /** @@ -323,7 +322,7 @@ public class IndividualObservationUICache implements Closeable { public void decrementsObservationNb(CaracteristicQualitativeValue gender, CaracteristicQualitativeValue maturityQualitativeValue, float lengthStep, - Optional<String> samplingCode) { + String samplingCode) { if (!on) { if (log.isDebugEnabled()) { @@ -339,8 +338,8 @@ public class IndividualObservationUICache implements Closeable { maturity, uiModel.getLengthStepInMm(lengthStep)); - if (samplingCode.isPresent()) { - decrementsSamplingNb(gender, maturityQualitativeValue, lengthStep, samplingCode.get()); + if (samplingCode != null) { + decrementsSamplingNb(gender, maturityQualitativeValue, lengthStep, samplingCode); } } 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 755015d..60371b7 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 @@ -226,10 +226,10 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci Float newValue = (Float) evt.getNewValue(); if (oldValue != null) { - individualObservationUICache.decrementsObservationNb(gender, maturity, oldValue, row.getOptionalSamplingCode()); + individualObservationUICache.decrementsObservationNb(gender, maturity, oldValue, row.getSamplingCode()); } if (newValue != null) { - individualObservationUICache.incrementsObservationNb(gender, maturity, newValue, row.getOptionalSamplingCode()); + individualObservationUICache.incrementsObservationNb(gender, maturity, newValue, row.getSamplingCode()); } // we only update the frequencies if the row is valid @@ -300,7 +300,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } if (!Objects.equals(oldMaturity, newMaturity)) { individualObservationUICache.decrementsObservationNb(gender, oldMaturity, row.getSize()); - individualObservationUICache.incrementsObservationNb(gender, newMaturity, row.getSize(), row.getOptionalSamplingCode()); + individualObservationUICache.incrementsObservationNb(gender, newMaturity, row.getSize(), row.getSamplingCode()); } } @@ -308,7 +308,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci CaracteristicQualitativeValue newGender = model.getGender(newValue); if (!Objects.equals(oldGender, newGender)) { individualObservationUICache.decrementsObservationNb(oldGender, maturity, row.getSize()); - individualObservationUICache.incrementsObservationNb(newGender, maturity, row.getSize(), row.getOptionalSamplingCode()); + individualObservationUICache.incrementsObservationNb(newGender, maturity, row.getSize(), row.getSamplingCode()); } } break; @@ -1440,7 +1440,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci String header = caracteristicDecorator.toString(caracteristic); String headerTip = caracteristicTipDecorator.toString(caracteristic); - CaracteristicColumnIdentifier id = CaracteristicColumnIdentifier.newCaracteristicId( + CaracteristicColumnIdentifier<IndividualObservationBatchRowModel> id = CaracteristicColumnIdentifier.newCaracteristicId( caracteristic, IndividualObservationBatchRowModel.PROPERTY_DEFAULT_CARACTERISTICS, header, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm