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 b615d8bcc96174af297896298ec91d95252f4a0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:31:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics --- .../frequency/SpeciesFrequencyUIHandler.java | 44 +++++++++++----------- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 2 files changed, 25 insertions(+), 23 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 08a0107..c630fae 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 @@ -181,7 +181,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci protected VetoableChangeListener changeScreenListener; - protected Optional<CaracteristicColumnIdentifier<IndividualObservationBatchRowModel>> maturityColumnId = Optional.empty(); + protected CaracteristicColumnIdentifier<IndividualObservationBatchRowModel> maturityColumnId; protected SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; @@ -853,12 +853,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci parent.switchToEditBatch(); // on supprime la colonne maturité en fermant, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) - if (maturityColumnId.isPresent()) { - TableColumnExt maturityColumn = ui.getObsTable().getColumnExt(maturityColumnId.get()); - ui.getObsTable().removeColumn(maturityColumn); - getObsTableModel().removeMaturityIdentifier(maturityColumnId.get()); - maturityColumnId = Optional.empty(); - } + removeMaturityColumnIfPresent(); TuttiUIContext context = getContext(); @@ -877,12 +872,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci Objects.requireNonNull(speciesBatch, "Impossible d'éditer un lot non renseigné"); // on enlève la colonne spécifique à l'espèce précédente - if (maturityColumnId.isPresent()) { - TableColumnExt maturityColumn = ui.getObsTable().getColumnExt(maturityColumnId.get()); - ui.getObsTable().removeColumn(maturityColumn); - getObsTableModel().removeMaturityIdentifier(maturityColumnId.get()); - maturityColumnId = Optional.empty(); - } + removeMaturityColumnIfPresent(); if (title != null) { @@ -1426,14 +1416,16 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci TableColumnModelExt columnModel = (TableColumnModelExt) obsTable.getColumnModel(); - maturityColumnId = Optional.of(addCaracteristicColumnToModel(obsTable, - columnModel, - caracteristicDecorator, - caracteristicTipDecorator, - caracteristicQualitativeDecorator, - caracteristic)); + maturityColumnId = addCaracteristicColumnToModel(obsTable, + columnModel, + caracteristicDecorator, + caracteristicTipDecorator, + caracteristicQualitativeDecorator, + caracteristic); + + Objects.requireNonNull(maturityColumnId); - getObsTableModel().addMaturityIdentifier(maturityColumnId.get()); + getObsTableModel().addMaturityIdentifier(maturityColumnId); // on cherche le bon index où insérer la colonne maturité (avant les autres caractéristiques, mais elle peut etre cachee) int modelIndex = columnModel.getColumnExt(IndividualObservationBatchTableModel.OTHER_CARACTERISTICS).getModelIndex(); @@ -1464,7 +1456,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, @@ -1918,4 +1910,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setCanDisplayNotifications(true); } } + + protected void removeMaturityColumnIfPresent() { + if (maturityColumnId != null) { + TableColumnExt maturityColumn = ui.getObsTable().getColumnExt(maturityColumnId); + ui.getObsTable().removeColumn(maturityColumn); + getObsTableModel().removeMaturityIdentifier(maturityColumnId); + maturityColumnId = null; + } + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java index 9b3c83e..e8e8150 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java @@ -39,13 +39,13 @@ public class CaracteristicColumnIdentifier<R> extends ColumnIdentifier<R> { private static final long serialVersionUID = 1L; - public static <R> CaracteristicColumnIdentifier newCaracteristicId( + public static <R> CaracteristicColumnIdentifier<R> newCaracteristicId( Caracteristic caracteristic, String propertyName, String headerI18nKey, String headerTipI18nKey) { - return new CaracteristicColumnIdentifier<R>(caracteristic, propertyName, + return new CaracteristicColumnIdentifier<>(caracteristic, propertyName, headerI18nKey, headerTipI18nKey ); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.