This is an automated email from the git hooks/post-receive script. New commit to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git commit 101ed5a4acbd4633b96403af03af1ad78d985351 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 15:58:06 2016 +0100 check des modifs quand on navigue (refs #6115) --- .../content/protocol/rtp/RtpEditorUIHandler.java | 21 +++++++++++++++------ .../protocol/rtp/actions/EditNextRowAction.java | 2 +- .../protocol/rtp/actions/EditPreviousRowAction.java | 3 ++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java index 34f6d5e..112891c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java @@ -85,6 +85,15 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, @Override public void onCloseUI() { + boolean result = quitUI(); + + if (result) { + getModel().reset(); + ui.dispose(); + } + } + + public boolean quitUI() { boolean result = true; RtpEditorUIModel model = getModel(); @@ -98,15 +107,11 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, // model is not valid, ask user to continue or not - result = askCancelEditBeforeLeaving( - t("tutti.rtpEdit.askCancelEditBeforeLeaving")); + result = quitInvalidRtpForm(); } } - if (result) { - getModel().reset(); - ui.dispose(); - } + return result; } protected boolean quitUnsavedRtpForm() { @@ -134,6 +139,10 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, return result; } + protected boolean quitInvalidRtpForm() { + return askCancelEditBeforeLeaving(t("tutti.rtpEdit.askCancelEditBeforeLeaving")); + } + @Override public SwingValidator<RtpEditorUIModel> getValidator() { return ui.getValidator(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditNextRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditNextRowAction.java index d0ef36c..f4fb190 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditNextRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditNextRowAction.java @@ -17,7 +17,7 @@ public class EditNextRowAction extends SimpleActionSupport<RtpEditorUI> { @Override protected void onActionPerformed(RtpEditorUI rtpEditorUI) { RtpEditorUIModel model = rtpEditorUI.getModel(); - if (!model.isLastRow()) { + if (!model.isLastRow() && rtpEditorUI.getHandler().quitUI()) { model.setRowModel(model.getRow() + 1); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditPreviousRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditPreviousRowAction.java index d948aaa..33334ce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditPreviousRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditPreviousRowAction.java @@ -17,7 +17,8 @@ public class EditPreviousRowAction extends SimpleActionSupport<RtpEditorUI> { @Override protected void onActionPerformed(RtpEditorUI rtpEditorUI) { RtpEditorUIModel model = rtpEditorUI.getModel(); - if (!model.isFirstRow()) { + + if (!model.isFirstRow() && rtpEditorUI.getHandler().quitUI()) { model.setRowModel(model.getRow() - 1); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.