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

r701 - in trunk: . faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content 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/demande/replies faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 26 Nov '14

26 Nov '14

Author: kmorin Date: 2014-11-26 19:03:23 +0000 (Wed, 26 Nov 2014) New Revision: 701 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/701 Log: fixes #6172 Mauvais envoyeur dans la citation d'un forward sur une r?\195?\169ponse fixes #6171 Le filtre sur les colonnes des tables d'?\195?\169l?\195?\169ments ne fonctionnent pas avec les majuscules Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 19:03:23 UTC (rev 701) @@ -554,7 +554,9 @@ // email.addHistory(transmissionToEdi); // passage en status - email.setDemandStatus(DemandStatus.IN_PROGRESS); + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } } @@ -568,7 +570,10 @@ // email.addHistory(transmissionToEdi); // passage en status - email.setDemandStatus(DemandStatus.IN_PROGRESS); + + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-11-26 19:03:23 UTC (rev 701) @@ -82,5 +82,5 @@ #status { showClock: false; - showMemoryStatus: false; + showMemoryStatus: true; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-26 19:03:23 UTC (rev 701) @@ -299,6 +299,8 @@ ApplicationUIAction<LoadFolderEmailsAction> refreshAction = getContext().getActionFactory().createUIAction(this, LoadFolderEmailsAction.class); rootPane.getActionMap().put(REFRESH_FOLDER_ACTION, refreshAction); + MailFolder folder = getContext().getCurrentMailFolder(); + loadFolderDemands(folder, nodesByFolder); } public void initTableFilter() { 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 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-11-26 19:03:23 UTC (rev 701) @@ -258,7 +258,7 @@ // XXX: à verifier pour le format, et si on quote ou pas encore le forward String quotedReply = t("faxtomail.reply.message", decorate(reply.getSentDate()), - message.getRecipients(RecipientType.TO)[0].toString(), + message.getFrom()[0].toString(), replyModel.getMessage().replaceAll("\n", "\n> ")); replyModel.setMessage(quotedReply); 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-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-26 19:03:23 UTC (rev 701) @@ -296,7 +296,7 @@ if (CollectionUtils.isNotEmpty(filters)) { MailFilter mailFilter = filters.get(0); - // TODO create issue + // see #6161 if (filter == null || mailFilter.getPosition() < filter.getPosition()) { filter = mailFilter; email.setRecipient(recipient); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/pom.xml 2014-11-26 19:03:23 UTC (rev 701) @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.17</jaxxVersion> + <jaxxVersion>2.18-SNAPSHOT</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r700 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 26 Nov '14

26 Nov '14

Author: kmorin Date: 2014-11-26 15:21:23 +0000 (Wed, 26 Nov 2014) New Revision: 700 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/700 Log: fixes #6168 Les ?\195?\169l?\195?\169ments ne sont pas transmis ?\195?\160 l'EDI quand ils sont d?\195?\169plac?\195?\169s directement 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-11-26 13:30:10 UTC (rev 699) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 15:21:23 UTC (rev 700) @@ -1242,7 +1242,9 @@ List<Email> emails = dao.forTopiaIdIn(emailIds).findAll(); for (Email email : emails) { - email.setDemandStatus(DemandStatus.QUALIFIED); + if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI) { + email.setDemandStatus(DemandStatus.QUALIFIED); + } email.setMailFolder(newFolder); email.setTakenBy(null); @@ -1411,7 +1413,20 @@ rangeRowTopiaDao.update(rangeRow); } - email.setDemandStatus(DemandStatus.IN_PROGRESS); + History transmission = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + @Override + public boolean evaluate(History object) { + return object.getType() == HistoryType.TRANSMISSION; + } + }); + + if (transmission != null) { + email.setDemandStatus(DemandStatus.QUALIFIED); + + } else { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } + emailsToUpdate.add(email); importedCount++;

1 0

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

26 Nov '14

Author: kmorin Date: 2014-11-26 13:30:10 +0000 (Wed, 26 Nov 2014) New Revision: 699 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/699 Log: remet en premier plan les frame apr?\195?\168s la fermeture de la popup de loading 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/OpenMailFolderChooserFromListAction.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/actions/SearchToGroupAction.java 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 10:17:01 UTC (rev 698) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-11-26 13:30:10 UTC (rev 699) @@ -90,9 +90,14 @@ @Override protected void releaseAction() { super.releaseAction(); - if (frame != null) { - frame.toFront(); - frame = null; - } + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + frame = null; + } + } + }); } } 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-11-26 10:17:01 UTC (rev 698) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-11-26 13:30:10 UTC (rev 699) @@ -101,9 +101,14 @@ @Override protected void releaseAction() { super.releaseAction(); - if (frame != null) { - frame.toFront(); - frame = null; - } + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + frame = null; + } + } + }); } } 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-11-26 10:17:01 UTC (rev 698) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-11-26 13:30:10 UTC (rev 699) @@ -58,9 +58,14 @@ @Override protected void releaseAction() { super.releaseAction(); - if (frame != null) { - frame.toFront(); - frame = null; - } + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + frame = null; + } + } + }); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-11-26 10:17:01 UTC (rev 698) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-11-26 13:30:10 UTC (rev 699) @@ -112,9 +112,14 @@ @Override protected void releaseAction() { super.releaseAction(); - JFrame frame = getUI().getParentContainer(JFrame.class); - if (frame != null) { - frame.toFront(); - } + final JFrame frame = getUI().getParentContainer(JFrame.class); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + } + } + }); } }

1 0

r698 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 26 Nov '14

26 Nov '14

Author: kmorin Date: 2014-11-26 10:17:01 +0000 (Wed, 26 Nov 2014) New Revision: 698 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/698 Log: fixes #6160 Les gammes ne sont pas affich?\195?\169es dans l'ordre fixes #6161 Appliquer le filtre de mail de position la moins grande sur l'ensemble des destinataires fixes #6162 Erreur lors de l'enregistrement apr?\195?\168s modification de pi?\195?\168ce jointe fixes #6163 Erreur lors de l'enregistrement Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.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/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.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/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-11-26 10:17:01 UTC (rev 698) @@ -41,7 +41,7 @@ public interface MailFolderService extends FaxToMailService { MailFolder getFolderForRecipient(String recipient); - Collection<MailFilter> getFiltersForRecipient(String recipient); + List<MailFilter> getFiltersForRecipient(String recipient); List<MailFolder> getAllMailFolders(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-11-26 10:17:01 UTC (rev 698) @@ -71,7 +71,7 @@ } @Override - public Collection<MailFilter> getFiltersForRecipient(String recipient) { + public List<MailFilter> getFiltersForRecipient(String recipient) { MailFilterTopiaDao filterTopiaDao = getPersistenceContext().getMailFilterDao(); PaginationParameter tpb = PaginationParameter.of(0, -1, MailFilter.PROPERTY_POSITION, false); @@ -80,7 +80,7 @@ Map<String, Object> params = new HashMap<>(); params.put("recipient", recipient); - Collection<MailFilter> filters = filterTopiaDao.find(query, params, tpb); + List<MailFilter> filters = filterTopiaDao.find(query, params, tpb); return filters; } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-11-26 10:17:01 UTC (rev 698) @@ -75,25 +75,25 @@ @Override public List<DemandType> getAllDemandType() { DemandTypeTopiaDao dao = getPersistenceContext().getDemandTypeDao(); - return dao.findAll(); + return dao.forAll().setOrderByArguments(DemandType.PROPERTY_LABEL).findAll(); } @Override public List<Priority> getAllPriority() { PriorityTopiaDao dao = getPersistenceContext().getPriorityDao(); - return dao.findAll(); + return dao.forAll().setOrderByArguments(Priority.PROPERTY_LABEL).findAll(); } @Override public List<Range> getAllRange() { RangeTopiaDao dao = getPersistenceContext().getRangeDao(); - return dao.findAll(); + return dao.forAll().setOrderByArguments(Range.PROPERTY_LABEL).findAll(); } @Override public List<WaitingState> getAllWaitingState() { WaitingStateTopiaDao dao = getPersistenceContext().getWaitingStateDao(); - return dao.findAll(); + return dao.forAll().setOrderByArguments(WaitingState.PROPERTY_LABEL).findAll(); } @Override 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-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-11-26 10:17:01 UTC (rev 698) @@ -76,7 +76,9 @@ super.postSuccessAction(); 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/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-11-26 10:17:01 UTC (rev 698) @@ -248,11 +248,6 @@ String fileName = model.getOriginalFile().getFilename(); attachmentFileNew.setFilename(FaxToMailUIUtil.getEditedFileName(fileName)); model.setEditedFile(attachmentFileNew); - - AttachmentEditorUI parentUI = (AttachmentEditorUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); - parentUI.getModel().fireAttachmentEdited(model.toEntity()); - - model.setModify(false); } protected int[] computeCoordinates(Component panel, int rotation, float zoom) { @@ -327,6 +322,14 @@ @Override public void postSuccessAction() { super.postSuccessAction(); + + PDFEditorUIModel model = getModel(); + + AttachmentEditorUI parentUI = (AttachmentEditorUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); + parentUI.getModel().fireAttachmentEdited(model.toEntity()); + + model.setModify(false); + getHandler().closeFrame(); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-11-26 10:17:01 UTC (rev 698) @@ -85,6 +85,7 @@ } else { persistedEmail = new EmailImpl(); } + model.setRangeRow(persistedEmail.getRangeRow()); Collection<RangeRowModel> rows = model.getValidRangeRowModels(); @@ -143,9 +144,9 @@ model.setClientCode(null); // reset the range rows of the model - BeanMonitor monitor = getHandler().getMonitor(); - List<RangeRow> rangeRows = (List<RangeRow>) monitor.getOriginalValues().get(Email.PROPERTY_RANGE_ROW); - model.setRangeRow(rangeRows); +// BeanMonitor monitor = getHandler().getMonitor(); +// List<RangeRow> rangeRows = (List<RangeRow>) monitor.getOriginalValues().get(Email.PROPERTY_RANGE_ROW); +// model.setRangeRow(rangeRows); } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-11-26 10:17:01 UTC (rev 698) @@ -33,6 +33,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Map; @@ -53,6 +55,7 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -176,6 +179,13 @@ } else { ranges.addAll(folderRanges); } + Collections.sort(ranges, new Comparator<Range>() { + @Override + public int compare(Range o1, Range o2) { + return ObjectUtils.compare(o1.getLabel(), o2.getLabel()); + } + }); + TableColumnModelExt columnModel = new DefaultTableColumnModelExt(); addComboDataColumnToModel(columnModel, RangeTableModel.RANGE_COLUMN, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-11-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-11-26 10:17:01 UTC (rev 698) @@ -361,7 +361,6 @@ String text = null; - List<String> ranges = new ArrayList<String>(); List<RangeRow> rangeRows = demande.getRangeRow(); if (CollectionUtils.isNotEmpty(rangeRows)) { text = decorate(rangeRows.get(0).getRange()); 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-25 16:26:20 UTC (rev 697) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-26 10:17:01 UTC (rev 698) @@ -39,8 +39,12 @@ import java.util.Collection; import java.util.Date; import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.regex.Pattern; import javax.activation.DataHandler; @@ -262,7 +266,7 @@ Charset charset = FaxToMailServiceUtils.getCharset(message); - List<String> modifiedProperties = new ArrayList<>(); + Set<String> modifiedProperties = new HashSet<>(); if (log.isDebugEnabled()) { log.debug(String.format("Message %d/%d : %s", i, count, message.getSubject())); @@ -288,16 +292,19 @@ recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); recipient = recipient.toLowerCase(); - Collection<MailFilter> filters = mailFolderService.getFiltersForRecipient(recipient); + List<MailFilter> filters = mailFolderService.getFiltersForRecipient(recipient); if (CollectionUtils.isNotEmpty(filters)) { - filter = filters.iterator().next(); - email.setRecipient(recipient); - modifiedProperties.add(Email.PROPERTY_RECIPIENT); - break; + MailFilter mailFilter = filters.get(0); + // TODO create issue + if (filter == null || mailFilter.getPosition() < filter.getPosition()) { + filter = mailFilter; + email.setRecipient(recipient); + modifiedProperties.add(Email.PROPERTY_RECIPIENT); + } } + } - } if (filter == null) { if (log.isDebugEnabled()) { log.debug(" ==> No filter found for this message"); @@ -307,7 +314,7 @@ } } } - + // on garde le mail sur le serveur pour le traiter suite à l'ajout d'un futur filtre continue; } @@ -415,7 +422,7 @@ } if (Boolean.TRUE.equals(reject)) { - + if (StringUtils.isAnyBlank(senderEmail, rejectMessage)) { if (log.isWarnEnabled()) { log.warn("Can't send reject message due to invalid configuration"); @@ -427,7 +434,7 @@ recipient = FaxToMailServiceUtils.addFaxDomainToFaxNumber(recipient, mailFolder); } emailService.rejectEmail(senderEmail, recipient, t("faxtomail.email.subject.re", message.getSubject()), rejectMessage); - + // important, delete mail deleteMail(message); }

1 0

r697 - 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/util faxtomail-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 25 Nov '14

25 Nov '14

Author: kmorin Date: 2014-11-25 16:26:20 +0000 (Tue, 25 Nov 2014) New Revision: 697 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/697 Log: fixes #6158 Ajouter la colonne Gamme ?\195?\160 la liste des ?\195?\169l?\195?\169ments Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-11-25 16:26:20 UTC (rev 697) @@ -48,6 +48,7 @@ public static final String PROPERTY_RECEPTION_DATES = "receptionDates"; public static final String PROPERTY_RECIPIENTS = "recipients"; public static final String PROPERTY_DEMAND_STATUS = "demandStatus"; + public static final String PROPERTY_RANGES = "ranges"; public static final String PROPERTY_PRODUCT_QUANTITIES = "productsQuantities"; public static final String PROPERTY_SAV_QUANTITIES = "savQuantities"; public static final String PROPERTY_QUOTATION_QUANTITIES = "quotationQuantities"; @@ -82,6 +83,8 @@ protected Set<DemandStatus> demandStatus; + protected Set<Range> ranges; + protected Set<Long> productsQuantities; protected Set<Long> savQuantities; @@ -206,6 +209,15 @@ firePropertyChange(PROPERTY_DEMAND_STATUS, null, demandStatus); } + public Set<Range> getRanges() { + return ranges; + } + + public void setRanges(Set<Range> ranges) { + this.ranges = ranges; + firePropertyChange(PROPERTY_RANGES, null, ranges); + } + public Set<Long> getProductsQuantities() { return productsQuantities; } @@ -294,6 +306,7 @@ setLocalReferences(null); setReferences(null); setProjectReferences(null); + setRanges(null); setProductsQuantities(null); setReceptionDates(null); setRecipients(null); 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-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-11-25 16:26:20 UTC (rev 697) @@ -749,6 +749,37 @@ query.append(")"); } + Set<Range> ranges = emailFilter.getRanges(); + if (CollectionUtils.isNotEmpty(ranges)) { + query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))" + + " AND (select count(*) FROM " + RangeRow.class.getName() + " RR" + + " WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ") AND RR." + RangeRow.PROPERTY_RANGE + + " IN (:" + EmailFilter.PROPERTY_RANGES + ")"); + query.append(") > 0"); + + if (ranges.contains(null)) { + query.append(" OR NOT EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))"); + } + query.append("))"); + + args.put(EmailFilter.PROPERTY_RANGES, ranges); + } + + Set<Long> productQuantities = emailFilter.getProductsQuantities(); + if (CollectionUtils.isNotEmpty(productQuantities)) { + query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))" + + " AND (select sum(RR." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") " + + "FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); + query.append(") IN (:" + EmailFilter.PROPERTY_PRODUCT_QUANTITIES + ")"); + + if (productQuantities.contains(null) || productQuantities.contains(0L)) { + query.append(" OR NOT EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))"); + } + query.append("))"); + + args.put(EmailFilter.PROPERTY_PRODUCT_QUANTITIES, productQuantities); + } + Set<Long> savQuantities = emailFilter.getSavQuantities(); if (CollectionUtils.isNotEmpty(savQuantities)) { query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))" Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-11-25 16:26:20 UTC (rev 697) @@ -85,6 +85,7 @@ RECIPIENT, DEMAND_STATUS, WAITING_STATE, + RANGE_ROW, PF_NB, SAV_NB, QUOTATION_NB, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-11-25 16:26:20 UTC (rev 697) @@ -143,6 +143,10 @@ emailFilter.setReferences(!filtered ? null : new HashSet<String>((Collection) items)); break; + case Email.PROPERTY_RANGE_ROW: + emailFilter.setRanges(!filtered ? null : new HashSet<Range>((Collection) items)); + break; + case DemandeUIModel.PROPERTY_PF_NB: emailFilter.setProductsQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); break; @@ -202,6 +206,10 @@ "rangeRow." + RangeRow.PROPERTY_COMMAND_NUMBER }; break; + case Email.PROPERTY_RANGE_ROW: + properties = new String[] { "rangeRow." + RangeRow.PROPERTY_RANGE }; + break; + case DemandeUIModel.PROPERTY_PF_NB: properties = new String[] { "rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY }; sum = true; @@ -220,6 +228,7 @@ case Email.PROPERTY_ATTACHMENT: case Email.PROPERTY_REPLIES: case Email.PROPERTY_EMAIL_GROUP: + case DemandeUIModel.PROPERTY_GROUPED_DEMANDES: return null; default: Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-11-25 16:26:20 UTC (rev 697) @@ -191,6 +191,10 @@ tableCellRenderer = newTableCellRender(Date.class); break; + case RANGE_ROW: + tableCellRenderer = new RangeTableCellRenderer(); + break; + case PF_NB: tableCellRenderer = new QuantityTableCellRenderer(new Function<RangeRow, Integer>() { @Override @@ -344,4 +348,28 @@ return this; } } + + public class RangeTableCellRenderer extends DefaultTableCellRenderer { + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasfocus, int row, int column) { + super.getTableCellRendererComponent(table, value, isSelected, hasfocus, row, column); + + DemandeTableModel tableModel = (DemandeTableModel) table.getModel(); + int rowInModel = table.convertRowIndexToModel(row); + DemandeUIModel demande = tableModel.getEntry(rowInModel); + + String text = null; + + List<String> ranges = new ArrayList<String>(); + List<RangeRow> rangeRows = demande.getRangeRow(); + if (CollectionUtils.isNotEmpty(rangeRows)) { + text = decorate(rangeRows.get(0).getRange()); + } + setText(text); + setToolTipText(text); + + return this; + } + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-11-25 16:26:20 UTC (rev 697) @@ -150,6 +150,12 @@ n("faxtomail.demandeList.table.header.reference"), n("faxtomail.demandeList.table.header.reference.tip"))); + put(MailField.RANGE_ROW, + ColumnIdentifier.<Email>newReadOnlyId( + Email.PROPERTY_RANGE_ROW, + n("faxtomail.demandeList.table.header.range"), + n("faxtomail.demandeList.table.header.range.tip"))); + put(MailField.PF_NB, ColumnIdentifier.<Email>newReadOnlyId( DemandeUIModel.PROPERTY_PF_NB, 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-11-20 06:37:20 UTC (rev 696) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-11-25 16:26:20 UTC (rev 697) @@ -195,6 +195,8 @@ faxtomail.demandeList.table.header.projectReference.tip=Référence chantier faxtomail.demandeList.table.header.quotationNb=Qté devis faxtomail.demandeList.table.header.quotationNb.tip=Quantité de devis +faxtomail.demandeList.table.header.range=Gamme +faxtomail.demandeList.table.header.range.tip=Première gamme de l'élément faxtomail.demandeList.table.header.receptionDate=Date de réception faxtomail.demandeList.table.header.receptionDate.tip=Date de réception faxtomail.demandeList.table.header.recipient=Destinataire Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-20 06:37:20 UTC (rev 696) +++ trunk/pom.xml 2014-11-25 16:26:20 UTC (rev 697) @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.16</jaxxVersion> + <jaxxVersion>2.17</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

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

20 Nov '14

Author: kmorin Date: 2014-11-20 06:37:20 +0000 (Thu, 20 Nov 2014) New Revision: 696 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/696 Log: fixes #6137 L'application se bloque quand on veut ajouter une PJ qui n'existe pas Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-11-20 06:31:05 UTC (rev 695) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-11-20 06:37:20 UTC (rev 696) @@ -51,12 +51,15 @@ public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); - File file = getUI().getFile().getSelectedFile(); - if (file != null && !file.exists()) { - getContext().getErrorHelper().showErrorDialog(t("faxtomail.action.attachment.add.fileDoesNotExist", - file.getPath())); + if (result) { + File file = getUI().getFile().getSelectedFile(); + if (file != null && !file.exists()) { + getContext().getErrorHelper().showErrorDialog(t("faxtomail.action.attachment.add.fileDoesNotExist", + file.getPath())); + } + result = file != null && file.exists(); } - result = file != null && file.exists(); + return result; }

1 0

r695 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service 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/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply fax
by kmorin＠users.forge.codelutin.com 20 Nov '14

20 Nov '14

Author: kmorin Date: 2014-11-20 06:31:05 +0000 (Thu, 20 Nov 2014) New Revision: 695 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/695 Log: fixes #6137 L'application se bloque quand on veut ajouter une PJ qui n'existe pas fixes #6138 Permettre l'?\195?\169dition du formulaire en m?\195?\170me temps que l'?\195?\169dition du pdf Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 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/AddAttachmentAction.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/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 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/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-20 06:31:05 UTC (rev 695) @@ -548,10 +548,10 @@ } else { // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira - transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, - History.PROPERTY_MODIFICATION_DATE, new Date(), - History.PROPERTY_EMAIL, email); - email.addHistory(transmissionToEdi); +// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +// History.PROPERTY_MODIFICATION_DATE, new Date(), +// History.PROPERTY_EMAIL, email); +// email.addHistory(transmissionToEdi); // passage en status email.setDemandStatus(DemandStatus.IN_PROGRESS); @@ -562,10 +562,10 @@ } else { // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira - transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, - History.PROPERTY_MODIFICATION_DATE, new Date(), - History.PROPERTY_EMAIL, email); - email.addHistory(transmissionToEdi); +// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +// History.PROPERTY_MODIFICATION_DATE, new Date(), +// History.PROPERTY_EMAIL, email); +// email.addHistory(transmissionToEdi); // passage en status email.setDemandStatus(DemandStatus.IN_PROGRESS); 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-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-11-20 06:31:05 UTC (rev 695) @@ -24,8 +24,7 @@ import static org.nuiton.i18n.I18n.t; -import java.awt.Color; -import java.awt.Component; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Closeable; @@ -60,12 +59,15 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.ApplicationUI; import org.nuiton.jaxx.application.swing.ApplicationUIContext; 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.jaxx.application.swing.util.Cancelable; import org.nuiton.util.converter.ConverterUtil; import com.franciaflex.faxtomail.FaxToMailConfiguration; @@ -559,6 +561,20 @@ this.secondaryFrame = secondaryFrame; } + public void closeSecondaryFrame() { + JFrame secondaryFrame = getSecondaryFrame(); + if (secondaryFrame != null) { + Container contentPane = secondaryFrame.getContentPane(); + if (contentPane instanceof ApplicationUI) { + ApplicationUI dialogContent = (ApplicationUI) contentPane; + AbstractApplicationUIHandler handler = dialogContent.getHandler(); + if (handler instanceof Cancelable) { + ((Cancelable) handler).cancel(); + } + } + } + } + @Override public ApplicationActionUI getActionUI() { return actionUI; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-11-20 06:31:05 UTC (rev 695) @@ -48,25 +48,42 @@ } @Override + public boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + File file = getUI().getFile().getSelectedFile(); + if (file != null && !file.exists()) { + getContext().getErrorHelper().showErrorDialog(t("faxtomail.action.attachment.add.fileDoesNotExist", + file.getPath())); + } + result = file != null && file.exists(); + return result; + } + + @Override public void doAction() throws Exception { Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(true); + File file = getUI().getFile().getSelectedFile(); - if (file != null) { - try { - // warning, this not NOT be closed (will be by blob on commit) - InputStream is = new FileInputStream(file); - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); - AttachmentFile attachmentFile = serviceContext.getEmailService().getAttachmentFileFromStream(is); - attachmentFile.setFilename(file.getName()); - attachment.setOriginalFile(attachmentFile); + // warning, this not NOT be closed (will be by blob on commit) + InputStream is = new FileInputStream(file); + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + AttachmentFile attachmentFile = serviceContext.getEmailService().getAttachmentFileFromStream(is); + attachmentFile.setFilename(file.getName()); + attachment.setOriginalFile(attachmentFile); + getModel().addAttachment(attachment); + } - } catch (Exception e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.copy.file"), e); - } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + getUI().getFile().setSelectedFilePath(null); + } - getModel().addAttachment(attachment); - getUI().getFile().setSelectedFilePath(null); - } + @Override + public void postFailedAction(Throwable error) { + super.postFailedAction(error); + getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.copy.file")); } } 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-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-11-20 06:31:05 UTC (rev 695) @@ -75,13 +75,10 @@ public void postSuccessAction() { super.postSuccessAction(); MainUI mainUI = getContext().getMainUI(); - frame = getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); + frame = getHandler().openFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); + final Attachment attachment = this.attachment; frame.addWindowListener(new WindowAdapter() { @Override - public void windowClosing(WindowEvent e) { - } - - @Override public void windowClosed(WindowEvent e) { dialogContent.getModel().toEntity(attachment); } 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-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-11-20 06:31:05 UTC (rev 695) @@ -154,6 +154,9 @@ AttachmentEditorUIModel model = getModel(); if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) { + + getContext().closeSecondaryFrame(); + editAttachmentAction.setAttachment(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/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-20 06:31:05 UTC (rev 695) @@ -613,7 +613,7 @@ } model.setTo(sender); - openFrame(dialogContent, t("faxtomail.reply.title", demand.getTitle()), new Dimension(800, 600)); + openModalFrame(dialogContent, t("faxtomail.reply.title", demand.getTitle()), new Dimension(800, 600)); } public void archive() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-11-20 06:31:05 UTC (rev 695) @@ -24,13 +24,11 @@ * #L% */ -import java.awt.Component; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import javax.swing.DefaultSingleSelectionModel; -import javax.swing.JComponent; -import javax.swing.JTabbedPane; +import javax.swing.*; import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenChooseAttachmentToPrintAction; @@ -38,6 +36,7 @@ import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenReplyFormAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenSearchToGroupAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAction; +import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import jaxx.runtime.validator.swing.SwingValidator; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; @@ -48,6 +47,7 @@ import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.jaxx.application.swing.tab.TabHandler; +import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.jaxx.application.swing.util.CloseableUI; import com.franciaflex.faxtomail.persistence.entities.Configuration; @@ -165,6 +165,9 @@ @Override public boolean quitUI() { closeButtonPopups(); + + getContext().closeSecondaryFrame(); + JTabbedPane tabPanel = getTabPanel(); int tabCount = tabPanel.getTabCount(); boolean quit = true; @@ -301,6 +304,7 @@ public void save() { closeButtonPopups(); + getContext().closeSecondaryFrame(); DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); SaveDemandeAndExitAction action = new SaveDemandeAndExitAction(demandeUI.getHandler()); action.setTakeIfNotTaken(true); 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-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-20 06:31:05 UTC (rev 695) @@ -427,7 +427,7 @@ replyModel.setCc(null); replyModel.setCci(null); - openFrame(dialogContent, t("faxtomail.reply.forward", getModel().getSubject()), new Dimension(800, 600)); + openModalFrame(dialogContent, t("faxtomail.reply.forward", getModel().getSubject()), new Dimension(800, 600)); } catch (Exception ex) { if (log.isErrorEnabled()) { 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-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-11-20 06:31:05 UTC (rev 695) @@ -230,7 +230,7 @@ AbstractFaxToMailBeanUIModel.PROPERTY_VALID); } - public void openFrame(ApplicationUI dialogContent, + public JFrame openFrame(ApplicationUI dialogContent, String title, Dimension dim) { JFrame result = new JFrame(); @@ -263,7 +263,27 @@ }); } SwingUtil.center(getContext().getMainUI(), result); + + result.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + result.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + closeFrame(getContext().getSecondaryFrame(), handler); + } + + @Override + public void windowClosed(WindowEvent e) { + Component ui = (Component) e.getSource(); + if (log.isDebugEnabled()) { + log.debug("Destroy ui " + ui); + } + JAXXUtil.destroy(ui); + } + }); + result.setVisible(true); + + return result; } /** 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-11-19 12:45:09 UTC (rev 694) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-11-20 06:31:05 UTC (rev 695) @@ -8,6 +8,7 @@ faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société Code Lutin.</p> faxtomail.about.title=À propos de FaxToMail faxtomail.action.archive.tip=Archiver l'élément +faxtomail.action.attachment.add.fileDoesNotExist=Le fichier %s n'existe pas. Merci de choisir un autre fichier. faxtomail.action.attachment.edit.tip=Edition du fichier %s faxtomail.action.attachment.open.tip=Ouverture du fichier %s faxtomail.action.computeQuantitiesByRange.tip=Calculer les quantités par gamme @@ -233,7 +234,7 @@ faxtomail.pdfEditor.action.cancel.tip=Ne pas enregistrer les changements et fermer faxtomail.pdfEditor.action.validate=Enregistrer faxtomail.pdfEditor.action.validate.tip=Enregistrer les changements et fermer -faxtomail.pdfEditor.askSaveBeforeLeaving.save=Les modifications apportées n'ont pas été sauvegardées. +faxtomail.pdfEditor.askSaveBeforeLeaving.save=Vous avez modifié la pièce jointe mais vous n'avez pas enregistré ces modifications. faxtomail.pdfEditor.button.addCross.tip=Ajouter une croix faxtomail.pdfEditor.button.addHLine.tip=Ajouter une ligne horizontale faxtomail.pdfEditor.button.addHighlighter.tip=Ajouter un surlignement

1 0

r694 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 19 Nov '14

19 Nov '14

Author: kmorin Date: 2014-11-19 12:45:09 +0000 (Wed, 19 Nov 2014) New Revision: 694 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/694 Log: r?\195?\169cup?\195?\169ration de l'historique (quand on save depuis la liste, l'historique est ?\195?\160 null dans le mail) 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-11-19 11:14:17 UTC (rev 693) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-19 12:45:09 UTC (rev 694) @@ -305,17 +305,22 @@ } } + Collection<History> histories; if (!email.isPersisted()) { - if (email.getHistory() != null) { - historyDao.createAll(email.getHistory()); + histories = email.getHistory(); + if (histories != null) { + historyDao.createAll(histories); } + email = dao.create(email); - email = dao.create(email); + } else { + histories = historyDao.forEquals("email.topiaId", email.getTopiaId()).findAll(); } Set<String> fieldSet = Sets.newHashSet(modifiedFields); - History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + + History transmissionToEdi = CollectionUtils.find(histories, new Predicate<History>() { @Override public boolean evaluate(History object) { return object.getType() == HistoryType.TRANSMISSION_TO_EDI; @@ -333,8 +338,8 @@ handleEdiTransmission(email, historyDao, fieldSet); } - if (email.getHistory() != null) { - historyDao.createAll(Collections2.filter(email.getHistory(), new com.google.common.base.Predicate<History>() { + if (histories != null) { + historyDao.createAll(Collections2.filter(histories, new com.google.common.base.Predicate<History>() { @Override public boolean apply(History history) { return !history.isPersisted(); @@ -362,7 +367,7 @@ fieldSet.add(Email.PROPERTY_TAKEN_BY); } - boolean historyEmpty = email.isHistoryEmpty(); + boolean historyEmpty = CollectionUtils.isEmpty(histories); if (historyEmpty || !fieldSet.isEmpty()) { history = historyDao.create(History.PROPERTY_TYPE, historyEmpty ? HistoryType.CREATION : HistoryType.MODIFICATION, History.PROPERTY_FAX_TO_MAIL_USER, user,

1 0

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

19 Nov '14

Author: kmorin Date: 2014-11-19 11:14:17 +0000 (Wed, 19 Nov 2014) New Revision: 693 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/693 Log: fix erreur sauvegarde email Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.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-11-18 15:21:43 UTC (rev 692) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-19 11:14:17 UTC (rev 693) @@ -412,7 +412,7 @@ AttachmentTopiaDao attachmentTopiaDao = getPersistenceContext().getAttachmentDao(); HistoryTopiaDao historyTopiaDao = getPersistenceContext().getHistoryDao(); - List<Attachment> currentAttachments = attachmentTopiaDao.forEmailEquals(email).findAll(); + List<Attachment> currentAttachments = attachmentTopiaDao.forTopiaIdIn(email.getAttachmentTopiaIds()).findAll(); if (currentAttachments == null) { currentAttachments = new ArrayList<>(); } @@ -1663,21 +1663,23 @@ // email.addHistory(history); - try { - Attachment contentAttachment = convertTextToPdf(email.getOriginalEmail(), - t("faxtomail.email.content.attachment.plainfileName")); + if (StringUtils.isNotBlank(email.getOriginalEmail())) { + try { + Attachment contentAttachment = convertTextToPdf(email.getOriginalEmail(), + t("faxtomail.email.content.attachment.plainfileName")); - AttachmentFile contentAttachmentFile = contentAttachment.getOriginalFile(); - contentAttachmentFile.setTopiaId(getTopiaId(AttachmentFile.class, contentAttachmentFile)); - statelessSession.insert(contentAttachmentFile); + AttachmentFile contentAttachmentFile = contentAttachment.getOriginalFile(); + contentAttachmentFile.setTopiaId(getTopiaId(AttachmentFile.class, contentAttachmentFile)); + statelessSession.insert(contentAttachmentFile); - contentAttachment.setEmail(email); - contentAttachment.setTopiaId(getTopiaId(Attachment.class, contentAttachment)); - statelessSession.insert(contentAttachment); + contentAttachment.setEmail(email); + contentAttachment.setTopiaId(getTopiaId(Attachment.class, contentAttachment)); + statelessSession.insert(contentAttachment); - } catch (IOException | DocumentException e) { - if (log.isErrorEnabled()) { - log.error("error while creating email content attachment", e); + } catch (IOException | DocumentException e) { + if (log.isErrorEnabled()) { + log.error("error while creating email content attachment", e); + } } } 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-18 15:21:43 UTC (rev 692) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-19 11:14:17 UTC (rev 693) @@ -30,16 +30,12 @@ import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; -import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; import java.util.Date; import java.util.List; @@ -51,7 +47,6 @@ import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jpedal.PdfDecoder;

1 0

r692 - in trunk: . faxtomail-ui-swing faxtomail-ui-swing/src/license faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor
by kmorin＠users.forge.codelutin.com 18 Nov '14

18 Nov '14

Author: kmorin Date: 2014-11-18 15:21:43 +0000 (Tue, 18 Nov 2014) New Revision: 692 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/692 Log: fixes #5965 Probl?\195?\168me de taille et de d?\195?\169calage des annotations sur certains pdf fixes #6101 baisse qualit?\195?\169 sur les docs annot?\195?\169 Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-11-17 16:58:10 UTC (rev 691) +++ trunk/faxtomail-ui-swing/pom.xml 2014-11-18 15:21:43 UTC (rev 692) @@ -225,6 +225,7 @@ <artifactId>itextpdf</artifactId> </dependency> +  <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId> @@ -252,6 +253,12 @@ <artifactId>activation</artifactId> </dependency> +  + <dependency> + <groupId>org.jpedal</groupId> + <artifactId>jpedal-lgpl</artifactId> + </dependency> + </dependencies>  Modified: trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-11-17 16:58:10 UTC (rev 691) +++ trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-11-18 15:21:43 UTC (rev 692) @@ -6,6 +6,7 @@ # - Apache License 2.0 # - Apache License, version 2.0 # - BSD License +# - Bouncy Castle Licence # - CDDL # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 @@ -24,8 +25,10 @@ # - GNU Library or Lesser General Public License # - GPLv2+CE # - General Public License (GPL) +# - JDL (Java Distribution License) # - LGPL # - LGPL 2.1 +# - LGPL Open Source license # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License @@ -40,10 +43,11 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 17 17:38:01 CET 2014 +#Tue Nov 18 15:49:51 CET 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 +javax.media--jai_codec--1.1.3=Apache License javax.media.jai--com.springsource.javax.media.jai.codec--1.1.3=Apache License javax.media.jai--com.springsource.javax.media.jai.core--1.1.3=Apache License org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 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-17 16:58:10 UTC (rev 691) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-18 15:21:43 UTC (rev 692) @@ -32,30 +32,20 @@ import java.awt.event.MouseEvent; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import java.awt.image.RenderedImage; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStreamReader; import java.io.RandomAccessFile; -import java.net.URL; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; -import javax.imageio.ImageIO; -import javax.media.jai.PlanarImage; import javax.swing.JComponent; import javax.swing.JPanel; -import com.sun.pdfview.PDFFile; -import com.sun.pdfview.PDFPage; import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.swing.JAXXButtonGroup; @@ -64,6 +54,9 @@ import org.apache.commons.io.IOUtils; 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.swing.util.Cancelable; import org.nuiton.jaxx.application.swing.util.CloseableUI; @@ -90,7 +83,8 @@ protected ComponentMover cm = new ComponentMover(); protected ComponentResizer cr = new ComponentResizer(); - protected PDFFile pdf; + protected PdfDecoder pdfDecoder; +// protected PDFFile pdf; @Override public void afterInit(PDFEditorUI pdfEditorUI) { @@ -113,6 +107,9 @@ String value = (String) actionGroup.getSelectedValue(); model.setSelectedComponent(PDFEditorUIModel.EditionComponent.valueOf(value)); + pdfDecoder = new PdfDecoder(true); + FontMappings.setFontReplacements(); + ui.getContainer().addContainerListener(new ContainerListener() { @Override public void componentAdded(ContainerEvent e) { @@ -179,35 +176,32 @@ } catch (IOException e) { if (log.isErrorEnabled()) { - log.error("", e); + log.error("error while converting file to pdf", e); } getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.convertToPdf.error")); } catch (DocumentException e) { if (log.isErrorEnabled()) { - log.error("", e); + log.error("error while converting file to pdf", e); } getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.convertToPdf.error")); } } if (FaxToMailUIUtil.isFileAPDF(attachmentFile)) { - RandomAccessFile raf = null; try { - raf = new RandomAccessFile(file, "r"); - FileChannel channel = raf.getChannel(); - ByteBuffer buf = channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size()); - pdf = new PDFFile(buf); + pdfDecoder.closePdfFile(); + pdfDecoder.openPdfFile(file.getPath()); + pdfDecoder.setExtractionMode(0, 0, 1f); + pdfDecoder.setCenterOnScaling(true); - model.setPageNumber(pdf.getNumPages()); + model.setPageNumber(pdfDecoder.getPageCount()); model.setCurrentPageIndex(1); - raf.close(); - } catch (IOException e) { + + } catch (PdfException e) { if (log.isErrorEnabled()) { - log.error("", e); + log.error("error while converting file to pdf", e); } getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.readPdf.error")); - } finally { - IOUtils.closeQuietly(raf); } } getUI().setCursor(Cursor.getDefaultCursor()); @@ -265,7 +259,7 @@ @Override public void onCloseUI() { - + pdfDecoder.closePdfFile(); } public void addEditionComponent(MouseEvent event) { @@ -338,192 +332,190 @@ } protected void updatePageNumber(Integer pageNb, Integer prevPageNb) { - if (pdf != null) { - if (pageNb != null) { - if (prevPageNb != null) { - PDFEditorUIModel.Page p = getModel().getPage(prevPageNb); - for (JPanel panel : p.getNotes()) { - panel.setVisible(false); - } - for (JPanel panel : p.getCrosses()) { - panel.setVisible(false); - } - for (JPanel panel : p.getLines()) { - panel.setVisible(false); - } - for (JPanel panel : p.getHighlighters()) { - panel.setVisible(false); - } + if (pageNb != null) { + if (prevPageNb != null) { + PDFEditorUIModel.Page p = getModel().getPage(prevPageNb); + for (JPanel panel : p.getNotes()) { + panel.setVisible(false); } - - displayPage(pageNb, getModel().getZoom(), getModel().getRotation()); + for (JPanel panel : p.getCrosses()) { + panel.setVisible(false); + } + for (JPanel panel : p.getLines()) { + panel.setVisible(false); + } + for (JPanel panel : p.getHighlighters()) { + panel.setVisible(false); + } } + + displayPage(pageNb, getModel().getZoom(), getModel().getRotation()); } } protected void displayPage(int pageNb, float previousZoom, int previousRotation) { - PDFPage page = pdf.getPage(pageNb); - // create the image - Rectangle2D bBox = page.getBBox(); - Rectangle rect = new Rectangle(0, 0, (int) bBox.getWidth(), - (int) bBox.getHeight()); - float zoom = getModel().getZoom(); - int rotation = getModel().getRotation(); + try { + float zoom = getModel().getZoom(); + int rotation = getModel().getRotation(); - int width = (int) (zoom * rect.width); - int height = (int) (zoom * rect.height); - Image image = page.getImage(width, height, // width & height - rect, // clip rect - null, // null for the ImageObserver - true, // fill background with white - true // block until drawing is done - ); + pdfDecoder.setExtractionMode(0, 0, zoom); + BufferedImage image = pdfDecoder.getPageAsImage(pageNb); - JPanel container = getUI().getContainer(); - Dimension containerSize = new Dimension(rotation % 180 == 0 ? width : height, - rotation % 180 == 0 ? height : width); - container.setPreferredSize(containerSize); - container.setMinimumSize(containerSize); - container.setMaximumSize(containerSize); - container.setSize(containerSize); + int width = (int) (zoom * image.getWidth()); + int height = (int) (zoom * image.getHeight()); - JImagePanel documentPanel = ui.getDocumentPanel(); - documentPanel.setRotation(rotation); - documentPanel.setImage(image); + JPanel container = getUI().getContainer(); + Dimension containerSize = new Dimension(rotation % 180 == 0 ? width : height, + rotation % 180 == 0 ? height : width); + container.setPreferredSize(containerSize); + container.setMinimumSize(containerSize); + container.setMaximumSize(containerSize); + container.setSize(containerSize); - Insets insets = container.getInsets(); - rect = container.getBounds(); + JImagePanel documentPanel = ui.getDocumentPanel(); + documentPanel.setRotation(rotation); + documentPanel.setImage(image); - float zoomRatio = zoom / previousZoom; - int rotationDiff = rotation - previousRotation; + Insets insets = container.getInsets(); + Rectangle rect = container.getBounds(); - PDFEditorUIModel.Page p = getModel().getPage(pageNb); + float zoomRatio = zoom / previousZoom; + int rotationDiff = rotation - previousRotation; - for (PDFEditorNoteUI panel : p.getNotes()) { - panel.setVisible(true); + PDFEditorUIModel.Page p = getModel().getPage(pageNb); - panel.setZoom(zoom); - Rectangle bounds = panel.getBounds(); - int x, y; + for (PDFEditorNoteUI panel : p.getNotes()) { + panel.setVisible(true); - if (rotationDiff == 0) { - x = bounds.x; - y = bounds.y; + panel.setZoom(zoom); + Rectangle bounds = panel.getBounds(); + int x, y; - } else if (rotationDiff == 90 || rotationDiff == -270) { - x = rect.width - bounds.height / 2 - bounds.width / 2 - bounds.y; - y = bounds.x + bounds.width / 2 - bounds.height / 2; + if (rotationDiff == 0) { + x = bounds.x; + y = bounds.y; - } else { - x = bounds.y + bounds.height / 2 - bounds.width / 2; - y = rect.height - bounds.height / 2 - bounds.width / 2 - bounds.x; + } else if (rotationDiff == 90 || rotationDiff == -270) { + x = rect.width - bounds.height / 2 - bounds.width / 2 - bounds.y; + y = bounds.x + bounds.width / 2 - bounds.height / 2; + + } else { + x = bounds.y + bounds.height / 2 - bounds.width / 2; + y = rect.height - bounds.height / 2 - bounds.width / 2 - bounds.x; + } + + panel.setBounds((int) (zoomRatio * x) + insets.left, + (int) (zoomRatio * y) + insets.top, + (int) (zoomRatio * bounds.width), (int) (zoomRatio * bounds.height)); + } - panel.setBounds((int)(zoomRatio * x) + insets.left, - (int)(zoomRatio * y) + insets.top, - (int)(zoomRatio * bounds.width), (int)(zoomRatio * bounds.height)); + boolean orientation180 = Math.abs(rotationDiff) % 180 == 0; - } + for (PDFEditorCrossUI panel : p.getCrosses()) { + panel.setVisible(true); - boolean orientation180 = Math.abs(rotationDiff) % 180 == 0; + Rectangle bounds = panel.getBounds(); - for (PDFEditorCrossUI panel : p.getCrosses()) { - panel.setVisible(true); + int newWidth = orientation180 ? bounds.width : bounds.height; + int newHeight = orientation180 ? bounds.height : bounds.width; - Rectangle bounds = panel.getBounds(); + int x, y; - int newWidth = orientation180 ? bounds.width : bounds.height; - int newHeight = orientation180 ? bounds.height : bounds.width; + if (rotationDiff == 0) { + x = bounds.x; + y = bounds.y; - int x, y; + } else if (rotationDiff == 90 || rotationDiff == -270) { + x = rect.width - newWidth - bounds.y; + y = bounds.x; - if (rotationDiff == 0) { - x = bounds.x; - y = bounds.y; + } else { + x = bounds.y; + y = rect.height - newHeight - bounds.x; + } - } else if (rotationDiff == 90 || rotationDiff == -270) { - x = rect.width - newWidth - bounds.y; - y = bounds.x; + panel.setBounds((int) (zoomRatio * x) + insets.left, + (int) (zoomRatio * y) + insets.top, + (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); - } else { - x = bounds.y; - y = rect.height - newHeight - bounds.x; } - panel.setBounds((int) (zoomRatio * x) + insets.left, - (int) (zoomRatio * y) + insets.top, - (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); + List<PDFEditorLineUI> lines = p.getLines(); + cr.deregisterComponent(lines.toArray(new PDFEditorLineUI[lines.size()])); - } + for (PDFEditorLineUI panel : lines) { + panel.setVisible(true); - List<PDFEditorLineUI> lines = p.getLines(); - cr.deregisterComponent(lines.toArray(new PDFEditorLineUI[lines.size()])); + Rectangle bounds = panel.getBounds(); - for (PDFEditorLineUI panel : lines) { - panel.setVisible(true); + boolean horizontal = panel.isHorizontal(); + panel.setHorizontal(orientation180 ? horizontal : !horizontal); - Rectangle bounds = panel.getBounds(); + int newWidth = orientation180 ? bounds.width : bounds.height; + int newHeight = orientation180 ? bounds.height : bounds.width; - boolean horizontal = panel.isHorizontal(); - panel.setHorizontal(orientation180 ? horizontal : ! horizontal); + int x, y; - int newWidth = orientation180 ? bounds.width : bounds.height; - int newHeight = orientation180 ? bounds.height : bounds.width; + if (rotationDiff == 0) { + x = bounds.x; + y = bounds.y; - int x, y; + } else if (rotationDiff == 90 || rotationDiff == -270) { + x = rect.width - newWidth - bounds.y; + y = bounds.x; - if (rotationDiff == 0) { - x = bounds.x; - y = bounds.y; + } else { + x = bounds.y; + y = rect.height - newHeight - bounds.x; + } - } else if (rotationDiff == 90 || rotationDiff == -270) { - x = rect.width - newWidth - bounds.y; - y = bounds.x; + panel.setBounds((int) (zoomRatio * x) + insets.left, + (int) (zoomRatio * y) + insets.top, + (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); - } else { - x = bounds.y; - y = rect.height - newHeight - bounds.x; + cr.registerComponent(panel.isHorizontal() ? ComponentResizer.DIRECTION_HORIZONTAL : ComponentResizer.DIRECTION_VERTICAL, + panel); } - panel.setBounds((int) (zoomRatio * x) + insets.left, - (int) (zoomRatio * y) + insets.top, - (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); + for (PDFEditorHighlighterUI panel : p.getHighlighters()) { + panel.setVisible(true); - cr.registerComponent(panel.isHorizontal() ? ComponentResizer.DIRECTION_HORIZONTAL : ComponentResizer.DIRECTION_VERTICAL, - panel); - } + Rectangle bounds = panel.getBounds(); - for (PDFEditorHighlighterUI panel : p.getHighlighters()) { - panel.setVisible(true); + int newWidth = orientation180 ? bounds.width : bounds.height; + int newHeight = orientation180 ? bounds.height : bounds.width; - Rectangle bounds = panel.getBounds(); + int x, y; - int newWidth = orientation180 ? bounds.width : bounds.height; - int newHeight = orientation180 ? bounds.height : bounds.width; + if (rotationDiff == 0) { + x = bounds.x; + y = bounds.y; - int x, y; + } else if (rotationDiff == 90 || rotationDiff == -270) { + x = rect.width - newWidth - bounds.y; + y = bounds.x; - if (rotationDiff == 0) { - x = bounds.x; - y = bounds.y; + } else { + x = bounds.y; + y = rect.height - newHeight - bounds.x; + } - } else if (rotationDiff == 90 || rotationDiff == -270) { - x = rect.width - newWidth - bounds.y; - y = bounds.x; + panel.setBounds((int) (zoomRatio * x) + insets.left, + (int) (zoomRatio * y) + insets.top, + (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); - } else { - x = bounds.y; - y = rect.height - newHeight - bounds.x; } - panel.setBounds((int) (zoomRatio * x) + insets.left, - (int) (zoomRatio * y) + insets.top, - (int) (zoomRatio * newWidth), (int) (zoomRatio * newHeight)); + container.updateUI(); + } catch (PdfException e) { + if (log.isErrorEnabled()) { + log.error("error while displaying pdf", e); + } + getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.readPdf.error")); } - - container.updateUI(); } public File convertFileToPdf(AttachmentFile attachmentFile) throws IOException, DocumentException { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-17 16:58:10 UTC (rev 691) +++ trunk/pom.xml 2014-11-18 15:21:43 UTC (rev 692) @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.17-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.16</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> @@ -642,6 +642,12 @@ <version>1.8.1</version> </dependency> + <dependency> + <groupId>org.jpedal</groupId> + <artifactId>jpedal-lgpl</artifactId> + <version>4.74b27</version> + </dependency> + </dependencies> </dependencyManagement>

1 0