Author: echatellier Date: 2014-09-10 10:44:34 +0200 (Wed, 10 Sep 2014) New Revision: 615 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/615 Log: Fix job name for easy debug Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.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/actions/PrintOnDefaultPrinterAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-09-09 14:40:42 UTC (rev 614) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-09-10 08:44:34 UTC (rev 615) @@ -135,7 +135,7 @@ // print another page for non printed attachments if (!nonPrintedAttachment.isEmpty()) { String errorPageContent = generateErrorPageStream(nonPrintedAttachment); - FaxToMailUIUtil.printText(errorPageContent, true); + FaxToMailUIUtil.printText("nonprintedattachement", errorPageContent, true); } handler.showInformationMessage(t("faxtomail.print.success.message", printedFileNb)); 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-09-09 14:40:42 UTC (rev 614) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-10 08:44:34 UTC (rev 615) @@ -43,7 +43,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; -import java.net.URL; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; @@ -57,17 +56,6 @@ import java.util.regex.Pattern; import javax.media.jai.PlanarImage; -import javax.print.Doc; -import javax.print.DocFlavor; -import javax.print.DocPrintJob; -import javax.print.PrintException; -import javax.print.PrintService; -import javax.print.PrintServiceLookup; -import javax.print.ServiceUI; -import javax.print.SimpleDoc; -import javax.print.attribute.HashPrintRequestAttributeSet; -import javax.print.attribute.PrintRequestAttributeSet; -import javax.print.attribute.standard.Copies; import javax.swing.Icon; import javax.swing.JTextPane; import javax.swing.JTree; @@ -80,15 +68,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import com.itextpdf.text.Document; -import com.itextpdf.text.DocumentException; -import com.itextpdf.text.PageSize; -import com.itextpdf.text.Paragraph; -import com.itextpdf.text.pdf.PdfWriter; -import com.sun.media.jai.codec.ByteArraySeekableStream; -import com.sun.media.jai.codec.ImageCodec; -import com.sun.media.jai.codec.ImageDecoder; -import com.sun.media.jai.codec.SeekableStream; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; @@ -101,7 +80,6 @@ import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import org.nuiton.util.FileUtil; @@ -126,6 +104,15 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; +import com.itextpdf.text.Document; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.PageSize; +import com.itextpdf.text.Paragraph; +import com.itextpdf.text.pdf.PdfWriter; +import com.sun.media.jai.codec.ByteArraySeekableStream; +import com.sun.media.jai.codec.ImageCodec; +import com.sun.media.jai.codec.ImageDecoder; +import com.sun.media.jai.codec.SeekableStream; import com.sun.pdfview.PDFFile; import com.sun.pdfview.PDFPrintPage; @@ -451,9 +438,7 @@ fileInputStream = new FileInputStream(file); - //result = print(fileInputStream, defaultPrinter); - //result = printWithIcePdf(fileInputStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); - result = printWithPdfRenderer(fileInputStream, defaultPrinter, file.getAbsolutePath()); + result = printWithPdfRenderer(attachmentFile.getFilename(), fileInputStream, defaultPrinter); } catch (IOException | DocumentException e) { throw new ApplicationTechnicalException( @@ -468,11 +453,12 @@ /** * Imprime du texte. * + * @param printName print job name * @param text text to print * @param defaultPrinter if {@code true}, do not display print dialog and print with default printer * @return true if file has been printed, false otherwise */ - public static boolean printText(String text, boolean defaultPrinter) { + public static boolean printText(String printName, String text, boolean defaultPrinter) { boolean result = false; FileInputStream fileInputStream = null; ByteArrayInputStream byteArrayInputStream = null; @@ -485,7 +471,7 @@ File file = convertFileToPdf(byteArrayInputStream, FileType.TEXT); fileInputStream = new FileInputStream(file); - result = printWithPdfRenderer(fileInputStream, defaultPrinter, file.getAbsolutePath()); + result = printWithPdfRenderer(printName, fileInputStream, defaultPrinter); } catch (IOException | DocumentException e) { throw new ApplicationTechnicalException( @@ -497,15 +483,16 @@ } return result; } - + /** * Imprime un attachment file. * + * @param printName print job name * @param fis stream to print * @param defaultPrinter if {@code true}, do not display print dialog and print with default printer * @return true if file has been printed, false otherwise */ - public static boolean printWithPdfRenderer(FileInputStream fis, boolean defaultPrinter, String path) { + protected static boolean printWithPdfRenderer(String printName, FileInputStream fis, boolean defaultPrinter) { boolean result = false; try { @@ -520,12 +507,11 @@ PrinterJob pjob = PrinterJob.getPrinterJob(); PageFormat pf = pjob.defaultPage(); Paper paper = new Paper(); - paper.setImageableArea(0, 0, - paper.getWidth() * 2, paper.getHeight()); + paper.setImageableArea(0, 0, paper.getWidth() * 2, paper.getHeight()); pf.setPaper(paper); // Create Print Job - pjob.setJobName(path); + pjob.setJobName(printName); Book book = new Book(); book.append(pages, pf, pdfFile.getNumPages()); pjob.setPageable(book);