July 2018 - Faxtomail-commits - mailman.cloud.codelutin.com

02/06: fixes #10015
by codelutin.com scm 09 Jul '18

09 Jul '18

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 0d4320c436f02e3282750521d9ebf99eb0dc28b7 Author: jcouteau <couteau(a)codelutin.com> Date: Fri Jul 6 14:19:06 2018 +0200 fixes #10015 --- .../services/service/EmailServiceImpl.java | 7 +- .../services/service/EmailServiceTest.java | 12 +- .../src/test/resources/emails/test10015.eml | 152 +++++++++++++++++++++ 3 files changed, 169 insertions(+), 2 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 086f2af0..1efa7668 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -138,6 +138,7 @@ import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; +import static org.nuiton.i18n.I18n.init; import static org.nuiton.i18n.I18n.t; /** @@ -2320,7 +2321,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe float width = image.getWidth(); float height = image.getHeight(); - // get the format of the page + // get the format of the page, deal only with width as if height is more than page size, we will got 2 or more pages... Rectangle format = PageSize.A4; if (width > PageSize.A4.getWidth() && width <= PageSize.A4.getHeight()) { if (height <= PageSize.A4.getWidth()) { @@ -2357,6 +2358,10 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe if (width > PageSize.A0.getWidth()) { format = PageSize.A0.rotate(); } + if (width>PageSize.A0.getHeight()) { + //Plus grand que AO paysage, on met la largeur de l'image générée pour ne pas avoir de texte coupé + format = new Rectangle(width, height); + } Node style = doc.createElement("style"); style.setTextContent("@page { size: " + format.getWidth() + "px " + format.getHeight() + "px; }"); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 071e8636..154de033 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -62,6 +62,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -344,13 +345,22 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { testConvertHTMLToPdf("test7855"); } + /** + * Test qui ne fail jamais, mais permet de vérifier la génération de PDFs très très larges + */ + @Test + public void test10015() { + testConvertHTMLToPdf("test10015"); + + } + protected void testConvertHTMLToPdf(String emailId) { File tempDirectory = FileUtils.getTempDirectory(); try { File email = new File("src/test/resources/emails/" + emailId + ".eml"); - String emailContent = FileUtils.readFileToString(email); + String emailContent = FileUtils.readFileToString(email, Charset.defaultCharset()); Properties properties = new Properties(); // set the mail.mime.address.strict to false to avoid diff --git a/faxtomail-service/src/test/resources/emails/test10015.eml b/faxtomail-service/src/test/resources/emails/test10015.eml new file mode 100644 index 00000000..cc272fd4 --- /dev/null +++ b/faxtomail-service/src/test/resources/emails/test10015.eml @@ -0,0 +1,152 @@ +Return-Path: <jean.couteau(a)gmail.com> +X-Original-To: faxtomail-tests(a)codelutin.com +Delivered-To: faxtomail-tests(a)codelutin.com +Received: from localhost (localhost [127.0.0.1]) + by bihar.codelutin.com (Postfix) with ESMTP id CE8A19D8C2 + for <faxtomail-tests(a)codelutin.com>; Thu, 5 Jul 2018 16:37:20 +0200 (CEST) +X-Virus-Scanned: Debian amavisd-new at codelutin.com +X-Spam-Flag: NO +X-Spam-Score: -1.998 +X-Spam-Level: +X-Spam-Status: No, score=-1.998 tagged_above=-1002 required=6.31 + tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, + DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_FONT_SIZE_LARGE=0.001, + HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] + autolearn=ham autolearn_force=no +Authentication-Results: localhost (amavisd-new); dkim=pass (2048-bit key) + header.d=gmail.com +Received: from bihar.codelutin.com ([127.0.0.1]) + by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) + with LMTP id LrXN0w9JlFkA for <faxtomail-tests(a)codelutin.com>; + Thu, 5 Jul 2018 16:37:18 +0200 (CEST) +Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) + by bihar.codelutin.com (Postfix) with ESMTPS id 9AB4A9D8BF + for <faxtomail-tests(a)codelutin.com>; Thu, 5 Jul 2018 16:37:18 +0200 (CEST) +Received: by mail-lj1-f176.google.com with SMTP id a6-v6so6848556ljj.7 + for <faxtomail-tests(a)codelutin.com>; Thu, 05 Jul 2018 07:35:39 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20161025; + h=mime-version:from:date:message-id:subject:to; + bh=nkhUGLmw1BEpvYtmhNk3Q3kM0/5z7XXg4h67d0PFmmg=; + b=ZMypuxCegMSUvWhJwyPawL+3GN4esewxr+P/Y/gshVZH/xGpZE7ZNlBkKcbGxSdbxB + qWSNcBw3QWpphuYa1aZHar33W2LPW7yLip7yObdrpTz9JyWYVr8ccgQ/YUkciBa7W5P7 + VZh9A0uNsHwiBaJ0BFzsbTd9glA46b0OIUmjxK1ZiTPmRAoYQOtIguucMb8IPkoVEwCZ + 8yy3y954VfyM3tPmJ2bhbgJv3DNtjhLgmwmcuxE3LyjILWHq35xwEnrOxLR5FyXp1QWO + mS1vBs1S9jDLAgfXpaRu/M061EpywXGnICdjjiWp+Syoe9cNSH4uqlox3QFKZ/3NPoWH + h4aw== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:mime-version:from:date:message-id:subject:to; + bh=nkhUGLmw1BEpvYtmhNk3Q3kM0/5z7XXg4h67d0PFmmg=; + b=qkVum8AEOzJXXYd9Qfgh2hNLcQ7jvFbfoJgBWOh3N2WhYMvXphjww+Gt2dRnqaYl4q + UJHh/9vQiacCuQahVObcORV9VNYmtNzpeevPxEOUz5wPF6FEH3CFaN/IMmw9clRR0Uoh + vAAZ8wh4xF8sfUw1LZUpjYGMqWsaut6jF9NBNE/DHIs7osUrhkIQ/2Ja+TKNuTbkZJxC + Qbnsl0wZY6yH+4lCp7xkymTzvewBhkLtP4KeJJht0ZXhxhvDdXaFPcUwgrqpkrohxgL3 + Js0uomoZL4Y1J16KJlUnoQ3K0VSS3DZ6Yi93Yz98/BadYOihfyx7OatEkEeh2LduoOtB + UuYQ== +X-Gm-Message-State: APt69E3pbWAkueb0Mtg0oFN92+R+iio0/jqONR/sfrKMV5Gsxx9Sc0zR + GQRsm+fhXkGRqy7/EO8WWerNkgXVza9ejw+/YD7wzw== +X-Google-Smtp-Source: AAOMgpdQCN4NKvA5T9PWw1mSIZAwRgP3NEHNnzQAYfyLJOshc+rGPC9M849K+dSHcsFdvpcMKeSQKe7YZjq7LBQ2ivA= +X-Received: by 2002:a2e:5d88:: with SMTP id v8-v6mr4258906lje.137.1530801338150; + Thu, 05 Jul 2018 07:35:38 -0700 (PDT) +MIME-Version: 1.0 +From: Jean Couteau <jean.couteau(a)gmail.com> +Date: Thu, 5 Jul 2018 16:35:26 +0200 +Message-ID: <CAPkwLvUGrFbQ-qjvYFinnK0Vp+m410U0KnweN60p9_Ds_Tu51w(a)mail.gmail.com> +Subject: =?UTF-8?B?bWFpbCBkw6lwYXNzZSA/?= +To: faxtomail-tests(a)codelutin.com +Content-Type: multipart/alternative; boundary="000000000000fb765f0570417562" + +--000000000000fb765f0570417562 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: quoted-printable + +*abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv= +wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrs= +tuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop= +qrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm= +nopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghij= +klmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefg= +hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd= +efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyza= +bcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwx= +yzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu= +vwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr= +stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmno= +pqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl= +mnopqrstuvwxyzabcdefghijklmnopqr* +stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmno= +pqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl= +mnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop +*qrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl= +mnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghi= +jklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdef= +ghijklmnopqrstuvwxyzabcdefghij* +klmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefg= +hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd= +efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyza= +bcdefghi +*jklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde= +fghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzab= +cdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy= +zabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv= +wxyzabcdefghijklmnopqrstuvwxyzabcdefgh* +ijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde= +fghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzab= +cd +efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyza= +bcdefghijklmnopqr +stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmno= +pqrstuvwxyzabcd +efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyza= +bcdefghijklmnopqrstuvwxyz + +--=20 +Jean Couteau +24 rue des Tanneurs +44220 Cou=C3=ABron +FRANCE + +--000000000000fb765f0570417562 +Content-Type: text/html; charset="UTF-8" +Content-Transfer-Encoding: quoted-printable + +<div dir=3D"ltr"><b>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabc= +defghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz= +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvw= +xyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst= +uvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopq= +rstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn= +opqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk= +lmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh= +ijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde= +fghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzab= +cdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy= +zabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv= +wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrs= +tuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr</b>stuvwxyzabcdefghijkl= +mnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghi= +jklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdef= +ghijklmnopqrstuvwxyzabcdefghijklmnop<u>qrstuvwxyzabcdefghijklmnopqrstuvwxyz= +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvw= +xyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst= +uvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghij</u>klm= +nopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghij= +klmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefg= +hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd= +efghi<i>jklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwx= +yzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu= +vwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr= +stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmno= +pqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh</i>ijklmnopqrstuvwxyzabcdefgh= +ijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde= +fghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd<font color=3D"#a64d79">= +efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyza= +bcdefghijklmnopqr</font>stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopq= +rstuvwxyzabcdefghijklmnopqrstuvwxyzabcd<font size=3D"6">efghijklmnopqrstuvw= +xyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst= +uvwxyz</font><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr" class= +=3D"gmail_signature">Jean Couteau<br>24 rue des Tanneurs<br>44220 Cou=C3=AB= +ron<br>FRANCE</div></div> + +--000000000000fb765f0570417562-- -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

