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 466676f186b17ebf724e10df9679d6bd0d8bcbac Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 5 11:12:29 2018 +0200 - fixes #10077 : Les pages dans l'aperçu PDF ne sont pas dans le bon ordre --- .../faxtomail/services/service/EmailServiceImpl.java | 13 +++++++++++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 7 ++++--- 2 files changed, 15 insertions(+), 5 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 71c0dd0c..1ad8116f 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 @@ -46,8 +46,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import com.google.common.collect.Ordering; import com.google.common.collect.Sets; -import com.google.common.io.Files; import com.itextpdf.text.Document; import com.itextpdf.text.DocumentException; import com.itextpdf.text.Image; @@ -150,6 +150,13 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe protected Binder<Attachment, Attachment> attachmentBinder = BinderFactory.newBinder(Attachment.class, Attachment.class); + public static final Ordering<GeneratedPDFPage> GENERATED_PDF_PAGE_NATURAL_ORDERING = Ordering.natural().onResultOf(new Function<GeneratedPDFPage, Date>() { + @Override + public Date apply(GeneratedPDFPage generatedPDFPage) { + return generatedPDFPage.getTopiaCreateDate(); + } + }); + @Override public Email getEmailById(String id) { Email email = getPersistenceContext().getEmailDao().forTopiaIdEquals(id).findUnique(); @@ -1330,6 +1337,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // force lazy initialize Hibernate.initialize(result); } + + result = GENERATED_PDF_PAGE_NATURAL_ORDERING.sortedCopy(result); return result; } @@ -2443,8 +2452,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe baos.flush(); generatedPDFPage.setPage(baos.toByteArray()); + generatedPDFPage = dao.create(generatedPDFPage); attachment.addGeneratedPDFPages(generatedPDFPage); - //generatedPDFPage = dao.create(generatedPDFPage); //getPersistenceContext().getAttachmentDao().update(attachment); } catch (IOException e) { log.error("Error while writing image", e); 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 7842757f..33e33f19 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 @@ -122,7 +122,6 @@ import java.net.URI; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -447,7 +446,8 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } } - return attachment.getOriginalFile(); + AttachmentFile result = attachment.getOriginalFile(); + return result; } public static Collection<GeneratedPDFPage> getLazyGeneratedPDFPage(FaxToMailUIContext context, Attachment attachment) { @@ -463,7 +463,8 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } } - return attachment.getGeneratedPDFPages(); + Collection<GeneratedPDFPage> generatedPDFPages = attachment.getGeneratedPDFPages(); + return generatedPDFPages; } public static AttachmentFile getLazyEditedFile(FaxToMailUIContext context, Attachment attachment) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.