Author: dcosse Date: 2014-06-23 15:58:39 +0200 (Mon, 23 Jun 2014) New Revision: 253 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/253 Log: refs #4656 l'ensemble des PJ peuvent ?\195?\170tre s?\195?\169lectionn?\195?\169es Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 12:31:14 UTC (rev 252) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 13:58:39 UTC (rev 253) @@ -80,11 +80,13 @@ JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); ui.getAttachmentPanel().add(checkBox); + // add demand details final AttachmentFile demandFile = new AttachmentFileImpl(); demandFile.setFilename("demand_details"); byte[] demandContent = getDocumentContent(); demandFile.setContent(demandContent); + // add attached files checkBox.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { @@ -99,9 +101,11 @@ for (Attachment attachment : demand.getAttachment()) { - if (attachment.getOriginalFile() != null) { - createCheckBox(attachment.getOriginalFile()); + if (attachment.getOriginalFile() == null) { + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + } + createCheckBox(attachment.getOriginalFile()); final AttachmentFile file = attachment.getEditedFile(); if (file != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-23 12:31:14 UTC (rev 252) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-23 13:58:39 UTC (rev 253) @@ -62,6 +62,7 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -296,8 +297,9 @@ public static void print(AttachmentFile attachmentFile, boolean defaultPrinter) { + FileInputStream textStream = null; try { - FileInputStream textStream = new FileInputStream(attachmentFile.getFile()); + textStream = new FileInputStream(attachmentFile.getFile()); DocFlavor flavor = DocFlavor.INPUT_STREAM.AUTOSENSE; Doc mydoc = new SimpleDoc(textStream, flavor, null); @@ -348,6 +350,8 @@ throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); + } finally { + IOUtils.closeQuietly(textStream); } }