01/01: fixes #10003 : Plus derepérage dans la liste après déplacer ou archiver
by codelutin.com scm 04 Jul '18

04 Jul '18

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 0d405ec64d424fb4d0d1890016cf3ba4bb2844fd Author: jcouteau <couteau(a)codelutin.com> Date: Wed Jul 4 10:14:51 2018 +0200 fixes #10003 : Plus derepérage dans la liste après déplacer ou archiver --- .../demande/actions/ArchiveFromListAction.java | 19 +++--- .../demande/actions/LoadFolderEmailsAction.java | 60 ++++++++++++++-- .../demande/actions/SaveDemandeFromListAction.java | 79 ++++++++++++++++++++++ .../content/transmit/actions/TransmitAction.java | 12 ++-- 4 files changed, 150 insertions(+), 20 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index f52f524e..d20805a9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -56,17 +56,17 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { @Override public boolean prepareAction() throws Exception { - boolean result = super.prepareAction(); + boolean result; - demandsToArchive = new ArrayList<DemandeUIModel>(); + demandsToArchive = new ArrayList<>(); List<DemandeUIModel> currentEmails = getModel().getSelectedEmails(); - String notArchivableDemandTitles = ""; + StringBuilder notArchivableDemandTitles = new StringBuilder(); for (DemandeUIModel demandeUIModel : currentEmails) { // is the demand archivable? if (!demandeUIModel.isEditable() || !handler.isActionEnabled(demandeUIModel, MailAction.ARCHIVE)) { - notArchivableDemandTitles += "- " + demandeUIModel.getTitle() + "<br/>"; + notArchivableDemandTitles.append("- ").append(demandeUIModel.getTitle()).append("<br/>"); } else { demandsToArchive.add(demandeUIModel); @@ -75,13 +75,13 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { if (demandsToArchive.isEmpty()) { displayWarningMessage(t("faxtomail.alert.noDemandToArchive.title"), - t("faxtomail.alert.noDemandToArchive.message", notArchivableDemandTitles)); + t("faxtomail.alert.noDemandToArchive.message", notArchivableDemandTitles.toString())); result = false; } else { String message; - if (!notArchivableDemandTitles.isEmpty()) { - message = t("faxtomail.alert.archivesWithNotArchivableConfirmation.message", notArchivableDemandTitles); + if (notArchivableDemandTitles.length() > 0) { + message = t("faxtomail.alert.archivesWithNotArchivableConfirmation.message", notArchivableDemandTitles.toString()); } else if (demandsToArchive.size() == 1) { message = t("faxtomail.alert.archiveConfirmation.message"); @@ -98,7 +98,7 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { result = i == JOptionPane.YES_OPTION; } - return result; + return result && super.prepareAction(); } @Override @@ -144,14 +144,13 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { @Override public void postSuccessAction() { - super.postSuccessAction(); List<DemandeUIModel> selectedEmails = getModel().getSelectedEmails(); getModel().removeEmails(selectedEmails); //FIXME enlever la rustine if (getContext().isUseFolderCache()) { getContext().getCurrentFolderEmails().removeAllDemands(selectedEmails); } - getModel().setSelectedEmails(null); + super.postSuccessAction(); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java index 50e1651b..97e8bdd8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java @@ -33,6 +33,7 @@ import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.google.common.collect.Maps; @@ -59,6 +60,14 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU private final static Log log = LogFactory.getLog(LoadFolderEmailsAction.class); + protected List<DemandeUIModel> selectedEmails; + + //Ligne de l'élément courant avant rafraichissement + protected int selectedRowBeforeRefresh; + + //première ligne d'une multisélection avant rafraichissement + protected int firstSelectedRowBeforeRefresh; + public LoadFolderEmailsAction(DemandeListUIHandler handler) { super(handler, false); } @@ -70,6 +79,18 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); + //save selections before refresh + JXTable dataTable = getUI().getDataTable(); + DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); + selectedEmails = model.getSelectedEmails(); + firstSelectedRowBeforeRefresh = dataTable.getSelectedRow(); + + //Si on travaille sur un current email, on sauve la ligne (pour resélection après refresh) + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + if (currentEmail != null) { + selectedRowBeforeRefresh = dataTableModel.getRowIndex(currentEmail); + } + if (folder == null) { result = false; @@ -77,15 +98,13 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU //FIXME enlever la rustine FaxToMailUIContext.FolderData currentFolderEmails = getContext().getCurrentFolderEmails(); if (getContext().isUseFolderCache() && folder.equals(currentFolderEmails.getFolder())) { - model.setEmails(new ArrayList<DemandeUIModel>(currentFolderEmails.getDemands())); + model.setEmails(new ArrayList<>(currentFolderEmails.getDemands())); PaginationResult<Email> paginationResult = currentFolderEmails.getPaginationResult(); model.setPaginationParameter(paginationResult.getCurrentPage()); model.setPaginationResult(paginationResult); result = false; } else { - final JXTable dataTable = getUI().getDataTable(); - setActionDescription(t("faxtomail.action.loadFolderEmails.tip", folder.getName())); // change name to save the state of the column width for every folder @@ -184,15 +203,44 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU DemandeUIModel currentEmail = getContext().getCurrentEmail(); - if (currentEmail != null) { - JXTable dataTable = getUI().getDataTable(); - DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); + //Cherche à resélectionner ce qui était sélectionné avant le refresh (ou l'action provoquant le refresh) + JXTable dataTable = getUI().getDataTable(); + DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); + + //Si des emails sont sélectionnés, on les resélectionne + if (selectedEmails != null && !selectedEmails.isEmpty()) { + for (DemandeUIModel email : selectedEmails) { + int row = dataTableModel.getRowIndex(email); + if (row > 0) { + dataTable.addRowSelectionInterval(row, row); + dataTable.scrollRowToVisible(row); + } + } + + //si rien de sélectionné = la sélection a disparu => re-sélectionne la première ligne de l'ancienne sélection + if (dataTable.getSelectedRow() < 0 && firstSelectedRowBeforeRefresh > 0) { + dataTable.addRowSelectionInterval(firstSelectedRowBeforeRefresh, firstSelectedRowBeforeRefresh); + dataTable.scrollRowToVisible(firstSelectedRowBeforeRefresh); + } + + } else if (currentEmail != null) { + //on reselectionne le current email que si pas d'autre sélection (sinon rajoute un élément non sélectionné + //à la sélection, potentiel commportement indésirable pour l'utilisateur ) int row = dataTableModel.getRowIndex(currentEmail); if (row > 0) { dataTable.setRowSelectionInterval(row, row); dataTable.scrollRowToVisible(row); + } else if (selectedRowBeforeRefresh > 0 && selectedRowBeforeRefresh<dataTable.getRowCount()) { + //si on retrouve pas le current email, sélectionne la ligne d'avant refresh + dataTable.setRowSelectionInterval(selectedRowBeforeRefresh, selectedRowBeforeRefresh); + dataTable.scrollRowToVisible(selectedRowBeforeRefresh); + } else if (selectedRowBeforeRefresh > 1 ){ + //si pas possible sélectionne la ligne précédent la ligne d'avant refresh + dataTable.setRowSelectionInterval(selectedRowBeforeRefresh-1, selectedRowBeforeRefresh-1); + dataTable.scrollRowToVisible(selectedRowBeforeRefresh-1); } } + //si pas de sélection ici c'est qu'on ne peut plus rien faire getHandler().resetTimer(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java index 7394fe5c..f7dc36d9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java @@ -34,6 +34,10 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; +import org.jdesktop.swingx.JXTable; + +import java.util.List; /** * @author Kevin Morin (Code Lutin) @@ -43,6 +47,14 @@ public class SaveDemandeFromListAction extends AbstractFaxToMailAction<DemandeLi protected String[] modifiedProperties; + protected List<DemandeUIModel> selectedEmails; + + //Ligne de l'élément courant avant rafraichissement + protected int selectedRowBeforeRefresh; + + //première ligne d'une multisélection avant rafraichissement + protected int firstSelectedRowBeforeRefresh; + public SaveDemandeFromListAction(DemandeListUIHandler handler) { super(handler, false); } @@ -51,6 +63,25 @@ public class SaveDemandeFromListAction extends AbstractFaxToMailAction<DemandeLi modifiedProperties = properties; } + @Override + public boolean prepareAction() throws Exception { + + //save selections before performing action + DemandeListUIModel model = getModel(); + JXTable dataTable = getUI().getDataTable(); + DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); + selectedEmails = model.getSelectedEmails(); + firstSelectedRowBeforeRefresh = dataTable.getSelectedRow(); + + //Si on travaille sur un current email, on sauve la ligne (pour resélection après refresh) + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + if (currentEmail != null) { + selectedRowBeforeRefresh = dataTableModel.getRowIndex(currentEmail); + } + + return super.prepareAction(); + } + @Override public void doAction() throws Exception { FaxToMailUIContext context = getContext(); @@ -70,4 +101,52 @@ public class SaveDemandeFromListAction extends AbstractFaxToMailAction<DemandeLi model.fromEntity(email); } } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + + //Cherche à resélectionner ce qui était sélectionné avant le refresh (ou l'action provoquant le refresh) + JXTable dataTable = getUI().getDataTable(); + DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); + + //Si des emails sont sélectionnés, on les resélectionne + if (selectedEmails != null && !selectedEmails.isEmpty()) { + for (DemandeUIModel email : selectedEmails) { + int row = dataTableModel.getRowIndex(email); + if (row > 0) { + dataTable.addRowSelectionInterval(row, row); + dataTable.scrollRowToVisible(row); + } + } + + //si rien de sélectionné = la sélection a disparu => re-sélectionne la première ligne de l'ancienne sélection + if (dataTable.getSelectedRow() < 0 && firstSelectedRowBeforeRefresh > 0) { + dataTable.addRowSelectionInterval(firstSelectedRowBeforeRefresh, firstSelectedRowBeforeRefresh); + dataTable.scrollRowToVisible(firstSelectedRowBeforeRefresh); + } + + } else if (currentEmail != null) { + //on reselectionne le current email que si pas d'autre sélection (sinon rajoute un élément non sélectionné + //à la sélection, potentiel commportement indésirable pour l'utilisateur ) + int row = dataTableModel.getRowIndex(currentEmail); + if (row > 0) { + dataTable.setRowSelectionInterval(row, row); + dataTable.scrollRowToVisible(row); + } else if (selectedRowBeforeRefresh > 0 && selectedRowBeforeRefresh<dataTable.getRowCount()) { + //si on retrouve pas le current email, sélectionne la ligne d'avant refresh + dataTable.setRowSelectionInterval(selectedRowBeforeRefresh, selectedRowBeforeRefresh); + dataTable.scrollRowToVisible(selectedRowBeforeRefresh); + } else if (selectedRowBeforeRefresh > 1 ){ + //si pas possible sélectionne la ligne précédent la ligne d'avant refresh + dataTable.setRowSelectionInterval(selectedRowBeforeRefresh-1, selectedRowBeforeRefresh-1); + dataTable.scrollRowToVisible(selectedRowBeforeRefresh-1); + } + } + //si pas de sélection ici c'est qu'on ne peut plus rien faire + + getHandler().resetTimer(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java index bff06a61..0b8d0227 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java @@ -27,9 +27,12 @@ package com.franciaflex.faxtomail.ui.swing.content.transmit.actions; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.LoadFolderEmailsAction; +import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions.DisplayPageAction; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIHandler; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel; @@ -137,10 +140,11 @@ public class TransmitAction extends AbstractFaxToMailAction<MailFolderChooserUIM } else if (DemandeListUI.class.isAssignableFrom(parentUI.getClass())) { DemandeListUI demandeListUI = (DemandeListUI) parentUI; - DemandeListUIModel listModel = demandeListUI.getModel(); - List<DemandeUIModel> demandList = new ArrayList<DemandeUIModel>(listModel.getEmails()); - demandList.removeAll(getModel().getDemandeUIModels()); - listModel.setEmails(demandList); + DemandeListUIHandler listHandler = demandeListUI.getHandler(); + + //update demand list using action to keep track of where we are in the list + LoadFolderEmailsAction loadFolderEmailsAction = new LoadFolderEmailsAction(listHandler); + getContext().getActionEngine().runAction(loadFolderEmailsAction); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (94eb3a90 -> 0d405ec6)
by codelutin.com scm 04 Jul '18

