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

r711 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 30 Nov '14

30 Nov '14

Author: kmorin Date: 2014-11-30 17:14:54 +0000 (Sun, 30 Nov 2014) New Revision: 711 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/711 Log: - fix error when recipient contains [] - catch invalid charset error Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-11-30 15:55:39 UTC (rev 710) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-11-30 17:14:54 UTC (rev 711) @@ -25,6 +25,7 @@ */ import java.nio.charset.Charset; +import java.nio.charset.UnsupportedCharsetException; import java.util.Collection; import javax.mail.MessagingException; @@ -56,7 +57,13 @@ public static Charset getCharset(Part part) throws MessagingException { ContentType contentType = new ContentType(part.getContentType()); String charsetName = contentType.getParameter("charset"); - Charset charset = Charsets.toCharset(charsetName); + Charset charset; + try { + charset = Charsets.toCharset(charsetName); + + } catch (UnsupportedCharsetException e) { + charset = Charset.defaultCharset(); + } return charset; } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-30 15:55:39 UTC (rev 710) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-30 17:14:54 UTC (rev 711) @@ -176,6 +176,9 @@ */ public void checkEmails(EmailAccount account) { Properties properties = new Properties(); + // set the mail.mime.address.strict to false to avoid + // javax.mail.internet.AddressException: Domain contains illegal character errors when recipients contains [] + properties.setProperty("mail.mime.address.strict", "false"); switch (account.getProtocol()) { case IMAPS:

1 0

r710 - in trunk: . faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing
by kmorin＠users.forge.codelutin.com 30 Nov '14

30 Nov '14

Author: kmorin Date: 2014-11-30 15:55:39 +0000 (Sun, 30 Nov 2014) New Revision: 710 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/710 Log: fix error + dependency Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/pom.xml trunk/pom.xml 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-11-30 15:19:17 UTC (rev 709) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-30 15:55:39 UTC (rev 710) @@ -1867,8 +1867,10 @@ String content = IOUtils.toString(bp.getInputStream(), charset); if (bp.isMimeType("text/plain")) { - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); - attachments.add(attachment); + if (StringUtils.isNotBlank(content)) { + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); + attachments.add(attachment); + } } else { result = content; @@ -2021,6 +2023,7 @@ @Override public Attachment convertTextToPdf(String content, String name) throws IOException, DocumentException { + Preconditions.checkArgument(StringUtils.isNotBlank(content)); //File target = File.createTempFile("faxtomail-", ".tmp"); //target.deleteOnExit(); Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-11-30 15:19:17 UTC (rev 709) +++ trunk/faxtomail-ui-swing/pom.xml 2014-11-30 15:55:39 UTC (rev 710) @@ -241,6 +241,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-30 15:19:17 UTC (rev 709) +++ trunk/pom.xml 2014-11-30 15:55:39 UTC (rev 710) @@ -507,6 +507,12 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>${commonsEmailVersion}</version> + </dependency> + + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1.1</version>

1 0

r709 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 30 Nov '14

30 Nov '14

Author: kmorin Date: 2014-11-30 15:19:17 +0000 (Sun, 30 Nov 2014) New Revision: 709 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/709 Log: refs #6198 Certains emails sont mal interp?\195?\170t?\195?\169s Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-30 14:04:47 UTC (rev 708) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-30 15:19:17 UTC (rev 709) @@ -51,6 +51,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.mail.util.MimeMessageUtils; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -878,7 +879,8 @@ protected void decomposeEmail() { try { // ce code peut provoquer une NPE avec les données de test - Message message = new MimeMessage(null, new ByteArrayInputStream(getOriginalEmail().getBytes(StandardCharsets.UTF_8))); + Message message = MimeMessageUtils.createMimeMessage(null, getOriginalEmail()); + Charset charset = FaxToMailServiceUtils.getCharset(message); subject = MimeUtility.decodeText(message.getSubject()); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-30 14:04:47 UTC (rev 708) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-30 15:19:17 UTC (rev 709) @@ -209,7 +209,7 @@ checkEmailsOfFolder(account, inbox); } catch (Exception e) { - log.error("Error while getting emails from the mailbox", e); + log.error("Error while getting emails from the mailbox " + account.getHost(), e); } finally { close(inbox); @@ -465,7 +465,7 @@ String headerLine = headerLines.nextElement(); emailSource.append(headerLine).append("\n"); } - String originalContent = IOUtils.toString(message.getInputStream(), charset); + String originalContent = IOUtils.toString(((MimeMessage) message).getRawInputStream(), charset); emailSource.append("\n").append(originalContent); email.setOriginalEmail(emailSource.toString());

1 0

r708 - in trunk: . faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 30 Nov '14

30 Nov '14

Author: kmorin Date: 2014-11-30 14:04:47 +0000 (Sun, 30 Nov 2014) New Revision: 708 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/708 Log: fixes #6199 Certains pdf impriment des pages blanches Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/pom.xml 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/util/FaxToMailUIUtil.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-28 13:37:30 UTC (rev 707) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-30 14:04:47 UTC (rev 708) @@ -394,8 +394,8 @@ if (searchFilter.isAddGroupDemands()) { hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " - + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + + "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + query.toString() + ")"; } Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-11-28 13:37:30 UTC (rev 707) +++ trunk/faxtomail-ui-swing/pom.xml 2014-11-30 14:04:47 UTC (rev 708) @@ -225,22 +225,14 @@ <artifactId>itextpdf</artifactId> </dependency> -  <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>pdf-renderer</artifactId> - </dependency> - - <dependency> <groupId>javax.media.jai</groupId> <artifactId>com.springsource.javax.media.jai.core</artifactId> - <version>1.1.3</version> </dependency> <dependency> <groupId>javax.media.jai</groupId> <artifactId>com.springsource.javax.media.jai.codec</artifactId> - <version>1.1.3</version> </dependency> <dependency> 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-11-28 13:37:30 UTC (rev 707) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-30 14:04:47 UTC (rev 708) @@ -102,7 +102,7 @@ String value = (String) actionGroup.getSelectedValue(); model.setSelectedComponent(PDFEditorUIModel.EditionComponent.valueOf(value)); - pdfDecoder = new PdfDecoder(true); + pdfDecoder = new PdfDecoder(); FontMappings.setFontReplacements(); ui.getContainer().addContainerListener(new ContainerListener() { @@ -349,7 +349,7 @@ } protected void displayPage(int pageNb, float previousZoom, int previousRotation) { - if (pageNb < 0 || pageNb > pdfDecoder.getPageCount()) { + if (pageNb < 1 || pageNb > pdfDecoder.getPageCount()) { return; } 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-11-28 13:37:30 UTC (rev 707) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-11-30 14:04:47 UTC (rev 708) @@ -24,14 +24,12 @@ import static org.nuiton.i18n.I18n.t; -import java.awt.Color; -import java.awt.Component; -import java.awt.Desktop; -import java.awt.Font; +import java.awt.*; +import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; -import java.awt.print.Book; import java.awt.print.PageFormat; import java.awt.print.Paper; +import java.awt.print.Printable; import java.awt.print.PrinterException; import java.awt.print.PrinterJob; import java.io.BufferedReader; @@ -59,8 +57,6 @@ import javax.swing.*; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; -import javax.swing.text.StyleConstants; -import javax.swing.text.html.HTMLDocument; import javax.swing.text.html.HTMLEditorKit; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; @@ -68,7 +64,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import com.sun.pdfview.PDFPrintPage; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; @@ -81,6 +76,9 @@ import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jpedal.PdfDecoder; +import org.jpedal.exception.PdfException; +import org.jpedal.fonts.FontMappings; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import org.nuiton.util.FileUtil; @@ -114,8 +112,6 @@ 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; /** * @author kmorin - morin(a)codelutin.com @@ -500,39 +496,54 @@ */ protected static boolean printWithPdfRenderer(String printName, FileInputStream fis, boolean defaultPrinter) { boolean result = false; + final PdfDecoder pdfDecoder = new PdfDecoder(); + FontMappings.setFontReplacements(); 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); + pdfDecoder.openPdfFileFromInputStream(fis, false); - // 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(); + pdfDecoder.setExtractionMode(0, 0, 1f); + PrinterJob printJob = PrinterJob.getPrinterJob(); + printJob.setJobName(printName); + + PageFormat pf = printJob.defaultPage(); Paper paper = new Paper(); - paper.setImageableArea(0, 0, paper.getWidth() * 2, paper.getHeight()); + paper.setImageableArea(0, 0, paper.getWidth(), paper.getHeight()); pf.setPaper(paper); - // Create Print Job - pjob.setJobName(printName); - Book book = new Book(); - book.append(pages, pf, pdfFile.getNumPages()); - pjob.setPageable(book); + printJob.setPrintable(new Printable() { + public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException { + try { + if (pageIndex >= pdfDecoder.getPageCount()) { + return NO_SUCH_PAGE; + } + BufferedImage image = pdfDecoder.getPageAsImage(pageIndex + 1); + graphics.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null); + return PAGE_EXISTS; + } catch (Exception e) { + log.error("error while printing", e); + return NO_SUCH_PAGE; + } + } + }); + // Send print job to default printer - result = defaultPrinter || pjob.printDialog(); + result = defaultPrinter || printJob.printDialog(); if (result) { - pjob.print(); + printJob.print(); } - } catch (PrinterException | IOException ex) { + + } catch (PrinterException | PdfException ex) { if (log.isErrorEnabled()) { log.error("can't print", ex); } + + } finally { + log.info("finally close the pdf file"); + pdfDecoder.closePdfFile(); } return result; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-28 13:37:30 UTC (rev 707) +++ trunk/pom.xml 2014-11-30 14:04:47 UTC (rev 708) @@ -306,15 +306,15 @@ </dependency> <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>pdf-renderer</artifactId> - <version>1.0.5</version> + <groupId>javax.media.jai</groupId> + <artifactId>com.springsource.javax.media.jai.core</artifactId> + <version>1.1.3</version> </dependency> <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>1.8.7</version> + <groupId>javax.media.jai</groupId> + <artifactId>com.springsource.javax.media.jai.codec</artifactId> + <version>1.1.3</version> </dependency>

1 0

r707 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by kmorin＠users.forge.codelutin.com 28 Nov '14

28 Nov '14

Author: kmorin Date: 2014-11-28 13:37:30 +0000 (Fri, 28 Nov 2014) New Revision: 707 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/707 Log: revert test am?\195?\169lioration perfs fixes #6197 Les pi?\195?\168ces jointes avec des "/" dans le nom ne s'ouvrent pas Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-11-28 10:47:15 UTC (rev 706) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-11-28 13:37:30 UTC (rev 707) @@ -30,6 +30,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.URLEncoder; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -55,7 +56,7 @@ File tempFolder = new File(FileUtils.getTempDirectory(), "faxtomail"); tempFolder.mkdir(); - String fileName = getFilename(); + String fileName = URLEncoder.encode(getFilename(), "UTF-8"); tmpLocalFile = new File(tempFolder, fileName); // if the file already exists, then add a number to the name Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-28 10:47:15 UTC (rev 706) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-28 13:37:30 UTC (rev 707) @@ -386,7 +386,7 @@ } // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "FROM " + Email.class.getName() + " E " + String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString() + ") "; @@ -399,33 +399,33 @@ + query.toString() + ")"; } -// String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( -// Email.PROPERTY_PRIORITY, -// Email.PROPERTY_DEMAND_TYPE, -// Email.PROPERTY_CLIENT, -// //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, -// Email.PROPERTY_WAITING_STATE, -// Email.PROPERTY_TAKEN_BY -// //Email.PROPERTY_REPLIES, -// //Email.PROPERTY_ATTACHMENT, -// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, -// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, -// //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL -// ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; + String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( + Email.PROPERTY_PRIORITY, + Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_CLIENT, + //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, + Email.PROPERTY_WAITING_STATE, + Email.PROPERTY_TAKEN_BY + //Email.PROPERTY_REPLIES, + //Email.PROPERTY_ATTACHMENT, + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, + //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL + ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; // code copied from topia to perform search - PaginationResult<Email> pageResult = findPage(hqlForFetchStep1, args, pagination); - List<Email> step1ResultTopiaIds = pageResult.getElements(); + PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination); + List<String> step1ResultTopiaIds = pageResult.getElements(); List<Email> sortedEntities; if (CollectionUtils.isEmpty(step1ResultTopiaIds)) { sortedEntities = Lists.newArrayList(); } else { -// Map<String, Object> step2Args = Maps.newHashMap(); -// step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); -// List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); + Map<String, Object> step2Args = Maps.newHashMap(); + step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); + List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); - sortedEntities = step1ResultTopiaIds; + sortedEntities = sortAccordingToIds(entities, step1ResultTopiaIds); } PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); @@ -445,17 +445,17 @@ // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, // Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) for (Email email : result.getElements()) { - Hibernate.initialize(email.getPriority()); - Hibernate.initialize(email.getDemandType()); - Hibernate.initialize(email.getClient()); + //Hibernate.initialize(email.getPriority()); + //Hibernate.initialize(email.getDemandType()); + //Hibernate.initialize(email.getClient()); List<RangeRow> rangeRows = email.getRangeRow(); if (rangeRows != null) { for (RangeRow rangeRow : rangeRows) { Hibernate.initialize(rangeRow.getRange()); } } - Hibernate.initialize(email.getWaitingState()); - Hibernate.initialize(email.getTakenBy()); + //Hibernate.initialize(email.getWaitingState()); + //Hibernate.initialize(email.getTakenBy()); Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); Collection<History> histories = email.getHistory(); @@ -511,34 +511,34 @@ String query = filteredDemandsOfFolderCondition(folder, emailFilter, args); // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "FROM " + Email.class.getName() + " E " + query; -// String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( -// Email.PROPERTY_PRIORITY, -// Email.PROPERTY_DEMAND_TYPE, -// Email.PROPERTY_CLIENT, -// //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, -// Email.PROPERTY_WAITING_STATE, -// Email.PROPERTY_TAKEN_BY -// //Email.PROPERTY_REPLIES, -// //Email.PROPERTY_ATTACHMENT, -// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, -// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, -// //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL -// ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; + String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query; + String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( + Email.PROPERTY_PRIORITY, + Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_CLIENT, + //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, + Email.PROPERTY_WAITING_STATE, + Email.PROPERTY_TAKEN_BY + //Email.PROPERTY_REPLIES, + //Email.PROPERTY_ATTACHMENT, + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, + //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL + ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; // code copied from topia to perform search - PaginationResult<Email> pageResult = findPage(hqlForFetchStep1, args, pagination); - List<Email> step1ResultTopiaIds = pageResult.getElements(); + PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination); + List<String> step1ResultTopiaIds = pageResult.getElements(); List<Email> sortedEntities; if (CollectionUtils.isEmpty(step1ResultTopiaIds)) { sortedEntities = Lists.newArrayList(); } else { -// Map<String, Object> step2Args = Maps.newHashMap(); -// step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); -// List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); + Map<String, Object> step2Args = Maps.newHashMap(); + step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); + List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); - sortedEntities = step1ResultTopiaIds; + sortedEntities = sortAccordingToIds(entities, step1ResultTopiaIds); } PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); @@ -558,17 +558,17 @@ // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, // Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) for (Email email : result.getElements()) { - Hibernate.initialize(email.getPriority()); - Hibernate.initialize(email.getDemandType()); - Hibernate.initialize(email.getClient()); + //Hibernate.initialize(email.getPriority()); + //Hibernate.initialize(email.getDemandType()); + //Hibernate.initialize(email.getClient()); List<RangeRow> rangeRows = email.getRangeRow(); if (rangeRows != null) { for (RangeRow rangeRow : rangeRows) { Hibernate.initialize(rangeRow.getRange()); } } - Hibernate.initialize(email.getWaitingState()); - Hibernate.initialize(email.getTakenBy()); + //Hibernate.initialize(email.getWaitingState()); + //Hibernate.initialize(email.getTakenBy()); Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); Collection<History> histories = email.getHistory(); @@ -918,7 +918,6 @@ /* * @deprecated because this need to be supported by topia (see http://forge.nuiton.org/issues/3427) - * Do not use with mssql, it is REAAAAAAAAAALLY slow */ @Deprecated protected String addAllFecthes(String... fetchProperties) {

1 0

r706 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor
by kmorin＠users.forge.codelutin.com 28 Nov '14

28 Nov '14

Author: kmorin Date: 2014-11-28 10:47:15 +0000 (Fri, 28 Nov 2014) New Revision: 706 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/706 Log: test am?\195?\169lioration perfs Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-27 16:05:17 UTC (rev 705) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-28 10:47:15 UTC (rev 706) @@ -386,7 +386,7 @@ } // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + String hqlForFetchStep1 = "FROM " + Email.class.getName() + " E " + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString() + ") "; @@ -399,33 +399,33 @@ + query.toString() + ")"; } - String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( - Email.PROPERTY_PRIORITY, - Email.PROPERTY_DEMAND_TYPE, - Email.PROPERTY_CLIENT, - //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, - Email.PROPERTY_WAITING_STATE, - Email.PROPERTY_TAKEN_BY - //Email.PROPERTY_REPLIES, - //Email.PROPERTY_ATTACHMENT, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, - //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL - ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; +// String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( +// Email.PROPERTY_PRIORITY, +// Email.PROPERTY_DEMAND_TYPE, +// Email.PROPERTY_CLIENT, +// //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, +// Email.PROPERTY_WAITING_STATE, +// Email.PROPERTY_TAKEN_BY +// //Email.PROPERTY_REPLIES, +// //Email.PROPERTY_ATTACHMENT, +// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, +// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, +// //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL +// ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; // code copied from topia to perform search - PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination); - List<String> step1ResultTopiaIds = pageResult.getElements(); + PaginationResult<Email> pageResult = findPage(hqlForFetchStep1, args, pagination); + List<Email> step1ResultTopiaIds = pageResult.getElements(); List<Email> sortedEntities; if (CollectionUtils.isEmpty(step1ResultTopiaIds)) { sortedEntities = Lists.newArrayList(); } else { - Map<String, Object> step2Args = Maps.newHashMap(); - step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); - List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); +// Map<String, Object> step2Args = Maps.newHashMap(); +// step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); +// List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); - sortedEntities = sortAccordingToIds(entities, step1ResultTopiaIds); + sortedEntities = step1ResultTopiaIds; } PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); @@ -445,17 +445,17 @@ // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, // Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) for (Email email : result.getElements()) { - //Hibernate.initialize(email.getPriority()); - //Hibernate.initialize(email.getDemandType()); - //Hibernate.initialize(email.getClient()); + Hibernate.initialize(email.getPriority()); + Hibernate.initialize(email.getDemandType()); + Hibernate.initialize(email.getClient()); List<RangeRow> rangeRows = email.getRangeRow(); if (rangeRows != null) { for (RangeRow rangeRow : rangeRows) { Hibernate.initialize(rangeRow.getRange()); } } - //Hibernate.initialize(email.getWaitingState()); - //Hibernate.initialize(email.getTakenBy()); + Hibernate.initialize(email.getWaitingState()); + Hibernate.initialize(email.getTakenBy()); Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); Collection<History> histories = email.getHistory(); @@ -511,34 +511,34 @@ String query = filteredDemandsOfFolderCondition(folder, emailFilter, args); // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query; - String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( - Email.PROPERTY_PRIORITY, - Email.PROPERTY_DEMAND_TYPE, - Email.PROPERTY_CLIENT, - //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, - Email.PROPERTY_WAITING_STATE, - Email.PROPERTY_TAKEN_BY - //Email.PROPERTY_REPLIES, - //Email.PROPERTY_ATTACHMENT, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, - //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL - ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; + String hqlForFetchStep1 = "FROM " + Email.class.getName() + " E " + query; +// String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( +// Email.PROPERTY_PRIORITY, +// Email.PROPERTY_DEMAND_TYPE, +// Email.PROPERTY_CLIENT, +// //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, +// Email.PROPERTY_WAITING_STATE, +// Email.PROPERTY_TAKEN_BY +// //Email.PROPERTY_REPLIES, +// //Email.PROPERTY_ATTACHMENT, +// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, +// //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, +// //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL +// ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; // code copied from topia to perform search - PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination); - List<String> step1ResultTopiaIds = pageResult.getElements(); + PaginationResult<Email> pageResult = findPage(hqlForFetchStep1, args, pagination); + List<Email> step1ResultTopiaIds = pageResult.getElements(); List<Email> sortedEntities; if (CollectionUtils.isEmpty(step1ResultTopiaIds)) { sortedEntities = Lists.newArrayList(); } else { - Map<String, Object> step2Args = Maps.newHashMap(); - step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); - List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); +// Map<String, Object> step2Args = Maps.newHashMap(); +// step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); +// List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); - sortedEntities = sortAccordingToIds(entities, step1ResultTopiaIds); + sortedEntities = step1ResultTopiaIds; } PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); @@ -558,17 +558,17 @@ // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, // Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) for (Email email : result.getElements()) { - //Hibernate.initialize(email.getPriority()); - //Hibernate.initialize(email.getDemandType()); - //Hibernate.initialize(email.getClient()); + Hibernate.initialize(email.getPriority()); + Hibernate.initialize(email.getDemandType()); + Hibernate.initialize(email.getClient()); List<RangeRow> rangeRows = email.getRangeRow(); if (rangeRows != null) { for (RangeRow rangeRow : rangeRows) { Hibernate.initialize(rangeRow.getRange()); } } - //Hibernate.initialize(email.getWaitingState()); - //Hibernate.initialize(email.getTakenBy()); + Hibernate.initialize(email.getWaitingState()); + Hibernate.initialize(email.getTakenBy()); Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); Collection<History> histories = email.getHistory(); @@ -918,6 +918,7 @@ /* * @deprecated because this need to be supported by topia (see http://forge.nuiton.org/issues/3427) + * Do not use with mssql, it is REAAAAAAAAAALLY slow */ @Deprecated protected String addAllFecthes(String... fetchProperties) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-27 16:05:17 UTC (rev 705) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-28 10:47:15 UTC (rev 706) @@ -862,6 +862,11 @@ } @Override + public int hashCode() { + return editObject.hashCode(); + } + + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().isAssignableFrom(DemandeUIModel.class)) { return false; @@ -874,6 +879,8 @@ try { // ce code peut provoquer une NPE avec les données de test Message message = new MimeMessage(null, new ByteArrayInputStream(getOriginalEmail().getBytes(StandardCharsets.UTF_8))); + Charset charset = FaxToMailServiceUtils.getCharset(message); + subject = MimeUtility.decodeText(message.getSubject()); toRecipients = new ArrayList<String>(); @@ -895,7 +902,7 @@ decomposeMultipartEmail(message); } else { - String content = IOUtils.toString(message.getInputStream()); + String content = IOUtils.toString(message.getInputStream(), charset); plainContent = content; } @@ -930,6 +937,7 @@ if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { Charset charset = FaxToMailServiceUtils.getCharset(bp); String content = IOUtils.toString(bp.getInputStream(), charset); + if (bp.isMimeType("text/plain")) { plainContent = content; } else { 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-11-27 16:05:17 UTC (rev 705) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-28 10:47:15 UTC (rev 706) @@ -349,6 +349,9 @@ } protected void displayPage(int pageNb, float previousZoom, int previousRotation) { + if (pageNb < 0 || pageNb > pdfDecoder.getPageCount()) { + return; + } try { float zoom = getModel().getZoom();

1 0

r705 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by kmorin＠users.forge.codelutin.com 27 Nov '14

27 Nov '14

Author: kmorin Date: 2014-11-27 16:05:17 +0000 (Thu, 27 Nov 2014) New Revision: 705 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/705 Log: fixes #6192 Le tableau de gammes n'est pas charg?\195?\169 quand on ouvre un ?\195?\169l?\195?\169ment group?\195?\169 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-11-27 13:45:24 UTC (rev 704) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-11-27 16:05:17 UTC (rev 705) @@ -27,6 +27,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; @@ -34,6 +35,7 @@ import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUIHandler; import org.apache.commons.lang3.StringUtils; @@ -41,6 +43,9 @@ import javax.swing.*; +import java.util.ArrayList; +import java.util.Collection; + import static org.nuiton.i18n.I18n.t; /** @@ -152,6 +157,21 @@ takeEmail); demandToOpen.fromEntity(email); + ArrayList<RangeRowModel> validRangeRowModels = new ArrayList<RangeRowModel>(); + Collection<RangeRow> rangeRows = demandToOpen.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + validRangeRowModels.add(rangeRowModel); + } + } + } + } + demandToOpen.setValidRangeRowModels(validRangeRowModels); + MailFolder folder = demandToOpen.getMailFolder(); if (demandToOpen.getArchiveDate() != null || !folder.isFolderWritable()

1 0

r704 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by kmorin＠users.forge.codelutin.com 27 Nov '14

27 Nov '14

Author: kmorin Date: 2014-11-27 13:45:24 +0000 (Thu, 27 Nov 2014) New Revision: 704 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/704 Log: adresses par ordre alphab?\195?\169tique Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-27 05:18:52 UTC (rev 703) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-27 13:45:24 UTC (rev 704) @@ -39,13 +39,7 @@ import java.util.Collections; import java.util.List; -import javax.swing.ComboBoxEditor; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JEditorPane; -import javax.swing.JFileChooser; -import javax.swing.JPanel; -import javax.swing.JTextField; +import javax.swing.*; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; @@ -165,9 +159,10 @@ replyToAddresses.addAll(folderReplyAdresses); } Collections.sort(replyToAddresses); - replyToAddresses.add(0, null); - ui.getFromComboBox().setModel(SwingUtil.newComboModel(replyToAddresses.toArray())); + DefaultComboBoxModel comboBoxModel = SwingUtil.newComboModel(replyToAddresses.toArray()); + comboBoxModel.setSelectedItem(demand.getRecipient()); + ui.getFromComboBox().setModel(comboBoxModel); model.setSenderAllowedAddresses(replyToAddresses); } }

1 0

r703 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators faxtomail-service/src/main/resources 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/demande faxtomail-ui-swing/src/main/java/com/f
by kmorin＠users.forge.codelutin.com 27 Nov '14

27 Nov '14

Author: kmorin Date: 2014-11-27 05:18:52 +0000 (Thu, 27 Nov 2014) New Revision: 703 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/703 Log: refs #6162 fixes #6173 Permettre l'envoi de r?\195?\169ponse ?\195?\160 plusieurs "to", "cc" et "bcc" Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/main/resources/validators.xml 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/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 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-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-27 05:18:52 UTC (rev 703) @@ -1179,12 +1179,16 @@ message.setCharset(EmailConstants.UTF_8); message.setFrom(from); - message.addTo(to); + + String[] tos = to.split("\\s*;\\s*"); + message.addTo(tos); if (StringUtils.isNotBlank(cc)) { - message.addCc(cc); + String[] ccs = cc.split("\\s*;\\s*"); + message.addCc(ccs); } if (StringUtils.isNotBlank(bcc)) { - message.addBcc(bcc); + String[] bccs = bcc.split("\\s*;\\s*"); + message.addBcc(bccs); } message.setSubject(subject); message.setMsg(content); Copied: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java (from rev 694, trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java) =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java 2014-11-27 05:18:52 UTC (rev 703) @@ -0,0 +1,47 @@ +package com.franciaflex.faxtomail.services.validators; + +/* + * #%L + * FaxToMail :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.opensymphony.xwork2.validator.validators.EmailValidator; + +/** + * Surcharge du validateur d'email par default de struts pour autoriser en plus le domaine ".fax". + * Possibilité d'avoir plusieurs emails séparés par des points-virgule + */ +public class FaxToMailEmailsValidator extends EmailValidator { + + // see XW-371 + public static final String EMAIL_ADDRESSES_PATTERN = + "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*" + + "@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|fax)" + + "(\\s*;\\s*['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*" + + "@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|fax))*" + + "$\\b"; + + public FaxToMailEmailsValidator() { + setRegex(EMAIL_ADDRESSES_PATTERN); + } + +} Modified: trunk/faxtomail-service/src/main/resources/validators.xml =================================================================== --- trunk/faxtomail-service/src/main/resources/validators.xml 2014-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-service/src/main/resources/validators.xml 2014-11-27 05:18:52 UTC (rev 703) @@ -48,4 +48,5 @@  <validator name="email" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailValidator"/> + <validator name="emails" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailsValidator"/> </validators> 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-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-11-27 05:18:52 UTC (rev 703) @@ -49,11 +49,8 @@ protected PDFEditorUI dialogContent; protected JFrame frame; - public EditAttachmentAction(AttachmentEditorUIHandler handler) { + public EditAttachmentAction(AttachmentEditorUIHandler handler, Attachment attachment) { super(handler, false); - } - - public void setAttachment(Attachment attachment) { this.attachment = attachment; String attachmentName = attachment.getEditedFileName() != null ? attachment.getEditedFileName() : attachment.getOriginalFileName(); setActionDescription(t("faxtomail.action.attachment.edit.tip", attachmentName)); @@ -77,8 +74,6 @@ MainUI mainUI = getContext().getMainUI(); frame = getHandler().openFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); - final Attachment attachment = this.attachment; - final PDFEditorUI dialogContent = this.dialogContent; frame.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { 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-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-11-27 05:18:52 UTC (rev 703) @@ -68,7 +68,6 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<AttachmentEditorUIModel, AttachmentEditorUI> { protected OpenAttachmentAction openAttachmentAction = new OpenAttachmentAction(this); - protected EditAttachmentAction editAttachmentAction = new EditAttachmentAction(this); @Override public void afterInit(AttachmentEditorUI ui) { @@ -157,7 +156,7 @@ getContext().closeSecondaryFrame(); - editAttachmentAction.setAttachment(attachment); + EditAttachmentAction editAttachmentAction = new EditAttachmentAction(this, attachment); // run Internal to prevent multiple successive execution (#5668) getContext().getActionEngine().runAction(editAttachmentAction); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-11-27 05:18:52 UTC (rev 703) @@ -34,10 +34,6 @@ editable: { model.isEditable() }; } -BeanFilterableComboBox { - enabled: { model.isEditable() }; -} - .rightLabel { horizontalAlignment: { SwingConstants.RIGHT }; font-style: "italic"; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-11-27 05:18:52 UTC (rev 703) @@ -64,6 +64,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -204,13 +205,13 @@ replyModel.setOriginalDemand(ui.getModel()); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(message.getSubject()); - replyModel.setTo(message.getRecipients(RecipientType.TO)[0].toString()); + replyModel.setTo(StringUtils.join(message.getRecipients(RecipientType.TO), " ; ")); replyModel.setFrom(message.getFrom()[0].toString()); if (ArrayUtils.isNotEmpty(message.getRecipients(RecipientType.CC))) { - replyModel.setCc(message.getRecipients(RecipientType.CC)[0].toString()); + replyModel.setCc(StringUtils.join(message.getRecipients(RecipientType.CC), " ; ")); } if (ArrayUtils.isNotEmpty(message.getRecipients(RecipientType.BCC))) { - replyModel.setCci(message.getRecipients(RecipientType.BCC)[0].toString()); + replyModel.setCci(StringUtils.join(message.getRecipients(RecipientType.BCC), " ; ")); } if (message.isMimeType("multipart/*")) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-27 05:18:52 UTC (rev 703) @@ -165,6 +165,7 @@ replyToAddresses.addAll(folderReplyAdresses); } Collections.sort(replyToAddresses); + replyToAddresses.add(0, null); ui.getFromComboBox().setModel(SwingUtil.newComboModel(replyToAddresses.toArray())); model.setSenderAllowedAddresses(replyToAddresses); Modified: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 2014-11-26 21:07:33 UTC (rev 702) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 2014-11-27 05:18:52 UTC (rev 703) @@ -33,19 +33,19 @@ <field-validator type="requiredstring" short-circuit="true"> <message>faxtomail.validator.error.reply.to.required</message> </field-validator> - <field-validator type="email" short-circuit="true"> + <field-validator type="emails" short-circuit="true"> <message>faxtomail.validator.error.reply.to.email</message> </field-validator> </field> <field name="cc"> - <field-validator type="email" short-circuit="true"> + <field-validator type="emails" short-circuit="true"> <message>faxtomail.validator.error.reply.cc.email</message> </field-validator> </field> <field name="cci"> - <field-validator type="email" short-circuit="true"> + <field-validator type="emails" short-circuit="true"> <message>faxtomail.validator.error.reply.cci.email</message> </field-validator> </field>

1 0

r702 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by kmorin＠users.forge.codelutin.com 26 Nov '14

26 Nov '14

Author: kmorin Date: 2014-11-26 21:07:33 +0000 (Wed, 26 Nov 2014) New Revision: 702 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/702 Log: adresses par ordre alphab?\195?\169tique Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-26 19:03:23 UTC (rev 701) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-26 21:07:33 UTC (rev 702) @@ -36,6 +36,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.swing.ComboBoxEditor; @@ -156,11 +157,15 @@ } model.setSenderAllowedDomains(folderReplyDomains); - List<String> replyToAddresses = Lists.newArrayList(demand.getRecipient()); + List<String> replyToAddresses = Lists.newArrayList(); + if (demand.getRecipient() != null) { + replyToAddresses.add(demand.getRecipient()); + } if (folderReplyAdresses != null) { replyToAddresses.addAll(folderReplyAdresses); } - + Collections.sort(replyToAddresses); + ui.getFromComboBox().setModel(SwingUtil.newComboModel(replyToAddresses.toArray())); model.setSenderAllowedAddresses(replyToAddresses); }

1 0