September 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r616 - in trunk: . faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 10 Sep '14

10 Sep '14

Author: kmorin Date: 2014-09-10 11:44:34 +0200 (Wed, 10 Sep 2014) New Revision: 616 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/616 Log: fix compilation Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-10 08:44:34 UTC (rev 615) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-10 09:44:34 UTC (rev 616) @@ -67,6 +67,7 @@ import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import com.franciaflex.faxtomail.FaxToMailConfiguration; @@ -425,7 +426,7 @@ return ((java.util.List<Object>) comboModel.getSelectedItem()).contains(value); } }); - final Method mutator = BeanUIUtil.getMutator(getModel(), property); + final Method mutator = BeanUtil.getMutator(getModel(), property); comboBox.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-10 08:44:34 UTC (rev 615) +++ trunk/pom.xml 2014-09-10 09:44:34 UTC (rev 616) @@ -100,7 +100,7 @@ <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion>

1 0

r615 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions util
by echatellier＠users.forge.codelutin.com 10 Sep '14

10 Sep '14

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);

1 0

r614 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Sep '14

09 Sep '14

Author: echatellier Date: 2014-09-09 16:40:42 +0200 (Tue, 09 Sep 2014) New Revision: 614 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/614 Log: Fix new date() Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-09 14:39:34 UTC (rev 613) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-09 14:40:42 UTC (rev 614) @@ -1287,7 +1287,7 @@ scopes.put("waitingState", email.getWaitingState() == null ? "" : email.getWaitingState().getLabel()); scopes.put("status", email.getDemandStatus() == null ? "" : email.getDemandStatus().getLabel()); scopes.put("takenBy", email.getTakenBy() == null ? "" : (email.getTakenBy().getLogin() + " " + email.getTakenBy().getFirstName() + " " + email.getTakenBy().getLastName())); - scopes.put("date", DateFormatUtils.format(new Date(), "dd/MM/yyyy")); + scopes.put("date", DateFormatUtils.format(serviceContext.getNow(), "dd/MM/yyyy")); // find template InputStream is = EmailServiceImpl.class.getResourceAsStream("/pdf/demande.mustache");

1 0

r613 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Sep '14

09 Sep '14

Author: echatellier Date: 2014-09-09 16:39:34 +0200 (Tue, 09 Sep 2014) New Revision: 613 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/613 Log: Fix accent loosing Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-09 14:04:41 UTC (rev 612) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-09 14:39:34 UTC (rev 613) @@ -1292,7 +1292,7 @@ // find template InputStream is = EmailServiceImpl.class.getResourceAsStream("/pdf/demande.mustache"); MustacheFactory mf = new DefaultMustacheFactory(); - Mustache mustache = mf.compile(new InputStreamReader(is), "demande"); + Mustache mustache = mf.compile(new InputStreamReader(is, StandardCharsets.UTF_8), "demande"); StringWriter writer = new StringWriter(); mustache.execute(writer, scopes); writer.flush();

1 0

r612 - in trunk: . faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util f
by kmorin＠users.forge.codelutin.com 09 Sep '14

09 Sep '14

Author: kmorin Date: 2014-09-09 16:04:41 +0200 (Tue, 09 Sep 2014) New Revision: 612 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/612 Log: refs #5743 Impossible d'imprimer correctement depuis windows fixes #5745 La fenetre de configuration de l'impression apparait derriere l'editeur de PDF Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 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/SaveAndOpenModalFrameAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 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/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/pom.xml Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-09-09 14:04:41 UTC (rev 612) @@ -64,6 +64,7 @@ import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import org.nuiton.util.converter.ConverterUtil; @@ -110,6 +111,8 @@ public static final String PROPERTY_HIDE_BODY = "hideBody"; + private static final String PROPERTY_ACTION_IN_PROGRESS = "actionInProgress"; + /** * Application context (only one for all the application). */ @@ -161,6 +164,11 @@ protected boolean hideBody; /** + * Flag to know if an action is already in progress. + */ + protected boolean actionInProgress; + + /** * Message notifiers. */ protected final Set<UIMessageNotifier> messageNotifiers; @@ -607,6 +615,17 @@ } @Override + public boolean isActionInProgress(ApplicationUIAction action) { + return actionInProgress; + } + + @Override + public void setActionInProgress(ApplicationUIAction action, boolean actionInProgress) { + this.actionInProgress = actionInProgress; + firePropertyChange(PROPERTY_ACTION_IN_PROGRESS, null, actionInProgress); + } + + @Override public Color getColorBlockingLayer() { return getConfig().getColorBlockingLayer(); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-09 14:04:41 UTC (rev 612) @@ -33,6 +33,7 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import javax.swing.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -46,6 +47,7 @@ protected Attachment attachment; protected PDFEditorUI dialogContent; + protected JFrame frame; public EditAttachmentAction(AttachmentEditorUIHandler handler) { super(handler, false); @@ -73,17 +75,23 @@ public void postSuccessAction() { super.postSuccessAction(); MainUI mainUI = getContext().getMainUI(); - getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()) - .addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - } + frame = getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); + frame.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + } - @Override - public void windowClosed(WindowEvent e) { - dialogContent.getModel().toEntity(attachment); - } - }); + @Override + public void windowClosed(WindowEvent e) { + dialogContent.getModel().toEntity(attachment); + } + }); } + @Override + protected void releaseAction() { + super.releaseAction(); + frame.toFront(); + frame = null; + } } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-09 14:04:41 UTC (rev 612) @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel; +import javax.swing.*; import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -45,9 +46,11 @@ protected List<DemandeUIModel> demandsToTransmit; protected MailFolderChooserUI frameContent; - + protected JFrame frame; + public OpenMailFolderChooserFromListAction(DemandeListUIHandler handler) { super(handler, false); + setActionDescription(t("faxtomail.action.openMailFolderChooser.tip")); } @Override @@ -92,6 +95,13 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - getHandler().openModalFrame(frameContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500)); + frame = getHandler().openModalFrame(frameContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500)); } + + @Override + protected void releaseAction() { + super.releaseAction(); + frame.toFront(); + frame = null; + } } 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 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-09-09 14:04:41 UTC (rev 612) @@ -79,6 +79,7 @@ AbstractFaxToMailUIHandler handler = (AbstractFaxToMailUIHandler) getHandler(); Configuration config = getContext().newServiceContext().getConfigurationService().getConfiguration(); + int printedFileNb = 0; Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); notPrintableDemands = new ArrayList<DemandeUIModel>(); @@ -101,15 +102,18 @@ Email email = demandeUIModel.toEntity(); final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); // print details - FaxToMailUIUtil.print(demandDetailAttachment, true); - printedFiles.add(demandDetailAttachment.getFilename()); + if (FaxToMailUIUtil.print(demandDetailAttachment, true)) { + printedFiles.add(demandDetailAttachment.getFilename()); + + } else { + nonPrintedAttachment.put(demandeUIModel, demandDetailAttachment); + } } for (AttachmentFile attachmentFile : attachmentsToPrintByDemand.get(demandeUIModel)) { if (attachmentFile != null) { boolean printable = FaxToMailUIUtil.isFileTypeEditable(attachmentFile.getFilename()); - if (printable) { - FaxToMailUIUtil.print(attachmentFile, true); + if (printable && FaxToMailUIUtil.print(attachmentFile, true)) { printedFiles.add(attachmentFile.getFilename()); } else { @@ -123,15 +127,18 @@ getContext().getCurrentUser(), new Date(), printedFiles.toArray(new String[printedFiles.size()])); + printedFileNb += printedFiles.size(); demandeUIModel.setHistory(email.getHistory()); } } // print another page for non printed attachments if (!nonPrintedAttachment.isEmpty()) { - InputStream errorPageStream = generateErrorPageStream(nonPrintedAttachment); - FaxToMailUIUtil.print(errorPageStream, true); + String errorPageContent = generateErrorPageStream(nonPrintedAttachment); + FaxToMailUIUtil.printText(errorPageContent, true); } + + handler.showInformationMessage(t("faxtomail.print.success.message", printedFileNb)); } @Override @@ -157,7 +164,7 @@ * @param nonPrintedAttachment not printed attachment list * @return input stream with content */ - protected InputStream generateErrorPageStream(Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment) { + protected String generateErrorPageStream(Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment) { // generate text content StringBuilder builder = new StringBuilder(); @@ -175,10 +182,6 @@ builder.append(" - " + attachmentFile.getFilename() + "\n"); } } - - // convert text content to inputstream - byte[] content = builder.toString().getBytes(Charsets.UTF_8); - InputStream is = new ByteArrayInputStream(content); - return is; + return builder.toString(); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-09 14:04:41 UTC (rev 612) @@ -27,7 +27,11 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; import org.nuiton.jaxx.application.swing.ApplicationUI; +import javax.swing.*; import java.awt.*; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; /** * @author Kevin Morin (Code Lutin) @@ -35,6 +39,7 @@ public abstract class SaveAndOpenModalFrameAction<FC extends ApplicationUI> extends SaveDemandeAction { protected FC frameContent; + protected JFrame frame; public SaveAndOpenModalFrameAction(DemandesUIHandler handler) { super(handler.getCurrentDemandHandler()); @@ -47,6 +52,13 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - getHandler().openModalFrame(frameContent, getTitle(), getDimension()); + frame = getHandler().openModalFrame(frameContent, getTitle(), getDimension()); } + + @Override + protected void releaseAction() { + super.releaseAction(); + frame.toFront(); + frame = null; + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-09-09 14:04:41 UTC (rev 612) @@ -147,7 +147,7 @@ openAttachmentAction.setAttachment(attachment, true); // run Internal to prevent multiple successive execution (#5668) - getContext().getActionEngine().runInternalAction(openAttachmentAction); + getContext().getActionEngine().runAction(openAttachmentAction); } public void editAttachment(Attachment attachment) { @@ -156,30 +156,23 @@ if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) { editAttachmentAction.setAttachment(attachment); // run Internal to prevent multiple successive execution (#5668) - getContext().getActionEngine().runInternalAction(editAttachmentAction); + getContext().getActionEngine().runAction(editAttachmentAction); } else if (attachment.getEditedFileName() != null) { openAttachmentAction.setAttachment(attachment, false); // run Internal to prevent multiple successive execution (#5668) - getContext().getActionEngine().runInternalAction(openAttachmentAction); + getContext().getActionEngine().runAction(openAttachmentAction); } } public void removeAttachment(AttachmentItem attachmentItem) { Attachment attachment = attachmentItem.getAttachment(); - boolean hackDialog = ui.isAlwaysOnTop(); - if (hackDialog) { - ui.setAlwaysOnTop(false); - } int answer = JOptionPane.showConfirmDialog(ui, t("faxtomail.attachmentEditor.deleteAttachment.message", attachment.getOriginalFileName()), t("faxtomail.attachmentEditor.deleteAttachment.title"), JOptionPane.YES_NO_OPTION ); - if (hackDialog) { - ui.setAlwaysOnTop(true); - } if (answer == JOptionPane.YES_OPTION) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-09 14:04:41 UTC (rev 612) @@ -186,7 +186,7 @@ File file = attachmentFile.getFile(); if (!FaxToMailUIUtil.isFileAPDF(attachmentFile)) { try { - file = convertFileToPdf(file); + file = convertFileToPdf(attachmentFile); } catch (IOException e) { if (log.isErrorEnabled()) { @@ -526,70 +526,8 @@ container.updateUI(); } - public File convertFileToPdf(File file) throws IOException, DocumentException { - - AttachmentFile attachmentFile = getModel().getNotNullFile(); - File target = File.createTempFile("faxtomail-", ".tmp"); - target.deleteOnExit(); - - Document document = new Document(); - FileOutputStream fos = new FileOutputStream(target); - PdfWriter writer = PdfWriter.getInstance(document, fos); - writer.open(); - - document.setPageSize(PageSize.A4); - document.open(); - - if (FaxToMailUIUtil.isFileATxt(attachmentFile)) { - BufferedReader br = null; - try { - br = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)); - StringBuilder text = new StringBuilder(); - while (br.readLine() != null) { - text.append(br.readLine()).append("\n"); - } - document.add(new Paragraph(text.toString())); - br.close(); - } finally { - IOUtils.closeQuietly(br); - } - - } else if (FaxToMailUIUtil.isFileATif(attachmentFile)) { - FileInputStream fis = null; - try { - fis = new FileInputStream(file); - FileChannel channel = fis.getChannel(); - ByteBuffer buffer = ByteBuffer.allocate((int) channel.size()); - channel.read(buffer); - SeekableStream stream = new ByteArraySeekableStream(buffer.array()); - String[] names = ImageCodec.getDecoderNames(stream); - ImageDecoder tifImageDecoder = ImageCodec.createImageDecoder(names[0], stream, null); - - for (int i = 0 ; i < tifImageDecoder.getNumPages() ; i++) { - RenderedImage renderedImage = tifImageDecoder.decodeAsRenderedImage(i); - java.awt.Image awtImage = PlanarImage.wrapRenderedImage(renderedImage).getAsBufferedImage(); - document.newPage(); - com.itextpdf.text.Image image = com.itextpdf.text.Image.getInstance(writer, awtImage, 1.0f); - image.scaleToFit(PageSize.A4.getWidth() - document.leftMargin() - document.rightMargin(), - PageSize.A4.getHeight() - document.topMargin() - document.bottomMargin()); - document.add(image); - } - fis.close(); - } finally { - IOUtils.closeQuietly(fis); - } - - } else { - URL resource = file.toURI().toURL(); - com.itextpdf.text.Image image = com.itextpdf.text.Image.getInstance(resource); - float scaler = ((document.getPageSize().getWidth() - document.leftMargin() - document.rightMargin()) / image.getWidth()) * 100; - image.scalePercent(scaler); - document.add(image); - } - - document.close(); - writer.close(); - + public File convertFileToPdf(AttachmentFile attachmentFile) throws IOException, DocumentException { + File target = FaxToMailUIUtil.convertFileToPdf(attachmentFile); // convert content to blob FaxToMailServiceContext serviceContext = getContext().newServiceContext(); AttachmentFile attachmentFileNew = serviceContext.getEmailService().getAttachmentFileFromStream(new FileInputStream(target)); 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-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-09-09 14:04:41 UTC (rev 612) @@ -48,6 +48,8 @@ import org.nuiton.jaxx.application.swing.util.Cancelable; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @@ -155,10 +157,15 @@ PrintOnDefaultPrinterAction action = new PrintOnDefaultPrinterAction(this, attachmentToPrints, false, - false); - getContext().getActionEngine().runActionAndWait(action); - showInformationMessage("faxtomail.print.success.message"); - closeFrame(); + false) { + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + closeFrame(); + } + }; + getContext().getActionEngine().runAction(action); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-09 14:04:41 UTC (rev 612) @@ -329,7 +329,6 @@ } }); - result.setAlwaysOnTop(true); result.setSize(dim); SwingUtil.center(parentContainer, result); result.setVisible(true); 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 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-09 14:04:41 UTC (rev 612) @@ -28,18 +28,25 @@ import java.awt.Component; import java.awt.Desktop; import java.awt.Font; +import java.awt.image.RenderedImage; import java.awt.print.Book; import java.awt.print.PageFormat; import java.awt.print.Paper; import java.awt.print.PrinterException; import java.awt.print.PrinterJob; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; 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; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -49,6 +56,7 @@ import java.util.Map; import java.util.regex.Pattern; +import javax.media.jai.PlanarImage; import javax.print.Doc; import javax.print.DocFlavor; import javax.print.DocPrintJob; @@ -72,11 +80,21 @@ 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; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; +import org.apache.commons.io.Charsets; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -413,24 +431,6 @@ } } - public static Desktop getDesktopForPrint() { - - if (!Desktop.isDesktopSupported()) { - throw new ApplicationTechnicalException( - t("jaxx.application.error.desktop.print.not.supported")); - } - - Desktop desktop = Desktop.getDesktop(); - - if (!desktop.isSupported(Desktop.Action.PRINT)) { - - throw new ApplicationTechnicalException( - t("jaxx.application.error.desktop.print.not.supported")); - } - - return desktop; - } - /** * Imprime un attachment file. * @@ -440,96 +440,61 @@ */ public static boolean print(AttachmentFile attachmentFile, boolean defaultPrinter) { boolean result = false; - FileInputStream textStream = null; + FileInputStream fileInputStream = null; try { - textStream = new FileInputStream(attachmentFile.getFile()); + File file; + if (!FaxToMailUIUtil.isFileAPDF(attachmentFile)) { + file = convertFileToPdf(attachmentFile); + } else { + file = attachmentFile.getFile(); + } - //result = print(textStream, defaultPrinter); - //result = printWithIcePdf(textStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); - result = printWithPdfRenderer(textStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); + fileInputStream = new FileInputStream(file); + + //result = print(fileInputStream, defaultPrinter); + //result = printWithIcePdf(fileInputStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); + result = printWithPdfRenderer(fileInputStream, defaultPrinter, file.getAbsolutePath()); - } catch (IOException e) { + } catch (IOException | DocumentException e) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); + } finally { - IOUtils.closeQuietly(textStream); + IOUtils.closeQuietly(fileInputStream); } return result; } /** - * Imprime un attachment file. + * Imprime du texte. * - * @param inputStream stream to print + * @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 - * - * @deprecated not working on windows */ - @Deprecated - public static boolean print(InputStream inputStream, boolean defaultPrinter) { - boolean result = true; + public static boolean printText(String text, boolean defaultPrinter) { + boolean result = false; + FileInputStream fileInputStream = null; + ByteArrayInputStream byteArrayInputStream = null; + try { + // convert text content to inputstream + byte[] content = text.getBytes(Charsets.UTF_8); + byteArrayInputStream = new ByteArrayInputStream(content); - DocFlavor flavor = DocFlavor.INPUT_STREAM.AUTOSENSE; - Doc mydoc = new SimpleDoc(inputStream, flavor, null); + File file = convertFileToPdf(byteArrayInputStream, FileType.TEXT); - PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(); - aset.add(new Copies(1)); + fileInputStream = new FileInputStream(file); + result = printWithPdfRenderer(fileInputStream, defaultPrinter, file.getAbsolutePath()); - PrintService[] services = PrintServiceLookup.lookupPrintServices(flavor, aset); - PrintService defaultService = PrintServiceLookup.lookupDefaultPrintService(); - - if (defaultPrinter) { - DocPrintJob job; - - if (defaultService == null) { - if (services.length == 0) { - throw new ApplicationBusinessException(t("jaxx.application.error.noPrinter")); - } - job = services[0].createPrintJob(); - if (log.isWarnEnabled()) { - log.warn("No default printer found, use " + services[0].getName() + " instead"); - } - } else { - if (log.isDebugEnabled()) { - log.debug("Automatic print on " + defaultService.getName()); - for (DocFlavor flavor2 : defaultService.getSupportedDocFlavors()) { - log.debug(String.format(" - supported flavor %s", flavor2.getMimeType())); - } - } - job = defaultService.createPrintJob(); - } - job.print(mydoc, aset); - - } else { - - if (services.length == 0) { - if (defaultService == null) { - throw new ApplicationBusinessException(t("jaxx.application.error.noPrinter")); - - } else { - services = new PrintService[] { - defaultService - }; - } - } - - //built in UI for printing you may not use this - PrintService service = ServiceUI.printDialog(null, 200, 200, services, defaultService, flavor, aset); - - result = service != null; - if (result) { - DocPrintJob job = service.createPrintJob(); - job.print(mydoc, aset); - } - } - - } catch (PrintException e) { + } catch (IOException | DocumentException e) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); + + } finally { + IOUtils.closeQuietly(fileInputStream); + IOUtils.closeQuietly(byteArrayInputStream); } - return result; } @@ -541,7 +506,7 @@ * @return true if file has been printed, false otherwise */ public static boolean printWithPdfRenderer(FileInputStream fis, boolean defaultPrinter, String path) { - boolean result = true; + boolean result = false; try { // Create a PDFFile from a File reference @@ -566,12 +531,12 @@ pjob.setPageable(book); // Send print job to default printer - pjob.print(); - } catch (PrinterException ex) { - if (log.isErrorEnabled()) { - log.error("can't print", ex); + result = defaultPrinter || pjob.printDialog(); + if (result) { + pjob.print(); } - } catch (IOException ex) { + + } catch (PrinterException | IOException ex) { if (log.isErrorEnabled()) { log.error("can't print", ex); } @@ -580,6 +545,98 @@ return result; } + public static File convertFileToPdf(AttachmentFile attachmentFile) throws IOException, DocumentException { + File file = attachmentFile.getFile(); + FileType type; + if (FaxToMailUIUtil.isFileATxt(attachmentFile)) { + type = FileType.TEXT; + + } else if (FaxToMailUIUtil.isFileATif(attachmentFile)) { + type = FileType.TIF; + + } else { + type = FileType.OTHER; + } + File result = convertFileToPdf(new FileInputStream(file), type); + return result; + } + + protected enum FileType { + TEXT, TIF, OTHER + } + + protected static File convertFileToPdf(InputStream inputStream, FileType type) throws IOException, DocumentException { + File target = File.createTempFile("faxtomail-", ".tmp"); + target.deleteOnExit(); + + Document document = new Document(); + FileOutputStream fos = new FileOutputStream(target); + PdfWriter writer = PdfWriter.getInstance(document, fos); + writer.open(); + + document.setPageSize(PageSize.A4); + document.open(); + + if (type == FileType.TEXT) { + BufferedReader br = null; + try { + br = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); + StringBuilder text = new StringBuilder(); + while (br.readLine() != null) { + text.append(br.readLine()).append("\n"); + } + document.add(new Paragraph(text.toString())); + br.close(); + + } finally { + IOUtils.closeQuietly(br); + } + + } else if (type == FileType.TIF) { + try { + FileInputStream fis = (FileInputStream) inputStream; + FileChannel channel = fis.getChannel(); + ByteBuffer buffer = ByteBuffer.allocate((int) channel.size()); + channel.read(buffer); + SeekableStream stream = new ByteArraySeekableStream(buffer.array()); + String[] names = ImageCodec.getDecoderNames(stream); + ImageDecoder tifImageDecoder = ImageCodec.createImageDecoder(names[0], stream, null); + + for (int i = 0 ; i < tifImageDecoder.getNumPages() ; i++) { + RenderedImage renderedImage = tifImageDecoder.decodeAsRenderedImage(i); + java.awt.Image awtImage = PlanarImage.wrapRenderedImage(renderedImage).getAsBufferedImage(); + document.newPage(); + com.itextpdf.text.Image image = com.itextpdf.text.Image.getInstance(writer, awtImage, 1.0f); + image.scaleToFit(PageSize.A4.getWidth() - document.leftMargin() - document.rightMargin(), + PageSize.A4.getHeight() - document.topMargin() - document.bottomMargin()); + document.add(image); + } + fis.close(); + } finally { + IOUtils.closeQuietly(inputStream); + } + + } else { + byte[] bytes = IOUtils.toByteArray(inputStream); + com.itextpdf.text.Image image = com.itextpdf.text.Image.getInstance(bytes); + float pageWidth = document.getPageSize().getWidth()- document.leftMargin() - document.rightMargin(); + float pageHeight = document.getPageSize().getHeight()- document.topMargin() - document.bottomMargin(); + float imageWidth = image.getWidth(); + float imageHeight = image.getHeight(); + if (pageWidth < imageWidth || pageHeight < imageHeight) { + float scaler = Math.min(pageWidth / imageWidth, pageHeight / imageHeight) * 100; + image.scalePercent(scaler); + } + document.add(image); + } + + document.close(); + writer.close(); + + return target; + } + + public static String getEditedFileName(String originalFileName) { return t("faxtomail.attachment.editedFile.name", originalFileName) + "-.pdf"; } Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-09 14:04:41 UTC (rev 612) @@ -16,6 +16,7 @@ faxtomail.action.goto.search.tip=Aller à l'écran de recherche faxtomail.action.group.tip=Grouper l'élément faxtomail.action.loadFolderEmails.tip=Chargement des demandes du dossier %s +faxtomail.action.openMailFolderChooser.tip=Ouverture de la fenêtre de sélection du dossier de destination faxtomail.action.print.notPrintableDemands.message=<html>Les éléments suivant n'ont pas été imprimés car ils n'étaient pas valides \:<br/>%s</html> faxtomail.action.print.notPrintableDemands.title=Éléments non imprimés faxtomail.action.print.tip=Impression @@ -230,8 +231,9 @@ faxtomail.pdfEditor.button.addVLine.tip=Ajouter une ligne verticale faxtomail.pdfEditor.button.nextPage=Page suivante faxtomail.pdfEditor.button.previousPage=Page précédente -faxtomail.pdfEditor.convertToPdf.error= -faxtomail.pdfEditor.readPdf.error= +faxtomail.pdfEditor.convertToPdf.error=Erreur lors de la conversion en PDF +faxtomail.pdfEditor.readPdf.error=Erreur lors de la lecture du PDF +faxtomail.print.success.message=%s fichiers ont été imprimés faxtomail.quantitiesByRange.button.text=OK faxtomail.quantitiesByRange.title=Quantités par gamme faxtomail.rangeRows.table.header.commandNumber=N° commande / devis Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-09 09:23:08 UTC (rev 611) +++ trunk/pom.xml 2014-09-09 14:04:41 UTC (rev 612) @@ -110,7 +110,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.11</jaxxVersion> + <jaxxVersion>2.12-SNAPSHOT</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r611 - trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Sep '14

