branch develop updated (892ef1a9 -> 2d3e3460)
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 892ef1a9 Merge branch 'feature/calculatrice' into develop new 2d3e3460 refs #9931 - Fixes small hitches 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 2d3e3460b572d6287abba13d8250fc3ae0a486b2 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:49:18 2018 +0200 refs #9931 - Fixes small hitches Summary of changes: .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 12 ++---------- .../franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- 2 files changed, 3 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2d3e3460b572d6287abba13d8250fc3ae0a486b2 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:49:18 2018 +0200 refs #9931 - Fixes small hitches --- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 12 ++---------- .../franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 413ffe9f..f19da07d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -248,16 +248,8 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, initBeanFilterableComboBox(ui.getWaitingStateComboBox(), waitingStates, model.getWaitingState()); final JPanel editorPanel = ui.getMailBodyPanel(); - //FaxToMailUIUtil.setEmailContentInTextPane(this, model, editorPanel, getConfig()); - //FaxToMailUIUtil.initScrollPaneBars(getUI().getMailBodyScrollPane()); - - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - FaxToMailUIUtil.setEmailContentInTextPane(DemandeUIHandler.this, model, editorPanel, getConfig()); - FaxToMailUIUtil.initScrollPaneBars(getUI().getMailBodyScrollPane()); - } - }); + FaxToMailUIUtil.setEmailContentInTextPane(this, model, editorPanel, getConfig()); + FaxToMailUIUtil.initScrollPaneBars(getUI().getMailBodyScrollPane()); // init table final JXTable table = ui.getRangeTable(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 75c30642..00a8ea35 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -1033,7 +1033,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { //get back images Collection<GeneratedPDFPage> pages = getLazyGeneratedPDFPage(handler.getContext(),attachment); - if (pages != null) { + if (pages != null && !pages.isEmpty()) { //Got pre-generated pages for (GeneratedPDFPage page : pages) { try { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm