branch develop updated (5ff7966 -> 95a0a05)
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 5ff7966 fixes #9057 Transfert de réponse : il manque le destinataire de la réponse initiale new 0d472af add license headers new 95a0a05 fixes #9047 Contenu du mail : le mail est éditable quand on affiche la version texte 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 95a0a0559ad8d702fa80d40930fa1f0974f91647 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 16 16:49:29 2017 +0100 fixes #9047 Contenu du mail : le mail est éditable quand on affiche la version texte commit 0d472afada366a97ee2b0aa323cde30b76b4a3ed Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 16 11:02:39 2017 +0100 add license headers Summary of changes: .../franciaflex/faxtomail/beans/Quantities.java | 24 ++++++++ .../faxtomail/beans/QuantitiesByRange.java | 24 ++++++++ .../ui/swing/content/demande/DemandeUIModel.java | 64 ++++++++++++---------- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 18 +++++- 4 files changed, 98 insertions(+), 32 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 0d472afada366a97ee2b0aa323cde30b76b4a3ed Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 16 11:02:39 2017 +0100 add license headers --- .../franciaflex/faxtomail/beans/Quantities.java | 24 ++++++++++++++++++++++ .../faxtomail/beans/QuantitiesByRange.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/Quantities.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/Quantities.java index ed15198..6eb9552 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/Quantities.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/Quantities.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.beans; +/*- + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2017 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Kevin Morin (Code Lutin) * @since 2.2.3 diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java index b2ecdf9..f6533b7 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.beans; +/*- + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2017 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Range; import com.google.common.collect.ImmutableMap; -- 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 95a0a0559ad8d702fa80d40930fa1f0974f91647 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 16 16:49:29 2017 +0100 fixes #9047 Contenu du mail : le mail est éditable quand on affiche la version texte --- .../ui/swing/content/demande/DemandeUIModel.java | 64 ++++++++++++---------- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 18 +++++- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index 2f5b2e2..c69c4a2 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -920,44 +920,50 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU } protected void decomposeEmail() { - try { - // ce code peut provoquer une NPE avec les données de test + if (t("faxtomail.demande.sender.manualCreation").equals(getSender())) { + plainContents = Lists.newArrayList(getOriginalEmailContent()); + toRecipients = Lists.newArrayList(getRecipient()); - Properties properties = new Properties(); - // set the mail.mime.address.strict to false to avoid - // javax.mail.internet.AddressException: Domain contains illegal character errors when recipients contains [] - properties.setProperty("mail.mime.address.strict", "false"); + } else { + try { + // ce code peut provoquer une NPE avec les données de test - Session session = Session.getInstance(properties); - MimeMessage message = MimeMessageUtils.createMimeMessage(session, getOriginalEmailContent()); + Properties properties = new Properties(); + // set the mail.mime.address.strict to false to avoid + // javax.mail.internet.AddressException: Domain contains illegal character errors when recipients contains [] + properties.setProperty("mail.mime.address.strict", "false"); - if (subject == null && message.getSubject() != null) { - subject = FaxToMailServiceUtils.getDecodedSubject(message.getSubject()); - } + Session session = Session.getInstance(properties); + MimeMessage message = MimeMessageUtils.createMimeMessage(session, getOriginalEmailContent()); - toRecipients = FaxToMailServiceUtils.convertAddressesToStrings(message.getRecipients(Message.RecipientType.TO)); - ccRecipients = FaxToMailServiceUtils.convertAddressesToStrings(message.getRecipients(Message.RecipientType.CC)); + if (subject == null && message.getSubject() != null) { + subject = FaxToMailServiceUtils.getDecodedSubject(message.getSubject()); + } + + toRecipients = FaxToMailServiceUtils.convertAddressesToStrings(message.getRecipients(Message.RecipientType.TO)); + ccRecipients = FaxToMailServiceUtils.convertAddressesToStrings(message.getRecipients(Message.RecipientType.CC)); - plainContents = null; - htmlContents = null; - if (message.isMimeType("multipart/*")) { - decomposeMultipartEmail(message); + plainContents = null; + htmlContents = null; + if (message.isMimeType("multipart/*")) { + decomposeMultipartEmail(message); - } else if (message.isMimeType("text/*")) { - String content = FaxToMailServiceUtils.getTextFromMessage(message); - if (plainContents == null) { - plainContents = new ArrayList<String>(); + } else if (message.isMimeType("text/*")) { + String content = FaxToMailServiceUtils.getTextFromMessage(message); + if (plainContents == null) { + plainContents = new ArrayList<>(); + } + plainContents.add(JAXXUtil.getStringValue(content)); } - plainContents.add(JAXXUtil.getStringValue(content)); - } - } catch (Exception e) { - if (log.isWarnEnabled()) { - log.warn("error while parsing the original email content, may come from the imported archives", e); + } catch (Exception e) { + if (log.isWarnEnabled()) { + log.warn("error while parsing the original email content, may come from the imported archives", e); + } + //may comes from the imported archives + plainContents = Lists.newArrayList(getOriginalEmailContent()); + toRecipients = Lists.newArrayList(getRecipient()); } - //may comes from the imported archives - plainContents = Lists.newArrayList(getOriginalEmailContent()); - toRecipients = Lists.newArrayList(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 9359998..55db3da 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 @@ -69,7 +69,6 @@ import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; -import javax.mail.Address; import javax.media.jai.PlanarImage; import javax.print.attribute.HashPrintRequestAttributeSet; import javax.print.attribute.PrintRequestAttributeSet; @@ -91,6 +90,8 @@ import java.awt.Component; import java.awt.Desktop; import java.awt.Font; import java.awt.Graphics; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.awt.print.PageFormat; @@ -351,7 +352,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } public static void setEmailContentInTextPane(DemandeUIHandler handler, - DemandeUIModel demandeUIModel, + final DemandeUIModel demandeUIModel, JPanel textPanePanel) { List<String> contents = demandeUIModel.getHtmlContent(); @@ -376,7 +377,18 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { for (String content : contents) { if (content != null) { - JTextPane textPane = new JTextPane(); + final JTextPane textPane = new JTextPane(); + boolean newDemand = StringUtils.isBlank(demandeUIModel.getTopiaId()); + textPane.setEditable(newDemand); + if (newDemand) { + textPane.addKeyListener(new KeyAdapter() { + + @Override + public void keyReleased(KeyEvent e) { + demandeUIModel.getOriginalEmail().setContent(textPane.getText()); + } + }); + } textPane.setText(content); textPanePanel.add(textPane); textPanePanel.add(Box.createVerticalStrut(3)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm