branch develop updated (5197038 -> 5c7c52e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 5197038 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5c7c52e fixes #7094 Erreur à l'ouverture d'un email dont le css est invalide 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 5c7c52e27787826b7b7f5efed373696df1569463 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 12 16:57:14 2015 +0200 fixes #7094 Erreur à l'ouverture d'un email dont le css est invalide Summary of changes: .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 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 http://git.codelutin.com/faxtomail.git commit 5c7c52e27787826b7b7f5efed373696df1569463 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 12 16:57:14 2015 +0200 fixes #7094 Erreur à l'ouverture d'un email dont le css est invalide --- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 ee33699..2637715 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 @@ -74,6 +74,7 @@ import javax.print.attribute.PrintRequestAttributeSet; import javax.swing.*; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; +import javax.swing.text.StyledEditorKit; import javax.swing.text.html.HTMLEditorKit; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; @@ -397,7 +398,21 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } else { content = demandeUIModel.getPlainContent(); } - textPane.setText(content); + + try { + textPane.setText(content); + + } catch (RuntimeException e) { + if (log.isErrorEnabled()) { + log.error("error while setting content in text pane " + textPane, e); + } + + StyledEditorKit kit = new StyledEditorKit(); + textPane.setEditorKit(kit); + textPane.setContentType(kit.getContentType()); + + textPane.setText(demandeUIModel.getPlainContent()); + } } /** -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm