This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ed5a12fbc29263c041277137f9b0af90fe5d735f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 13 06:44:20 2016 +0100 Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) --- .../species/frequency/SpeciesFrequencyUIHandler.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 9316275..5744459 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 @@ -769,19 +769,20 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } } + // Add maturity column if necessary + + Optional<Caracteristic> maturityCaracteristic = speciesMaturityPmfmId.map(maturityCaracteristics::get); + + if (maturityCaracteristic.isPresent()) { + addMaturityCaracteristicColumnToModel(maturityCaracteristic.get()); + } + List<IndividualObservationBatchRowModel> individualObservations = speciesBatch.getIndividualObservation(); // try to load existing frequency if (CollectionUtils.isNotEmpty(individualObservations)) { - Optional<Caracteristic> maturityCaracteristic = - speciesMaturityPmfmId.map(pmfmId -> maturityCaracteristics.get(pmfmId)); - - if (maturityCaracteristic.isPresent()) { - addMaturityCaracteristicColumnToModel(maturityCaracteristic.get()); - } - IndividualObservationBatchTableModel tableModel = getObsTableModel(); tableModel.setRows(new ArrayList<>()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.