branch feature/6115_ajout_RTP updated (8cc4b09 -> 6945e03)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from 8cc4b09 conversion entre index de vue et de modele (refs #6115) new 101ed5a check des modifs quand on navigue (refs #6115) new 6945e03 repasser les dialog au dessus de l'editeur (refs #6115) The 2 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 6945e036cd927b6033728ef41d05fb49974af1f4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 16:03:57 2016 +0100 repasser les dialog au dessus de l'editeur (refs #6115) 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) Summary of changes: .../content/protocol/rtp/RtpEditorUIHandler.java | 31 +++++++++++++++------- .../protocol/rtp/actions/EditNextRowAction.java | 2 +- .../rtp/actions/EditPreviousRowAction.java | 3 ++- 3 files changed, 25 insertions(+), 11 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 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>.
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 6945e036cd927b6033728ef41d05fb49974af1f4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 16:03:57 2016 +0100 repasser les dialog au dessus de l'editeur (refs #6115) --- .../ui/swing/content/protocol/rtp/RtpEditorUIHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 112891c..8d1a86f 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 @@ -13,6 +13,7 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.RowSorter; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -119,9 +120,7 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, boolean result; - String message = t("tutti.rtpEdit.askSaveBeforeLeaving"); - - int answer = askSaveBeforeLeaving(message); + int answer = askSaveBeforeLeaving(t("tutti.rtpEdit.askSaveBeforeLeaving")); switch (answer) { case JOptionPane.YES_OPTION: getContext().getActionEngine().runAction(ui.getSaveButton()); @@ -148,6 +147,11 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, return ui.getValidator(); } + @Override + public Component getTopestUI() { + return getUI(); + } + public void setBean(EditProtocolSpeciesTableModel tableModel, RowSorter rowSorter, int row) { getModel().setRowModel(tableModel, rowSorter, row); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm