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 3e4a1e80e649ceae6b9f6fd09b070f20c4eb08bb Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 14:40:38 2016 +0200 Ajout d'une méthode pour bloquer la sortie de l'écran des mensurations s'il y a des modifications (See #8272) --- .../species/frequency/SpeciesFrequencyUI.jaxx | 3 +++ .../frequency/SpeciesFrequencyUIHandler.java | 24 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 659f719..a1b3398 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -73,6 +73,9 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } protected int getLengthStepPanelPreferedWidth() { return getWidth() - frequencyModePanel.getPreferredSize().width - histogramPanel.getPreferredSize().width; } + +public boolean leaveIfConfirmed() { return handler.leaveIfConfirmed(); } + ]]></script> <SpeciesFrequencyUIModel id='model' initializer='getContextValue(SpeciesFrequencyUIModel.class)'/> 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 f69115e..f546738 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 @@ -77,6 +77,7 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import javax.swing.JComponent; @@ -714,6 +715,29 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } + public boolean leaveIfConfirmed() { + + boolean result = !getModel().isModify() || askCancelEditBeforeLeaving(); + + if (result) { + + // Cancel edit screen + ApplicationUIAction action = (ApplicationUIAction) getUI().getCancelButton().getAction(); + getContext().getActionEngine().runInternalAction(action.getLogicAction()); + + } else { + + // Use cancel this operation + if (log.isInfoEnabled()) { + log.info("Use cancel change on tab, stay on frequencies screen."); + } + + } + + return result; + + } + public boolean askCancelEditBeforeLeaving() { // Ask confirmation to quit screen String htmlMessage = String.format(AbstractApplicationUIHandler.CONFIRMATION_FORMAT, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.