04 Jul '18

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 94eb3a90 refs #9986 new 0d405ec6 fixes #10003 : Plus derepérage dans la liste après déplacer ou archiver 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 0d405ec64d424fb4d0d1890016cf3ba4bb2844fd Author: jcouteau <couteau(a)codelutin.com> Date: Wed Jul 4 10:14:51 2018 +0200 fixes #10003 : Plus derepérage dans la liste après déplacer ou archiver Summary of changes: .../demande/actions/ArchiveFromListAction.java | 19 +++--- .../demande/actions/LoadFolderEmailsAction.java | 60 ++++++++++++++-- .../demande/actions/SaveDemandeFromListAction.java | 79 ++++++++++++++++++++++ .../content/transmit/actions/TransmitAction.java | 12 ++-- 4 files changed, 150 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (77e001c0 -> 94eb3a90)
by codelutin.com scm 03 Jul '18

03 Jul '18

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 77e001c0 refs #9986 new 94eb3a90 refs #9986 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 94eb3a903086b930bcf20eb38d7cf9906a90af26 Author: jcouteau <couteau(a)codelutin.com> Date: Tue Jul 3 14:56:09 2018 +0200 refs #9986 Summary of changes: .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 51 +++++++++++++--------- .../services/service/EmailServiceTest.java | 4 +- .../demande/takenby/actions/TakenByAction.java | 23 ++++++---- 4 files changed, 48 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7579b646 -> 77e001c0)
by codelutin.com scm 03 Jul '18

03 Jul '18

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 7579b646 fixes #10004 new 77e001c0 refs #9986 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 77e001c07a75f5bda8ff9b05e06e7d6f5af45714 Author: jcouteau <couteau(a)codelutin.com> Date: Tue Jul 3 11:48:42 2018 +0200 refs #9986 Summary of changes: .../ui/swing/content/demande/takenby/actions/TakenByAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (471c3ded -> 7579b646)
by codelutin.com scm 03 Jul '18

03 Jul '18

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 471c3ded fixes #9986 : Pris par lent new 7579b646 fixes #10004 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 7579b64653d9061d7b194f55c468f77ea9852f7e Author: jcouteau <couteau(a)codelutin.com> Date: Tue Jul 3 11:28:13 2018 +0200 fixes #10004 Summary of changes: faxtomail-service/pom.xml | 15 ++++++++++ .../services/service/EmailServiceTest.java | 32 +++++++++++++++++++++ faxtomail-service/src/test/resources/pdf/10004.pdf | Bin 0 -> 26374 bytes faxtomail-ui-swing/pom.xml | 4 +-- pom.xml | 6 ++-- 5 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 faxtomail-service/src/test/resources/pdf/10004.pdf -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (800c8c89 -> 471c3ded)
by codelutin.com scm 02 Jul '18

02 Jul '18

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 800c8c89 Merge branch 'feature/redimensionnement' into develop new 471c3ded fixes #9986 : Pris par lent 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 471c3dedb5ac3a471ea577592fa2ee05eeef0dc9 Author: jcouteau <couteau(a)codelutin.com> Date: Mon Jul 2 17:30:57 2018 +0200 fixes #9986 : Pris par lent Summary of changes: .../faxtomail/services/service/EmailService.java | 2 + .../services/service/EmailServiceImpl.java | 55 ++++++++++++++++++++++ .../services/service/EmailServiceTest.java | 27 +++++++++++ .../demande/takenby/actions/TakenByAction.java | 6 +-- 4 files changed, 85 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1