This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 78bce3236534824db2b722279c81742ac40da479 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:36:31 2014 +0100 fixes #3575: Using best ui to diplay messages in actions --- .../swing/action/AbstractApplicationAction.java | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java index a2fe71c..2709041 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java @@ -345,8 +345,10 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten t("jaxx.application.common.askOverwriteFile.message", file), t("jaxx.application.common.askOverwriteFile.help")); + Component ui = getDialogParentComponent(); + result = JOptionPane.showConfirmDialog( - getHandler().getTopestUI(), + ui, htmlMessage, t("jaxx.application.common.askOverwriteFile.title"), JOptionPane.OK_CANCEL_OPTION, @@ -364,8 +366,9 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten AbstractApplicationUIHandler.CONFIRMATION_FORMAT, message, t("jaxx.application.common.askBeforeDelete.help")); + Component ui = getDialogParentComponent(); int i = JOptionPane.showConfirmDialog( - getHandler().getTopestUI(), + ui, htmlMessage, title, JOptionPane.OK_CANCEL_OPTION, @@ -377,8 +380,9 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten protected void displayInfoMessage(String title, String message) { String htmlMessage = String.format(MESAGE_FORMAT, message); + Component ui = getDialogParentComponent(); JOptionPane.showMessageDialog( - getHandler().getTopestUI(), + ui, htmlMessage, title, JOptionPane.INFORMATION_MESSAGE); @@ -386,8 +390,10 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten protected void displayWarningMessage(String title, String message) { String htmlMessage = String.format(MESAGE_FORMAT, message); + + Component ui = getDialogParentComponent(); JOptionPane.showMessageDialog( - getHandler().getTopestUI(), + ui, htmlMessage, title, JOptionPane.WARNING_MESSAGE); @@ -395,13 +401,22 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten protected void displayErrorMessage(String title, String message) { String htmlMessage = String.format(MESAGE_FORMAT, message); + Component ui = getDialogParentComponent(); JOptionPane.showMessageDialog( - getHandler().getTopestUI(), + ui, htmlMessage, title, JOptionPane.ERROR_MESSAGE); } + protected Component getDialogParentComponent() { + Component ui = getContext().getMainUI(); + if (ui==null) { + ui = getHandler().getTopestUI(); + } + return ui; + } + protected void createProgressionModelIfRequired(int total) { ApplicationProgressionModel progressionModel = getProgressionModel(); if (progressionModel == null) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.