branch develop updated (57a0d4e -> 2aad139)
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 57a0d4e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fa6a082 Ajout de logs new 1cde50e Sur l'écran d'édition pas de validateur à enregistrer new 2aad139 Quand on quitte un écran, on nettoye les validateurs The 3 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 2aad139d58f1d1f0af30e740c40a7ee5dea56c39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:19:00 2016 +0200 Quand on quitte un écran, on nettoye les validateurs commit 1cde50ec5686609c3c128f97c12f628a35b3dda1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:18:35 2016 +0200 Sur l'écran d'édition pas de validateur à enregistrer commit fa6a08202d8b5448abcb0bedb661318c0ff49fb4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:18:06 2016 +0200 Ajout de logs Summary of changes: .../ifremer/tutti/ui/swing/content/MainUIHandler.java | 6 ++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 19 +++++++++---------- .../species/create/CreateSpeciesBatchUIHandler.java | 2 ++ .../catches/species/edit/SpeciesBatchUIHandler.java | 1 + .../species/frequency/SpeciesFrequencyUIHandler.java | 1 + .../species/split/SplitSpeciesBatchUIHandler.java | 2 ++ 6 files changed, 21 insertions(+), 10 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 fa6a08202d8b5448abcb0bedb661318c0ff49fb4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:18:06 2016 +0200 Ajout de logs --- .../main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java index 6497829..c544966 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java @@ -303,11 +303,17 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI } public void registerValidator(SwingValidator validator) { + if (log.isInfoEnabled()) { + log.info("Register validator: " + validator.getType() + " - " + validator.getContext() + " (" + validator + ")"); + } ui.getValidatorMessageWidget().registerValidator(validator); } @Override public void clearValidators() { + if (log.isInfoEnabled()) { + log.info("Clean all registred validators."); + } ui.getValidatorMessageWidget().clearValidators(); } -- 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 1cde50ec5686609c3c128f97c12f628a35b3dda1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:18:35 2016 +0200 Sur l'écran d'édition pas de validateur à enregistrer --- .../species/EditSpeciesBatchPanelUIHandler.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 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 6ffbe81..61beab2 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 @@ -30,7 +30,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesB import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; import org.jdesktop.swingx.JXTable; @@ -38,7 +37,6 @@ import org.jdesktop.swingx.JXTable; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.table.TableColumn; -import java.util.Optional; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -141,38 +139,39 @@ public class EditSpeciesBatchPanelUIHandler extends AbstractTuttiUIHandler<EditS JPanel actionPanel = parentContainer.getCreateFishingOperationActions(); actionPanel.setVisible(false); - TuttiUI tuttiUi = null; + + SwingValidator<?> validator = null; switch (card) { case EditSpeciesBatchPanelUI.EDIT_BATCH_CARD: - registerValidators(); actionPanel.setVisible(true); break; case EditSpeciesBatchPanelUI.CREATE_BATCH_CARD: - tuttiUi = ui.getCreateBatchUI(); + validator = ui.getCreateBatchUI().getValidator(); String title = n("tutti.createSpeciesBatch.title"); ui.getCreateBatchUIPanel().setTitle(ui.getEditBatchesUIPanel().getTitle() + " - " + t(title)); break; case EditSpeciesBatchPanelUI.SPLIT_BATCH_CARD: - tuttiUi = ui.getSplitBatchUI(); + validator = ui.getSplitBatchUI().getValidator(); break; case EditSpeciesBatchPanelUI.ADD_SAMPLE_CATEGORY_BATCH_CARD: - tuttiUi = ui.getAddSampleCategoryBatch(); + validator = ui.getAddSampleCategoryBatch().getValidator(); break; case EditSpeciesBatchPanelUI.EDIT_FREQUENCY_CARD: - tuttiUi = ui.getEditFrequenciesUI(); + + validator = ui.getEditFrequenciesUI().getValidator(); break; } - if (tuttiUi != null) { - registerValidators(tuttiUi.getHandler().getValidator()); + if (validator != null) { + registerValidators(validator); } } -- 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 2aad139d58f1d1f0af30e740c40a7ee5dea56c39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 11:19:00 2016 +0200 Quand on quitte un écran, on nettoye les validateurs --- .../operation/catches/species/create/CreateSpeciesBatchUIHandler.java | 2 ++ .../content/operation/catches/species/edit/SpeciesBatchUIHandler.java | 1 + .../operation/catches/species/frequency/SpeciesFrequencyUIHandler.java | 1 + .../operation/catches/species/split/SplitSpeciesBatchUIHandler.java | 2 ++ 4 files changed, 6 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index d32dd16..5f6e09a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -347,6 +347,8 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl log.debug("closing: " + ui); } + clearValidators(); + // evict model from validator ui.getValidator().setBean(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java index 7f2a971..096058c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java @@ -898,6 +898,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec log.debug("Closing: " + ui); } ui.getSpeciesBatchAttachmentsButton().onCloseUI(); + clearValidators(); } //------------------------------------------------------------------------// 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 644e408..ebd4104 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 @@ -827,6 +827,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci // evict model from validator ui.getValidator().setBean(null); + clearValidators(); // when canceling always invalid model (in that way) model.setValid(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java index e739663..ac92fce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java @@ -250,6 +250,8 @@ public class SplitSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spli // evict model from validator ui.getValidator().setBean(null); + clearValidators(); + // when canceling always invalid model getModel().setValid(false); getModel().setSelectedCategory(null); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm