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 8874119cf4e7b921135339e0abc81436d9ea7ebb Author: jcouteau <couteau@codelutin.com> Date: Fri Sep 28 11:04:30 2018 +0200 - refs #10100 : Message d'erreur plus clair (ajout du nom de fichier) --- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 dbe67349..248f81ca 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 @@ -584,9 +584,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { final boolean result = defaultPrinter || printJob.printDialog(attributes); if (result) { - //Use SwingWorker so that printing does not block UI (cf. #9786) - SwingWorker worker = new SwingWorker<Integer, Void>() { @Override public Integer doInBackground() { @@ -595,9 +593,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { printJob.setPrintable(filesPrintable); try { - printJob.print(attributes); - } catch (PrinterException ex) { if (log.isErrorEnabled()) { log.error("can't print", ex); @@ -656,11 +652,13 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { @Override public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException { + File printedFile = null; try { if (pageIndex >= countPages) { IOUtils.closeQuietly(pdDocument); if (filesToPrint.hasNext()) { - pdDocument = PDDocument.load(filesToPrint.next()); + printedFile = filesToPrint.next(); + pdDocument = PDDocument.load(printedFile); currentRenderer = new PDFRenderer(pdDocument); pageIndexFile = countPages; countPages += pdDocument.getNumberOfPages(); @@ -725,11 +723,16 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { return Printable.PAGE_EXISTS; } catch (Exception e) { + String fileName = "unknown"; + if (null != printedFile){ + fileName = printedFile.getName(); + } + if (log.isErrorEnabled()) { - log.error("error while printing", e); + log.error("error while printing file : " + fileName, e); } IOUtils.closeQuietly(pdDocument); - throw new PrinterException("Error while printing : " + e.getMessage()); + throw new PrinterException("Error while printing file : " + fileName + " : " + e.getMessage()); } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.