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 8bccbbc737559f9d5bd4659b4ec0d81cf5c3398d 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 c1b2c88..a51c3c6 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 @@ -855,7 +855,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } - 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é"); @@ -868,9 +868,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>.