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 2ced35f8f4d76a4f260cb4ccdba3f24c1c6857cd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 05:23:59 2016 +0200 Vérifier qu'on peut quitter l'écran des mensurations si on tente de quitter l'opération en cours (uniquement sur les actions de changement d'opération) (see #8221) --- .../actions/EditFishingOperationAction.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java index 4c359ef..9b6a6bd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java @@ -50,6 +50,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.SecondaryVesselTypeEnum; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.SaveCatchBatchAction; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeciesBatchPanelUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -331,6 +333,35 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati canContinue = handler.askCancelEditBeforeLeaving(message); } } + + if (canContinue) { + + // check can quit frequency ui (if on it) + if (EditCatchesUI.class.equals(getUI().getTabPane().getSelectedComponent().getClass())) { + // on est sur l'onglet captures + + if (EditSpeciesBatchPanelUI.class.equals(getUI().getCatchesTabContent().getTabPane().getSelectedComponent().getClass())) { + + // on est sur l'onglet espèce ou benthos + EditSpeciesBatchPanelUI speciesOrBenthosUI = (EditSpeciesBatchPanelUI) getUI().getCatchesTabContent().getTabPane().getSelectedComponent(); + if (EditSpeciesBatchPanelUI.EDIT_FREQUENCY_CARD.equals(speciesOrBenthosUI.getTopPanelLayout().getSelected())) { + + // on est sur l'écran des mensurations / observations individuelles + SpeciesFrequencyUI editFrequenciesUI = speciesOrBenthosUI.getEditFrequenciesUI(); + + if (editFrequenciesUI.getModel().isModify()) { + + // Ask confirmation to quit screen + if (log.isInfoEnabled()) { + log.info("Frequencies model was modified, ask user confirmation."); + } + canContinue = editFrequenciesUI.getHandler().askCancelEditBeforeLeaving(); + } + + } + } + } + } } if (!canContinue) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.