branch develop-1.1.x updated (6cdc310 -> 2b210bf)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 6cdc310 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new d54edd0 fix sample data init new 2b210bf fixes #7724 Erreur à l'ouverture d'un élément quand l'email n'a pas de texte fixes #7725 Erreur quand on veut répondre à un email qui n'a pas de texte fixes #7726 Erreur à l'ouverture d'un email dont le code html n'est pas valide The 2 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 2b210bf6594d1abeb51ecab74505d9377bfef72d Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 15:09:26 2015 +0100 fixes #7724 Erreur à l'ouverture d'un élément quand l'email n'a pas de texte fixes #7725 Erreur quand on veut répondre à un email qui n'a pas de texte fixes #7726 Erreur à l'ouverture d'un email dont le code html n'est pas valide commit d54edd078ba5565baf07ced6909f815e9746eda7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 15:07:36 2015 +0100 fix sample data init Summary of changes: .../services/service/InitFaxToMailServiceImpl.java | 48 +++++++--------------- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 43 ++++++++++++++----- 3 files changed, 48 insertions(+), 45 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-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit d54edd078ba5565baf07ced6909f815e9746eda7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 15:07:36 2015 +0100 fix sample data init --- .../services/service/InitFaxToMailServiceImpl.java | 48 +++++++--------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java index 4d39849..55b2399 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java @@ -24,30 +24,7 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.History; -import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.HistoryType; -import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Priority; -import com.franciaflex.faxtomail.persistence.entities.PriorityTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.RangeTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; -import com.franciaflex.faxtomail.persistence.entities.WaitingStateTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.*; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; @@ -209,6 +186,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements // fixme seed to be used in test Random random = new Random(1234); EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); + OriginalEmailTopiaDao originalEmailDao = getPersistenceContext().getOriginalEmailDao(); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); RangeRowTopiaDao rangeRowDao = getPersistenceContext().getRangeRowDao(); @@ -309,12 +287,12 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements if (fxClientsStream != null) { List<Client> clients = getReferentielService().importClients(fxClientsStream); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, cyrilFolder, cyril); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, claireFolder, claire); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, agatheFolder, agathe); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, marcFolder, marc); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, fredericFolder, frederic); - createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, jeanneFolder, jeanne); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, cyrilFolder, cyril); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, claireFolder, claire); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, agatheFolder, agathe); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, marcFolder, marc); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, fredericFolder, frederic); + createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, jeanneFolder, jeanne); } } catch(Exception e) { @@ -325,12 +303,13 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements } } - protected void createEmails(Random random, HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, EmailTopiaDao emailDao, + protected void createEmails(Random random, HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, + EmailTopiaDao emailDao, OriginalEmailTopiaDao originalEmailDao, List<Range> ranges, List<Client> clients, List<DemandType> types, List<Priority> priorities, MailFolder folder, FaxToMailUser user) throws InvalidClientException { int r = random.nextInt(100) + 50; for (int i = 0 ; i < r ; i++) { - createEmail(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, folder, user); + createEmail(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, folder, user); } } @@ -338,6 +317,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, EmailTopiaDao emailDao, + OriginalEmailTopiaDao originalEmailDao, List<Range> ranges, List<Client> clients, List<DemandType> types, @@ -389,7 +369,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history), - Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); + Email.PROPERTY_ORIGINAL_EMAIL, originalEmailDao.create(OriginalEmail.PROPERTY_CONTENT, "Demo data")); if (opened) { @@ -437,7 +417,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history), - Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); + Email.PROPERTY_ORIGINAL_EMAIL, originalEmailDao.create(OriginalEmail.PROPERTY_CONTENT, "Demo data")); if (opened) { -- 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-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 2b210bf6594d1abeb51ecab74505d9377bfef72d Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 15:09:26 2015 +0100 fixes #7724 Erreur à l'ouverture d'un élément quand l'email n'a pas de texte fixes #7725 Erreur quand on veut répondre à un email qui n'a pas de texte fixes #7726 Erreur à l'ouverture d'un email dont le code html n'est pas valide --- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 43 +++++++++++++++++----- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index f05b4ea..6a86726 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -134,7 +134,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo String quotedReply = t("faxtomail.reply.message", decorate(demand.getReceptionDate()), demand.getSender(), - plainContent.replaceAll("\n", "\n> ")); + plainContent != null ? plainContent.replaceAll("\n", "\n> ") : ""); model.setMessage(quotedReply); String recipient = demand.getRecipient(); 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 16ed24a..7db170f 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 @@ -39,6 +39,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.itextpdf.text.Document; @@ -347,18 +348,31 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { List<String> contents = demandeUIModel.getHtmlContent(); if (contents != null) { + for (String content : contents) { - addHtmlTextPane(handler, demandeUIModel, textPanePanel, content); + if (content != null) { + addHtmlTextPane(handler, demandeUIModel, textPanePanel, content); + } } - } else { + } + + // if there is no html content or if no html content can be correctly displayed (ie throws an exception) + if (textPanePanel.getComponentCount() == 0) { + contents = demandeUIModel.getPlainContent(); - for (String content : contents) { - JTextPane textPane = new JTextPane(); - textPane.setText(content); - textPanePanel.add(textPane); - textPanePanel.add(Box.createVerticalStrut(3)); + if (contents != null) { + + for (String content : contents) { + + if (content != null) { + JTextPane textPane = new JTextPane(); + textPane.setText(content); + textPanePanel.add(textPane); + textPanePanel.add(Box.createVerticalStrut(3)); + } + } } } } @@ -782,6 +796,8 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { JPanel textPanePanel, String content) { + Preconditions.checkNotNull(content); + JTextPane textPane = createHtmlTextPane(); // the meta tag makes the content is not displayed @@ -818,11 +834,18 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { log.trace("Content after mail = " + content); } - textPane.setText(content); + try { + textPane.setText(content); + + textPanePanel.add(textPane); - textPanePanel.add(textPane); + textPanePanel.add(Box.createVerticalStrut(3)); - textPanePanel.add(Box.createVerticalStrut(3)); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Error when displaying email content", e); + } + } } protected static JTextPane createHtmlTextPane() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm