branch develop updated (312118f4 -> e11868f8)
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 312118f4 Fix copyright format new e11868f8 Do not display empty content (only whitespaces) 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 e11868f8d930629007f463dd8e751ffbd7877736 Author: jcouteau <couteau@codelutin.com> Date: Tue Nov 26 11:15:52 2019 +0100 Do not display empty content (only whitespaces) Summary of changes: .../com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 6 ++---- 1 file changed, 2 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 e11868f8d930629007f463dd8e751ffbd7877736 Author: jcouteau <couteau@codelutin.com> Date: Tue Nov 26 11:15:52 2019 +0100 Do not display empty content (only whitespaces) --- .../com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 c82a37d7..8f8b89e2 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 @@ -346,7 +346,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { if (CollectionUtils.isNotEmpty(contents)) { for (String content : contents) { - if (content != null) { + if (content != null && content.trim().length() > 0) { content = content.replaceAll( "(\r\n|\r|\n)", "<br>"); addHtmlTextPane(handler, demandeUIModel, textPanePanel, content); @@ -363,7 +363,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { if (CollectionUtils.isNotEmpty(contents)) { for (String content : contents) { - if (content != null) { + if (content != null && content.trim().length() > 0) { final JTextPane textPane = new JTextPane(); boolean newDemand = StringUtils.isBlank(demandeUIModel.getTopiaId()); textPane.setEditable(newDemand); @@ -396,8 +396,6 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } } } - - //si un seul fils -> resize et jscrollpane never } /** -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm