branch develop updated (a046170 -> 7386836)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a046170 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7386836 on vérifie qu'il y a une demande ouverte avant de la mettre devant (fixes #8275) The 1 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 738683622445bb4a3f05029ffaa0762820e57e30 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 25 11:55:38 2016 +0200 on vérifie qu'il y a une demande ouverte avant de la mettre devant (fixes #8275) Summary of changes: .../faxtomail/ui/swing/actions/AbstractFaxToMailAction.java | 12 ++++++++++++ .../content/attachment/actions/EditAttachmentAction.java | 2 +- .../demande/actions/OpenMailFolderChooserFromListAction.java | 2 +- .../swing/content/demande/actions/OpenReplyFormAction.java | 2 +- .../content/demande/actions/SaveAndOpenModalFrameAction.java | 2 +- 5 files changed, 16 insertions(+), 4 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 738683622445bb4a3f05029ffaa0762820e57e30 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 25 11:55:38 2016 +0200 on vérifie qu'il y a une demande ouverte avant de la mettre devant (fixes #8275) --- .../faxtomail/ui/swing/actions/AbstractFaxToMailAction.java | 12 ++++++++++++ .../content/attachment/actions/EditAttachmentAction.java | 2 +- .../demande/actions/OpenMailFolderChooserFromListAction.java | 2 +- .../swing/content/demande/actions/OpenReplyFormAction.java | 2 +- .../content/demande/actions/SaveAndOpenModalFrameAction.java | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java index c5daf06..0752623 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java @@ -30,6 +30,8 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import org.jdesktop.beans.AbstractBean; import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; +import javax.swing.JFrame; + /** * FaxToMail base action. * @@ -77,4 +79,14 @@ public abstract class AbstractFaxToMailAction <M extends AbstractBean, UI extend progressionModel.adaptTotal(total); } } + + /** + * On met la fenetre de la demande courante en avant (en général, c'est pour pouvoir remettre une autre fenetre devant...) + */ + protected void bringCurrentDemandToFront() { + JFrame frameForDemande = getContext().getFrameForDemande(getContext().getCurrentEmail()); + if (frameForDemande != null) { + frameForDemande.toFront(); + } + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java index 47bd813..01bab80 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java @@ -101,7 +101,7 @@ public class EditAttachmentAction extends AbstractFaxToMailAction<AttachmentEdit SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - getContext().getFrameForDemande(getContext().getCurrentEmail()).toFront(); + bringCurrentDemandToFront(); if (frame != null) { frame.toFront(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java index 3b1cd2a..953735f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java @@ -108,8 +108,8 @@ public class OpenMailFolderChooserFromListAction extends AbstractFaxToMailAction SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - getContext().getFrameForDemande(getContext().getCurrentEmail()).toFront(); + bringCurrentDemandToFront(); if (frame != null) { frame.toFront(); frame = null; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java index 47f5573..aa5f964 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java @@ -98,8 +98,8 @@ public class OpenReplyFormAction extends AbstractFaxToMailAction<DemandeListUIMo SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - getContext().getFrameForDemande(getContext().getCurrentEmail()).toFront(); + bringCurrentDemandToFront(); if (frame != null) { frame.toFront(); frame = null; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java index c2603b8..bece8d4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java @@ -61,8 +61,8 @@ public abstract class SaveAndOpenModalFrameAction<FC extends ApplicationUI> exte SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - getContext().getFrameForDemande(getContext().getCurrentEmail()).toFront(); + bringCurrentDemandToFront(); if (frame != null) { frame.toFront(); frame = null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm