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 dd2c22ad3036d1269afe2676265d0c3e6ee897c1 Merge: ac88dacc a224b1de Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 10:22:39 2018 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/franciaflex/faxtomail into develop faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 7 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 56 ++++++++++++++++------ .../faxtomail/ui/swing/util/JImagePanel.java | 16 +++++-- .../i18n/faxtomail-ui-swing_fr_FR.properties | 3 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 68 insertions(+), 24 deletions(-) diff --cc faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 234ab4a3,a1f8fd35..75c30642 --- 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 @@@ -434,57 -417,7 +433,57 @@@ public final class FaxToMailUIUtil exte } } } - + + public static AttachmentFile getLazyOriginalFile(FaxToMailUIContext context, Attachment attachment) { + if (log.isDebugEnabled()) { + log.debug("Force attachment loading " + attachment.getOriginalFileName()); + } + if (attachment.isPersisted()) { + FaxToMailServiceContext serviceContext = context.newServiceContext(); + EmailService service = serviceContext.getEmailService(); + if (attachment.getOriginalFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), true); + attachment.setOriginalFile(file); + } + } + + return attachment.getOriginalFile(); + } + + public static Collection<GeneratedPDFPage> getLazyGeneratedPDFPage(FaxToMailUIContext context, Attachment attachment) { + if (log.isDebugEnabled()) { + log.debug("Force generated pages loading " + attachment.getOriginalFileName()); + } + if (attachment.isPersisted()) { + FaxToMailServiceContext serviceContext = context.newServiceContext(); + EmailService service = serviceContext.getEmailService(); + if (attachment.getGeneratedPDFPages() == null) { + Collection<GeneratedPDFPage> pages = service.getGeneratedPDFPage(attachment.getTopiaId()); + attachment.setGeneratedPDFPages(pages); + } + } + + return attachment.getGeneratedPDFPages(); + } + + public static AttachmentFile getLazyEditedFile(FaxToMailUIContext context, Attachment attachment) { + if (log.isDebugEnabled()) { + log.debug("Force attachment loading " + attachment.getOriginalFileName()); + } + if (attachment.isPersisted()) { + FaxToMailServiceContext serviceContext = context.newServiceContext(); + EmailService service = serviceContext.getEmailService(); + if (attachment.getEditedFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), false); + attachment.setEditedFile(file); + } + } + + return attachment.getEditedFile(); + } + + - ++ /** * Force le chargement des contenu source binaire des réponses. * @@@ -1113,13 -1035,9 +1118,10 @@@ JImagePanel imagePanel = new JImagePanel(); int maxWidth = config.getMaxWidthImageInTextPane(); - if (maxWidth > 0) { - Dimension maximumSize = new Dimension(maxWidth, imagePanel.getMaximumSize().height); - imagePanel.setMaximumSize(maximumSize); - } + imagePanel.setMaxWidth(maxWidth); imagePanel.setScaleImageToFitPanel(true); + File originalFile = getLazyOriginalFile(handler.getContext(),attachment).getFile(); imagePanel.setImage(originalFile); imagePanel.setAlignmentX(Component.LEFT_ALIGNMENT); box.add(imagePanel); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.