09 Sep '14

Author: echatellier Date: 2014-09-09 11:23:08 +0200 (Tue, 09 Sep 2014) New Revision: 611 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/611 Log: Remove Thread sleep Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-09-09 09:20:47 UTC (rev 610) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-09-09 09:23:08 UTC (rev 611) @@ -139,7 +139,6 @@ // test pdf generation AttachmentFile attachmentFile = service.getEmailDetailAsAttachment(testEmail); Assert.assertNotNull(attachmentFile); - Thread.sleep(10000); } /**

1 0

r610 - in trunk: . faxtomail-service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/resources/pdf faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Sep '14

09 Sep '14

Author: echatellier Date: 2014-09-09 11:20:47 +0200 (Tue, 09 Sep 2014) New Revision: 610 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/610 Log: Replace odt template by html mustache template Added: trunk/faxtomail-service/src/main/resources/pdf/demande.mustache Removed: trunk/faxtomail-service/src/main/resources/pdf/demande.odt trunk/faxtomail-service/src/main/resources/pdf/demande.pdf Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/pom.xml Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-09-05 12:01:37 UTC (rev 609) +++ trunk/faxtomail-service/pom.xml 2014-09-09 09:20:47 UTC (rev 610) @@ -188,9 +188,14 @@ </dependency> <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> </dependency> + + <dependency> + <groupId>org.xhtmlrenderer</groupId> + <artifactId>flying-saucer-pdf-itext5</artifactId> + </dependency> </dependencies> <build> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-05 12:01:37 UTC (rev 609) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-09 09:20:47 UTC (rev 610) @@ -34,6 +34,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.io.StringWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -67,10 +68,6 @@ import org.apache.commons.mail.EmailConstants; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.MultiPartEmail; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.PDDocumentCatalog; -import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; -import org.apache.pdfbox.pdmodel.interactive.form.PDField; import org.hibernate.Hibernate; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; @@ -80,6 +77,7 @@ import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import org.xhtmlrenderer.pdf.ITextRenderer; import com.franciaflex.faxtomail.persistence.entities.*; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; @@ -89,8 +87,10 @@ import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.franciaflex.faxtomail.services.service.imports.ArchiveImportBean; import com.franciaflex.faxtomail.services.service.imports.ArchiveImportModel; +import com.github.mustachejava.DefaultMustacheFactory; +import com.github.mustachejava.Mustache; +import com.github.mustachejava.MustacheFactory; import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -1245,41 +1245,22 @@ */ @Override public AttachmentFile getEmailDetailAsAttachment(Email email) { - Map<String, String> pdfFieldValues = Maps.newHashMap(); - InputStream emptyPage = null; - PDDocument resultDocument; AttachmentFile result = null; try { - emptyPage = getClass().getResourceAsStream("/pdf/demande.pdf"); - resultDocument = PDDocument.load(emptyPage); - /*SetField fields = new SetField(); - if (log.isTraceEnabled()) { - log.trace("fields in document are:"); - PrintFields printFields = new PrintFields(); - printFields.printFields(resultDocument); - }*/ + // get html content + String content = getEmailDetailAsHtml(email); - loadDocumentDedails(pdfFieldValues, email); - - - if (log.isDebugEnabled()) { - log.debug("will fill form document:\n" + pdfFieldValues); - } - - for (Map.Entry<String, String> field : pdfFieldValues.entrySet()) { - String fieldName = field.getKey(); - String fieldValue = field.getValue(); - setField(resultDocument, fieldName, fieldValue); - } - - + // generate pdf ByteArrayOutputStream out = new ByteArrayOutputStream(); - resultDocument.save(out); - resultDocument.close(); + ITextRenderer renderer = new ITextRenderer(); + renderer.setDocumentFromString(content); + renderer.layout(); + renderer.createPDF(out); + // create attachent result = new AttachmentFileImpl(); result.setContent(out.toByteArray()); result.setFilename(t("faxtomail.attachment.demand.filename") + ".pdf"); @@ -1289,46 +1270,36 @@ if (log.isErrorEnabled()) { log.error("", e); } - } finally { - IOUtils.closeQuietly(emptyPage); } return result; } + + protected String getEmailDetailAsHtml(Email email) { + Map<String, Object> scopes = new HashMap<String, Object>(); + scopes.put("receivedDate", DateFormatUtils.format(email.getReceptionDate(), "dd/MM/yyyy")); + scopes.put("sender", email.getSender()); + scopes.put("object", email.getObject()); + scopes.put("clientCode", email.getClient() == null ? "" : email.getClient().getCode()); + scopes.put("demandType", email.getDemandType() == null ? "" : email.getDemandType().getLabel()); + scopes.put("priority", email.getPriority() == null ? "" : email.getPriority().getLabel()); + scopes.put("projectReference", email.getProjectReference()); + scopes.put("companyReference", email.getCompanyReference()); + scopes.put("waitingState", email.getWaitingState() == null ? "" : email.getWaitingState().getLabel()); + scopes.put("status", email.getDemandStatus() == null ? "" : email.getDemandStatus().getLabel()); + scopes.put("takenBy", email.getTakenBy() == null ? "" : (email.getTakenBy().getLogin() + " " + email.getTakenBy().getFirstName() + " " + email.getTakenBy().getLastName())); + scopes.put("date", DateFormatUtils.format(new Date(), "dd/MM/yyyy")); - protected void loadDocumentDedails(Map<String, String> pdfFieldValues, Email email) { - setField(pdfFieldValues, "demand", email.getObject()); - setField(pdfFieldValues, "receivedDate", DateFormatUtils.format(email.getReceptionDate(), "dd/MM/yyyy")); - setField(pdfFieldValues, "sender", email.getSender()); - setField(pdfFieldValues, "object", email.getObject()); - setField(pdfFieldValues, "clientCode", email.getClient() == null ? "" : email.getClient().getCode()); - setField(pdfFieldValues, "demandType", email.getDemandType() == null ? "" : email.getDemandType().getLabel()); - setField(pdfFieldValues, "priority", email.getPriority() == null ? "" : email.getPriority().getLabel()); - setField(pdfFieldValues, "projectReference", email.getProjectReference()); - setField(pdfFieldValues, "companyReference", email.getCompanyReference()); - setField(pdfFieldValues, "waitingState", email.getWaitingState() == null ? "" : email.getWaitingState().getLabel()); - setField(pdfFieldValues, "status", email.getDemandStatus() == null ? "" : email.getDemandStatus().getLabel()); - setField(pdfFieldValues, "takenBy", email.getTakenBy() == null ? "" : (email.getTakenBy().getLogin() + " " + email.getTakenBy().getFirstName() + " " + email.getTakenBy().getLastName())); + // find template + InputStream is = EmailServiceImpl.class.getResourceAsStream("/pdf/demande.mustache"); + MustacheFactory mf = new DefaultMustacheFactory(); + Mustache mustache = mf.compile(new InputStreamReader(is), "demande"); + StringWriter writer = new StringWriter(); + mustache.execute(writer, scopes); + writer.flush(); + + return writer.toString(); } - protected void setField(Map<String, String> pdfFieldValues, String fieldName, String... value) { - if (value == null) { - pdfFieldValues.put(fieldName, ""); - } else { - pdfFieldValues.put(fieldName, Joiner.on(" ").skipNulls().join(value)); - } - } - - protected void setField(PDDocument pdfDocument, String name, String value ) throws IOException { - PDDocumentCatalog docCatalog = pdfDocument.getDocumentCatalog(); - PDAcroForm acroForm = docCatalog.getAcroForm(); - PDField field = acroForm.getField( name ); - if ( field != null ) { - field.setValue( value ); - } else if (log.isWarnEnabled()) { - log.warn("Can't find field " + name + " in pdf form"); - } - } - /** * Compute mail folder path (separated by /) from root to current. * Added: trunk/faxtomail-service/src/main/resources/pdf/demande.mustache =================================================================== --- trunk/faxtomail-service/src/main/resources/pdf/demande.mustache (rev 0) +++ trunk/faxtomail-service/src/main/resources/pdf/demande.mustache 2014-09-09 09:20:47 UTC (rev 610) @@ -0,0 +1,70 @@ +<html> + <head> + <style> + .title { + text-align:center; + } + .footer { + position: running(footer); + font-size: small; + } + @page { + @bottom-center { content: element(footer) } + } + </style> + </head> + <body> + <h1 class="title">Détail de la demande</h1> + + <table> + <tr> + <td>Objet :</td> + <td>{{object}}</td> + </tr> + <tr> + <td>Reçue le :</td> + <td>{{receivedDate}}</td> + </tr> + <tr> + <td>Emetteur :</td> + <td>{{sender}}</td> + </tr> + <tr> + <td>Client :</td> + <td>{{client}}</td> + </tr> + <tr> + <td>Type :</td> + <td>{{demandType}}</td> + </tr> + <tr> + <td>Priorité :</td> + <td>{{priority}}</td> + </tr> + <tr> + <td>Référence chantier :</td> + <td>{{projectReference}}</td> + </tr> + <tr> + <td>Notre référence :</td> + <td>{{companyReference}}</td> + </tr> + <tr> + <td>Etat d'attente :</td> + <td>{{waitingState}}</td> + </tr> + <tr> + <td>Statut :</td> + <td>{{status}}</td> + </tr> + <tr> + <td>Pris par :</td> + <td>{{takenBy}}</td> + </tr> + </table> + + <div class="footer"> + Date d'impression : {{date}} + </div> + </body> +</html> \ No newline at end of file Deleted: trunk/faxtomail-service/src/main/resources/pdf/demande.odt =================================================================== (Binary files differ) Deleted: trunk/faxtomail-service/src/main/resources/pdf/demande.pdf =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-09-05 12:01:37 UTC (rev 609) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-09-09 09:20:47 UTC (rev 610) @@ -28,6 +28,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collections; +import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -123,9 +125,10 @@ /** * Generate email detail as pdf test. + * @throws InterruptedException */ @Test - public void testEmailDetailsPdf() { + public void testEmailDetailsPdf() throws InterruptedException { // select a random test email PaginationParameter paginationParameter = PaginationParameter.of(0, 1); @@ -136,9 +139,26 @@ // test pdf generation AttachmentFile attachmentFile = service.getEmailDetailAsAttachment(testEmail); Assert.assertNotNull(attachmentFile); + Thread.sleep(10000); } + /** + * Test que le contenu textuel du pdf généré. + */ @Test + public void testEmailDetails() { + // select a random test email + PaginationParameter paginationParameter = PaginationParameter.of(0, 1); + EmailFilter filter = new EmailFilter(); + PaginationResult<Email> emails = service.search(filter, getCurrentUser(), paginationParameter); + Email testEmail = emails.getElements().get(0); + + // get html content + String content = ((EmailServiceImpl)service).getEmailDetailAsHtml(testEmail); + Assert.assertTrue(content.contains(testEmail.getObject())); + } + + @Test public void testGetEmailForFolder() { // tests fetch + pagination Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-05 12:01:37 UTC (rev 609) +++ trunk/pom.xml 2014-09-09 09:20:47 UTC (rev 610) @@ -590,9 +590,9 @@ </dependency> <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>1.8.6</version> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> + <version>0.8.16</version> </dependency> <dependency>

1 0

r609 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by echatellier＠users.forge.codelutin.com 05 Sep '14

05 Sep '14

Author: echatellier Date: 2014-09-05 14:01:37 +0200 (Fri, 05 Sep 2014) New Revision: 609 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/609 Log: Tentative de correction de l'impression pour windows Modified: 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/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-05 08:52:42 UTC (rev 608) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-05 12:01:37 UTC (rev 609) @@ -28,11 +28,18 @@ import java.awt.Component; import java.awt.Desktop; import java.awt.Font; +import java.awt.print.Book; +import java.awt.print.PageFormat; +import java.awt.print.Paper; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -52,6 +59,7 @@ 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; @@ -100,6 +108,8 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; +import com.sun.pdfview.PDFFile; +import com.sun.pdfview.PDFPrintPage; /** * @author kmorin - morin(a)codelutin.com @@ -434,7 +444,10 @@ try { textStream = new FileInputStream(attachmentFile.getFile()); - result = print(textStream, defaultPrinter); + //result = print(textStream, defaultPrinter); + //result = printWithIcePdf(textStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); + result = printWithPdfRenderer(textStream, defaultPrinter, attachmentFile.getFile().getAbsolutePath()); + } catch (IOException e) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); @@ -450,7 +463,10 @@ * @param inputStream 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 + * + * @deprecated not working on windows */ + @Deprecated public static boolean print(InputStream inputStream, boolean defaultPrinter) { boolean result = true; try { @@ -459,6 +475,7 @@ Doc mydoc = new SimpleDoc(inputStream, flavor, null); PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(); + aset.add(new Copies(1)); PrintService[] services = PrintServiceLookup.lookupPrintServices(flavor, aset); PrintService defaultService = PrintServiceLookup.lookupDefaultPrintService(); @@ -477,6 +494,9 @@ } else { if (log.isDebugEnabled()) { log.debug("Automatic print on " + defaultService.getName()); + for (DocFlavor flavor2 : defaultService.getSupportedDocFlavors()) { + log.debug(String.format(" - supported flavor %s", flavor2.getMimeType())); + } } job = defaultService.createPrintJob(); } @@ -512,7 +532,54 @@ return result; } + + /** + * Imprime un attachment file. + * + * @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) { + boolean result = true; + try { + // Create a PDFFile from a File reference + FileChannel fc = fis.getChannel(); + ByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()); + PDFFile pdfFile = new PDFFile(bb); // Create PDF Print Page + PDFPrintPage pages = new PDFPrintPage(pdfFile); + + // fix fit to page + // see http://lynema.org/2010/12/29/printing-a-pdf-in-java-with-pdfrenderer + PrinterJob pjob = PrinterJob.getPrinterJob(); + PageFormat pf = pjob.defaultPage(); + Paper paper = new Paper(); + paper.setImageableArea(0, 0, + paper.getWidth() * 2, paper.getHeight()); + pf.setPaper(paper); + + // Create Print Job + pjob.setJobName(path); + Book book = new Book(); + book.append(pages, pf, pdfFile.getNumPages()); + pjob.setPageable(book); + + // Send print job to default printer + pjob.print(); + } catch (PrinterException ex) { + if (log.isErrorEnabled()) { + log.error("can't print", ex); + } + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("can't print", ex); + } + } + + return result; + } + public static String getEditedFileName(String originalFileName) { return t("faxtomail.attachment.editedFile.name", originalFileName) + "-.pdf"; }

1 0

r608 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap
by echatellier＠users.forge.codelutin.com 05 Sep '14

05 Sep '14

Author: echatellier Date: 2014-09-05 10:52:42 +0200 (Fri, 05 Sep 2014) New Revision: 608 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/608 Log: Fix mock service to be non random Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-09-04 10:26:31 UTC (rev 607) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-09-05 08:52:42 UTC (rev 608) @@ -43,48 +43,40 @@ */ public class LdapServiceMock extends LdapServiceImpl { - protected FaxToMailUser fakeUser; - protected FaxToMailUser getFakeFaxToMailUser() { - if (fakeUser == null) { - FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); - FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao(); + FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - fakeUser = userDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_TOPIA_ID).findFirstOrNull(); + FaxToMailUser fakeUser = userDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_TOPIA_ID).findFirstOrNull(); - // create user - if (fakeUser == null) { - fakeUser = new FaxToMailUserImpl(); - fakeUser.setTrigraph("fkr"); - fakeUser.setFirstName("Test ldap"); - fakeUser.setLastName("Test ldap"); - fakeUser.setLogin("test"); - fakeUser = userDao.create(fakeUser); + // create user + if (fakeUser == null) { + fakeUser = new FaxToMailUserImpl(); + fakeUser.setTrigraph("fkr"); + fakeUser.setFirstName("Test ldap"); + fakeUser.setLastName("Test ldap"); + fakeUser.setLogin("test"); + fakeUser = userDao.create(fakeUser); + } + + // add user to fake group + FaxToMailUserGroup fakeGroup = null; + List<String> adminGroups = getApplicationConfig().getLdapAdminGroups(); + if (CollectionUtils.isNotEmpty(adminGroups)) { + fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull(); + if (fakeGroup == null) { + fakeGroup = new FaxToMailUserGroupImpl(); + fakeGroup.setName("fake group"); + fakeGroup.setCompleteName(adminGroups.get(0)); + fakeGroup = groupDao.create(fakeGroup); } - // add user to fake group - FaxToMailUserGroup fakeGroup = null; - List<String> adminGroups = getApplicationConfig().getLdapAdminGroups(); - if (CollectionUtils.isNotEmpty(adminGroups)) { - fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull(); - if (fakeGroup == null) { - fakeGroup = new FaxToMailUserGroupImpl(); - fakeGroup.setName("fake group"); - fakeGroup.setCompleteName(adminGroups.get(0)); - fakeGroup = groupDao.create(fakeGroup); - } - - if (!fakeUser.containsUserGroups(fakeGroup)) { - fakeUser.addUserGroups(fakeGroup); - } + if (!fakeUser.containsUserGroups(fakeGroup)) { + fakeUser.addUserGroups(fakeGroup); } - - // force collection loading to force non lazy collections - fakeUser.isAffectedFoldersEmpty(); - fakeUser.isUserGroupsEmpty(); + } - getPersistenceContext().commit(); - } + getPersistenceContext().commit(); return fakeUser; } @@ -95,16 +87,29 @@ @Override public FaxToMailUser getUserBean(String userTopiaId) { - return getFakeFaxToMailUser(); + FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUser result = faxtomailUserDao.forTopiaIdEquals(userTopiaId).findUnique(); + // force collection loading to force non lazy collections + result.isAffectedFoldersEmpty(); + result.isUserGroupsEmpty(); + return result; } @Override public FaxToMailUser authenticateUser(String login, String password) throws AuthenticationException { - return getFakeFaxToMailUser(); + return getUserFromPrincipal(login); } @Override public FaxToMailUser getUserFromPrincipal(String principal) throws AuthenticationException { - return getFakeFaxToMailUser(); + FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUser result = faxtomailUserDao.forLoginEquals(principal.toLowerCase()).findUniqueOrNull(); + if (result == null) { + result = getFakeFaxToMailUser(); + } + // force collection loading to force non lazy collections + result.isAffectedFoldersEmpty(); + result.isUserGroupsEmpty(); + return result; } }

1 0

r607 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by echatellier＠users.forge.codelutin.com 04 Sep '14

04 Sep '14

Author: echatellier Date: 2014-09-04 12:26:31 +0200 (Thu, 04 Sep 2014) New Revision: 607 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/607 Log: fixes #5650: Utilisation d'un appel syst?\195?\168me pour ouvrir les pi?\195?\168ces jointe (au moins ca s'ouvre) Modified: 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/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-04 09:55:29 UTC (rev 606) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-04 10:26:31 UTC (rev 607) @@ -72,6 +72,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -470,8 +471,13 @@ throw new ApplicationBusinessException(t("jaxx.application.error.noPrinter")); } job = services[0].createPrintJob(); - + if (log.isWarnEnabled()) { + log.warn("No default printer found, use " + services[0].getName() + " instead"); + } } else { + if (log.isDebugEnabled()) { + log.debug("Automatic print on " + defaultService.getName()); + } job = defaultService.createPrintJob(); } job.print(mydoc, aset); @@ -555,14 +561,21 @@ } } else { - // version to use for xfce - // DesktopUtil.open(file); - try { - // for a mysterious reason, EDIT action is working better than OPEN action - // on windows (ie for ms paint for JPG files) - Desktop desktop = getDesktopForEdit(); - desktop.edit(file); + if (SystemUtils.IS_OS_WINDOWS) { + // tentative pour résoudre http://forge.codelutin.com/issues/5650 + // pas d'idée précise du bug, mais ca semble mieux fonctionner à l'arrache + String command = "rundll32 SHELL32.DLL,ShellExec_RunDLL "+ file.getAbsoluteFile(); + if (log.isDebugEnabled()) { + log.debug("Opening file with command : " + command); + } + Runtime.getRuntime().exec(command); + } else { + // version to use for xfce + // DesktopUtil.open(file); + Desktop desktop = getDesktopForOpen(); + desktop.open(file); + } } catch (Exception ex) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.open"), ex); @@ -571,29 +584,6 @@ } /** - * Return Desktop support for edit files. - * - * @return desktop support - */ - protected static Desktop getDesktopForEdit() { - - if (!Desktop.isDesktopSupported()) { - throw new ApplicationTechnicalException( - t("jaxx.application.error.desktop.not.supported")); - } - - Desktop desktop = Desktop.getDesktop(); - - if (!desktop.isSupported(Desktop.Action.EDIT)) { - - throw new ApplicationTechnicalException( - t("jaxx.application.error.desktop.edit.not.supported")); - } - - return desktop; - } - - /** * Send email. * * @param subject

1 0