branch feature/8228 updated (60197f1 -> 3af1db2)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 60197f1 Ne pas utiliser d'optional à tout bout de champ zone new 8242c25 Ne pas utiliser d'optional à tout bout de champ new 3af1db2 Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics The 2 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 3af1db2e7e4c6180d2d8abd943e5aecc592b76d4 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 commit 8242c256b66f24fceabb475c3688d05ef9b12749 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:22:14 2016 +0200 Ne pas utiliser d'optional à tout bout de champ Summary of changes: .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 49 +++++++++++----------- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 3 files changed, 28 insertions(+), 27 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 feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 8242c256b66f24fceabb475c3688d05ef9b12749 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:22:14 2016 +0200 Ne pas utiliser d'optional à tout bout de champ --- .../operation/catches/species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java index 2e98a91..6ffbe81 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java @@ -116,7 +116,7 @@ public class EditSpeciesBatchPanelUIHandler extends AbstractTuttiUIHandler<EditS editBatchTitle, "", false); - frequencyEditor.getHandler().editBatch(editor, Optional.of(frequenciesTitle)); + frequencyEditor.getHandler().editBatch(editor, frequenciesTitle); // open frequency editor ui.switchToEditFrequency(); 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 7c6684d..4b10188 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 @@ -870,7 +870,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci context.removeVetoableChangeListener(TuttiUIContext.PROPERTY_SCREEN, changeScreenListener); } - public void editBatch(FrequencyCellEditor editor, Optional<String> optionalTitle) { + public void editBatch(FrequencyCellEditor editor, String title) { SpeciesBatchRowModel speciesBatch = editor.getEditRow(); Objects.requireNonNull(speciesBatch, "Impossible d'éditer un lot non renseigné"); @@ -883,9 +883,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci maturityColumnId = Optional.empty(); } - if (optionalTitle.isPresent()) { + if (title != null) { - String title = optionalTitle.get(); frequenciesHistogramPopup.setTitle(title + t("tutti.editSpeciesFrequencies.title")); averageWeightsHistogramPopup.setTitle(title + weightUnit.decorateLabel(t("tutti.editSpeciesFrequencies.field.graphAverageWeight"))); -- 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 feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3af1db2e7e4c6180d2d8abd943e5aecc592b76d4 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 4b10188..dfac51b 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 @@ -180,7 +180,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci protected VetoableChangeListener changeScreenListener; - protected Optional<CaracteristicColumnIdentifier<IndividualObservationBatchRowModel>> maturityColumnId = Optional.empty(); + protected CaracteristicColumnIdentifier<IndividualObservationBatchRowModel> maturityColumnId; protected SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; @@ -852,12 +852,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(); @@ -876,12 +871,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) { @@ -1425,14 +1415,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(); @@ -1463,7 +1455,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, @@ -1917,4 +1909,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>.
participants (1)
-
codelutin.com scm