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

r231 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 15:08:44 +0200 (Thu, 19 Jun 2014) New Revision: 231 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/231 Log: Fix null tab title Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-06-19 13:08:44 UTC (rev 231) @@ -113,30 +113,7 @@ return DateFormat.getDateInstance(DateFormat.MEDIUM).format(bean); } }); - /*registerDecorator(new Decorator<File>(File.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((File) bean).getName(); - } - });*/ - /*registerDecorator(new Decorator<AttachmentFile>(AttachmentFile.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((AttachmentFile) bean).getFilename(); - } - });*/ registerMultiJXPathDecorator(HasLabel.class, "${label}$s", SEPARATOR, " - "); - //registerMultiJXPathDecorator(Attachment.class, "${originalFile}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Attachment>(Attachment.class) { private static final long serialVersionUID = 1L; 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-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 13:08:44 UTC (rev 231) @@ -45,6 +45,7 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.google.common.base.Function; import com.google.common.base.Predicate; +import com.google.common.base.Strings; import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; @@ -992,7 +993,7 @@ if (!ref.isEmpty()) { result = ref + " - " + result; } - return result; + return Strings.nullToEmpty(result); } @Override

1 0

r230 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 14:40:38 +0200 (Thu, 19 Jun 2014) New Revision: 230 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/230 Log: Fix new demande required fields Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 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-06-19 12:33:38 UTC (rev 229) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:40:38 UTC (rev 230) @@ -442,6 +442,7 @@ email.setTakenBy(currentUser); email.setHistory(histories); email.setDemandStatus(DemandStatus.UNTREATED); + email.setOriginalEmail(""); // can't be null openDemand(email); }

1 0

r229 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 14:33:38 +0200 (Thu, 19 Jun 2014) New Revision: 229 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/229 Log: Force loading before print Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 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-06-19 12:30:30 UTC (rev 228) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:33:38 UTC (rev 229) @@ -450,6 +450,10 @@ List<DemandeUIModel> currentEmails = getModel().getCurrentEmails(); for (DemandeUIModel demandeUIModel : currentEmails) { for (Attachment attachment : demandeUIModel.getAttachment()) { + + // force lasy loading + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + AttachmentFile attachmentFile = attachment.getEditedFile(); if (attachmentFile == null) { attachmentFile = attachment.getOriginalFile();

1 0

r228 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 14:30:30 +0200 (Thu, 19 Jun 2014) New Revision: 228 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/228 Log: Correction de la sauvegarde des pi?\195?\168ces edit?\195?\169es Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-19 12:16:21 UTC (rev 227) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-19 12:30:30 UTC (rev 228) @@ -161,8 +161,12 @@ currentAttachment = new AttachmentImpl(); } - if (!attachment.isPersisted()) { + // dans tout les cas, les pieces jointes courante de l'attchent prévale + // sur celles en base + if (attachment.getOriginalFile() != null) { originalFile = attachment.getOriginalFile(); + } + if (attachment.getEditedFile() != null) { editedFile = attachment.getEditedFile(); }

1 0

r227 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/xmi 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/u
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 14:16:21 +0200 (Thu, 19 Jun 2014) New Revision: 227 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/227 Log: Gestion des content-id des pieces jointes. Gestion du chargement ?\195?\160 la demande des pi?\195?\168ces jointes. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.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/OpenAttachmentAction.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/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-19 12:16:21 UTC (rev 227) @@ -235,10 +235,14 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_PASSWORD.getKey()); } - public boolean getSmtpUseSsl() { + public boolean isSmtpUseSsl() { return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.SMTP_SSL.getKey()); } + public boolean isMailDeleteRemote() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_DELETE_REMOTE.getKey()); + } + public String getLdapHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_HOST.getKey()); } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-19 12:16:21 UTC (rev 227) @@ -72,6 +72,11 @@ "Utilisation on non du mode ssl pour le stmp", "false", Boolean.class), + MAIL_DELETE_REMOTE( + "faxtomail.mail.deleteremote", + "Suppression automatique des mails sur le serveur distant (default : true)", + "true", Boolean.class), + DEV_MODE( "faxtomail.devMode", "Mode développement, court-circuite l'envoi de mail", 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 12:16:21 UTC (rev 227) @@ -48,17 +48,14 @@ @Override public File getFile() { - log.info("get content"); byte[] content = getContent(); if (tmpLocalFile == null && content != null) { try { - log.info("create temp file"); // create temp file File tempFolder = new File(FileUtils.getTempDirectory(), "faxtomail"); tempFolder.mkdir(); - log.info("new file"); String fileName = getFilename(); tmpLocalFile = new File(tempFolder, fileName); @@ -76,7 +73,6 @@ tmpLocalFile.deleteOnExit(); - log.info("copy blob content"); // copy blob content // be sure that "is" is not closed because is can be a local fileinputstream // that hibernate must read to put in database Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 12:16:21 UTC (rev 227) @@ -9,12 +9,16 @@ @Override public void setOriginalFile(AttachmentFile originalFile) { super.setOriginalFile(originalFile); - setOriginalFileName(originalFile != null ? originalFile.getFilename() : null); + if (originalFile != null) { + setOriginalFileName(originalFile.getFilename()); + } } @Override public void setEditedFile(AttachmentFile editedFile) { super.setEditedFile(editedFile); - setEditedFileName(editedFile != null ? editedFile.getFilename() : null); + if (editedFile != null) { + setEditedFileName(editedFile.getFilename()); + } } } Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-19 12:16:21 UTC (rev 227) @@ -167,7 +167,15 @@ } // copy new data - currentAttachment.setAddedByUser(attachment.isAddedByUser()); + attachmentBinder.copyExcluding(attachment, currentAttachment, + Attachment.PROPERTY_EDITED_FILE, + Attachment.PROPERTY_EDITED_FILE_NAME, + Attachment.PROPERTY_ORIGINAL_FILE, + Attachment.PROPERTY_ORIGINAL_FILE_NAME, + Attachment.PROPERTY_TOPIA_CREATE_DATE, + Attachment.PROPERTY_TOPIA_ID, + Attachment.PROPERTY_TOPIA_VERSION); + currentAttachment.setEditedFile(editedFile); currentAttachment.setOriginalFile(originalFile); @@ -532,7 +540,7 @@ final String smtpUser = getApplicationConfig().getSmtpUser(); final String password = getApplicationConfig().getSmtpPassword(); - final boolean useSsl = getApplicationConfig().getSmtpUseSsl(); + final boolean useSsl = getApplicationConfig().isSmtpUseSsl(); MultiPartEmail message = new MultiPartEmail(); message.setHostName(getApplicationConfig().getSmtpHost()); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-19 12:16:21 UTC (rev 227) @@ -41,7 +41,8 @@ MainUI mainUI = getContext().getMainUI(); PDFEditorUI dialogContent = new PDFEditorUI(getUI()); - boolean editedNull = attachment.getEditedFileName() == null; + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + /*boolean editedNull = attachment.getEditedFileName() == null; AttachmentFile attachmentFile = editedNull ? attachment.getOriginalFile() : attachment.getEditedFile(); if (attachmentFile == null) { attachmentFile = getContext().getEmailService().getAttachmentFile(attachment.getTopiaId(), editedNull); @@ -51,7 +52,7 @@ attachment.setOriginalFile(attachmentFile); } else { attachment.setEditedFile(attachmentFile); - } + }*/ dialogContent.getModel().fromEntity(attachment); getHandler().openDialog(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); dialogContent.getModel().toEntity(attachment); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-19 12:16:21 UTC (rev 227) @@ -1,10 +1,33 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * %% + * Copyright (C) 2014 Franciaflex + * %% + * 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.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,16 +62,8 @@ @Override public void doAction() throws Exception { getModel().fireAttachmentOpened(attachment, original); + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); AttachmentFile attachmentFile = original ? attachment.getOriginalFile() : attachment.getEditedFile(); - if (attachmentFile == null) { - attachmentFile = getContext().getEmailService().getAttachmentFile(attachment.getTopiaId(), original); - if (original) { - attachment.setOriginalFile(attachmentFile); - } else { - attachment.setEditedFile(attachmentFile); - } - } - File file = attachmentFile.getFile(); DesktopUtil.browse(file.toURI()); } 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:16:21 UTC (rev 227) @@ -46,8 +46,6 @@ import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -454,7 +452,6 @@ for (Attachment attachment : demandeUIModel.getAttachment()) { AttachmentFile attachmentFile = attachment.getEditedFile(); if (attachmentFile == null) { - // TODO kmorin 20140617 put it in action and check if file is null attachmentFile = attachment.getOriginalFile(); } FaxToMailUIUtil.print(attachmentFile, true); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-19 12:16:21 UTC (rev 227) @@ -150,7 +150,7 @@ initBeanFilterableComboBox(ui.getEtatAttenteComboBox(), etatAttentes, model.getEtatAttente()); JTextPane editor = ui.getMailBodyField(); - FaxToMailUIUtil.setEmailContentInTextPane(editor, model); + FaxToMailUIUtil.setEmailContentInTextPane(this, editor, model); // init table final JXTable table = ui.getRangeTable(); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 12:16:21 UTC (rev 227) @@ -22,23 +22,21 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import static org.nuiton.i18n.I18n.t; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; +import java.awt.Desktop; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import org.nuiton.util.FileUtil; - import javax.print.Doc; import javax.print.DocFlavor; import javax.print.DocPrintJob; @@ -49,7 +47,9 @@ import javax.print.SimpleDoc; import javax.print.attribute.HashPrintRequestAttributeSet; import javax.print.attribute.PrintRequestAttributeSet; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.JTextPane; +import javax.swing.JTree; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLEditorKit; @@ -59,19 +59,25 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import java.awt.*; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.JAXXUtil; -import static org.nuiton.i18n.I18n.t; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; +import org.nuiton.util.FileUtil; +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.services.service.EmailService; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 @@ -181,18 +187,6 @@ return result; } - /*public static boolean isFileAPDF(File file) { - return FileUtil.extension(file).toUpperCase().equals("PDF"); - } - - public static boolean isFileATxt(File file) { - return FileUtil.extension(file).toUpperCase().equals("TXT"); - } - - public static boolean isFileATif(File file) { - return FileUtil.extension(file).toUpperCase().equals("TIF"); - }*/ - public static boolean isFileAPDF(AttachmentFile file) { return FileUtil.extension(file.getFilename()).toUpperCase().equals("PDF"); } @@ -205,7 +199,7 @@ return FileUtil.extension(file.getFilename()).toUpperCase().equals("TIF"); } - public static void setEmailContentInTextPane(JTextPane textPane, DemandeUIModel demandeUIModel) { + public static void setEmailContentInTextPane(DemandeUIHandler handler, JTextPane textPane, DemandeUIModel demandeUIModel) { String content = demandeUIModel.getHtmlContent(); if (content != null) { textPane.setContentType("text/html"); @@ -224,14 +218,36 @@ // the meta tag makes the content is not displayed content = content.replaceAll("<meta (.*?)>(</meta>)?", ""); + if (log.isTraceEnabled()) { + log.trace("Content before mail = " + content); + } + for (Attachment attachment : demandeUIModel.getAttachment()) { - String fileName = attachment.getOriginalFileName(); - log.info("file " + fileName); - String key = fileName; + String key = attachment.getContentId(); + if (key == null) { + key = attachment.getOriginalFileName(); + } + + // get file content + forceAttachmentFileLoading(handler.getContext(), attachment); + AttachmentFile attachmentFile = attachment.getOriginalFile(); + File file = attachmentFile.getFile(); + // replace the inline attachments with the extracted attachment file url - //content = content.replaceAll("<img src=\"cid:" + key + "\"(.*?>)", "<img src=\"file://" + file.getAbsolutePath() + "\"$1"); - throw new RuntimeException("Fix it"); + // match les patterns: + // <td background="cid:bg.gif" height="52"> + // <img border=0 src="cid:bg.gif" /> + // <img src='cid:5e9ef859-ea65-4f9b-a9fa-30d4a2c5837c' + content = content.replaceAll("(\\w+)=([\"'])cid:" + Pattern.quote(key) + "([\"'])", "$1=$2file://" + file.getAbsolutePath() + "$3"); + + if (log.isDebugEnabled()) { + log.debug("Mapping attachment id " + key + " to file " + file.getAbsolutePath()); + } } + + if (log.isTraceEnabled()) { + log.trace("Content after mail = " + content); + } } else { content = demandeUIModel.getPlainContent(); @@ -239,6 +255,27 @@ textPane.setText(content); } + /** + * Force le chargement des attachmentFile (edited and original) pour un attachment. + * + * @param context context + * @param attachment attachment + */ + public static void forceAttachmentFileLoading(FaxToMailUIContext context, Attachment attachment) { + if (log.isDebugEnabled()) { + log.debug("Force attachment loading " + attachment.getOriginalFileName()); + } + EmailService service = context.getEmailService(); + if (attachment.getOriginalFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), true); + attachment.setOriginalFile(file); + } + if (attachment.getEditedFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), false); + attachment.setEditedFile(file); + } + } + public static Desktop getDesktopForPrint() { if (!Desktop.isDesktopSupported()) { 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 12:16:21 UTC (rev 227) @@ -299,7 +299,10 @@ null, modifiedProperties.toArray(new String[modifiedProperties.size()])); - message.setFlag(Flags.Flag.DELETED, true); + // suppression des mails sur le serveur distant (automatique par default) + if (serviceContext.getApplicationConfig().isMailDeleteRemote()) { + message.setFlag(Flags.Flag.DELETED, true); + } } log.debug("End of emails"); @@ -345,19 +348,25 @@ // else, this is an attachment } else { String fileName = bp.getFileName(); + + // parse Content-ID (content identifier in html mail content) + String[] headers = bp.getHeader("Content-ID"); + if (headers == null) { + break; + } + String contentID = headers[0]; + // remove the guillemets between the id + contentID = contentID.replaceFirst("^<(.*)>$", "$1"); + if (fileName == null) { - String[] headers = bp.getHeader("Content-ID"); - if (headers == null) { - break; - } - fileName = headers[0]; - // remove the guillemets between the id - fileName = fileName.replaceFirst("^<(.*)>$", "$1"); + fileName = contentID; } try { fileName = MimeUtility.decodeText(fileName); - log.debug("FileName : " + fileName); + if (log.isDebugEnabled()) { + log.debug("FileName : " + fileName + ", Content-ID : " + contentID); + } } catch (UnsupportedEncodingException ex) { // don't care, use filename raw value if (log.isWarnEnabled()) { @@ -372,6 +381,7 @@ AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); + attachment.setContentId(contentID); //email.addAttachment(attachment); attachments.add(attachment);

1 0

r226 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 19:13:29 +0200 (Wed, 18 Jun 2014) New Revision: 226 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/226 Log: Allow to setup multiples admin groups Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 17:13:29 UTC (rev 226) @@ -24,8 +24,20 @@ * #L% */ -import com.google.common.base.Charsets; -import com.google.common.collect.Maps; +import static org.nuiton.i18n.I18n.t; + +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.swing.KeyStroke; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -39,18 +51,9 @@ import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.Version; -import javax.swing.*; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import com.google.common.base.Charsets; +import com.google.common.collect.Maps; -import static org.nuiton.i18n.I18n.t; - public class FaxToMailConfiguration extends ApplicationConfiguration { private static final Log log = LogFactory.getLog(FaxToMailConfiguration.class); @@ -256,8 +259,8 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_BASEDN.getKey()); } - public String getLdapAdminGroup() { - return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_ADMIN_GROUP.getKey()); + public List<String> getLdapAdminGroups() { + return applicationConfig.getOptionAsList(FaxToMailConfigurationOption.LDAP_ADMIN_GROUPS.getKey()).getOption(); } public String getLdapPrincipalDomain() { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 17:13:29 UTC (rev 226) @@ -102,8 +102,8 @@ "faxtomail.ldap.basedn", "Mot de passe pour la connexion au serveur LDAP", "DC=mac-groupe,DC=net", String.class), - LDAP_ADMIN_GROUP( - "faxtomail.ldap.admin.group", + LDAP_ADMIN_GROUPS( + "faxtomail.ldap.admin.groups", "DN du groupe ldap ayant les autorisations d'accéder à la partie admin de l'interface web", null, String.class), LDAP_PRINCIPAL_DOMAIN( Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-18 17:13:29 UTC (rev 226) @@ -25,6 +25,7 @@ */ import java.beans.PropertyDescriptor; +import java.util.List; import java.util.Map; import java.util.Set; @@ -142,10 +143,10 @@ faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin - String adminGroup = serviceContext.getApplicationConfig().getLdapAdminGroup(); - if (StringUtils.isNotBlank(adminGroup) && user.getUserGroups() != null) { + List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); + if (CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { for (FaxToMailUserGroup group : user.getUserGroups()) { - if (adminGroup.equals(group.getFullPath())) { + if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true); } }

1 0

r225 - trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 19:01:09 +0200 (Wed, 18 Jun 2014) New Revision: 225 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/225 Log: Fix tests Removed: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-18 16:56:41 UTC (rev 224) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-18 17:01:09 UTC (rev 225) @@ -230,11 +230,17 @@ Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, now); String projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(now)); - Email email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, - Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " - + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(now), Email.PROPERTY_RECEPTION_DATE, now, - Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email email = emailDao.create(Email.PROPERTY_SENDER, sender, + Email.PROPERTY_FAX, fax, + Email.PROPERTY_CLIENT, client, + Email.PROPERTY_PROJECT_REFERENCE, projectRef, + Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(now), + Email.PROPERTY_RECEPTION_DATE, now, + Email.PROPERTY_MAIL_FOLDER, folder, + Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "test"); if (opened) { @@ -264,11 +270,16 @@ Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, yesterday); projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(yesterday)); - email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, + email = emailDao.create(Email.PROPERTY_SENDER, sender, + Email.PROPERTY_FAX, fax, + Email.PROPERTY_CLIENT,client, Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(yesterday), - Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, - opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_RECEPTION_DATE, yesterday, + Email.PROPERTY_MAIL_FOLDER, folder, + Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "test"); if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); Deleted: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java 2014-06-18 16:56:41 UTC (rev 224) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java 2014-06-18 17:01:09 UTC (rev 225) @@ -1,29 +0,0 @@ -package com.franciaflex.faxtomail.services.service; - -/* - * #%L - * FaxToMail :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, 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% - */ - -public class ReferentielServiceTest extends AbstractFaxToMailServiceTest { - -}

1 0

r224 - in trunk: faxtomail-service faxtomail-ui-swing faxtomail-ui-swing/src/main faxtomail-ui-swing/src/main/resources
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 18:56:41 +0200 (Wed, 18 Jun 2014) New Revision: 224 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/224 Log: Fix strange pom Added: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config Removed: trunk/faxtomail-ui-swing/src/main/filtered-resources/ Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/resources/log4j.properties Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-service/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -22,12 +22,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> <version>0.3-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-service</artifactId> @@ -163,21 +164,7 @@ </dependencies> <build> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <plugins> <plugin> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -33,7 +33,6 @@ <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-ui-swing</artifactId> - <version>0.3-SNAPSHOT</version> <name>FaxToMail :: UI</name> <properties> @@ -297,18 +296,20 @@ <build> <resources> <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> + <directory>src/main/resources</directory> <includes> <include>*.config</include> <include>*.properties</include> </includes> + <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> + <excludes> + <exclude>*.config</exclude> + <exclude>*.properties</exclude> + </excludes> + <filtering>false</filtering> </resource> </resources> <plugins> Copied: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (from rev 212, trunk/faxtomail-ui-swing/src/main/filtered-resources/faxtomail.config) =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-06-18 16:56:41 UTC (rev 224) @@ -0,0 +1,4 @@ +faxtomail.version=${project.version} +faxtomail.site.url=${project.url} +faxtomail.inceptionYear=${project.inceptionYear} +faxtomail.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:56:41 UTC (rev 224) @@ -19,18 +19,23 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -log4j.rootCategory=WARN, console +# Global logging configuration +log4j.rootLogger=ERROR, stdout, file -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n -# global level -log4j.logger.com.franciaflex.faxtomail.ui.swing=DEBUG +# faxtomail levels +log4j.logger.com.franciaflex.faxtomail=INFO -### persistence level -# log4j.logger.org.nuiton.topia=TRACE -# log4j.logger.com.franciaflex.faxtomail.persistence=TRACE +#log4j.appender.file=org.apache.log4j.RollingFileAppender +#log4j.appender.file.file=${faxtomail.log.file} +#log4j.appender.file.MaxFileSize=10MB +#log4j.appender.file.MaxBackupIndex=4 -### services level -# log4j.logger.com.franciaflex.faxtomail.services=TRACE +#log4j.appender.file.layout=org.apache.log4j.PatternLayout +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n

1 0

r223 - in trunk: . faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities 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/reply
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 18:46:34 +0200 (Wed, 18 Jun 2014) New Revision: 223 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/223 Log: Fix attachment saving (editing still not working) Change file open to use xdg-open. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 16:46:34 UTC (rev 223) @@ -276,10 +276,6 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.INSTANCE_DISCLAIMER.getKey()); } - public File getStorageFile() { - return applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.STORAGE_FILE.getKey()); - } - public boolean isLogConfigurationProvided() { boolean logConfigurationProvided = StringUtils.isNotBlank(applicationConfig.getOption(FaxToMailConfigurationOption.LOG_CONFIGURATION_FILE.getKey())); Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 16:46:34 UTC (rev 223) @@ -77,11 +77,6 @@ "Mode développement, court-circuite l'envoi de mail", "false", Boolean.class), - STORAGE_FILE( - "faxtomail.storage", - "L'emplacement de stockage des fichiers, répertoire accessible en écriture sur le FS", - "/tmp/faxtomail/storage", File.class), - LOG_CONFIGURATION_FILE( "logConfigurationFile", "Chemin vers le fichier de configuration des journaux", 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-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 16:46:34 UTC (rev 223) @@ -65,7 +65,7 @@ // if the file already exists, then add a number to the name int i = 1; String extension = "." + FileUtil.extension(fileName); - String name = FileUtil.basename(fileName); + String name = FileUtil.basename(fileName, extension); while (tmpLocalFile.exists()) { tmpLocalFile = new File(tempFolder, name + "-" + i++ + extension); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-18 16:46:34 UTC (rev 223) @@ -144,6 +144,15 @@ AttachmentFileTopiaDao attachementFileTopiaDao = getPersistenceContext().getAttachmentFileDao(); for (Attachment attachment : attachments) { + + // get attchment BEFORE for flush + AttachmentFile originalFile = null; + AttachmentFile editedFile = null; + if (attachment.isPersisted()) { + originalFile = getAttachmentFile(attachment.getTopiaId(), true); + editedFile = getAttachmentFile(attachment.getTopiaId(), false); + } + // get session attachment from id Attachment currentAttachment; if (StringUtils.isNoneBlank(attachment.getTopiaId())) { @@ -152,35 +161,44 @@ currentAttachment = new AttachmentImpl(); } + if (!attachment.isPersisted()) { + originalFile = attachment.getOriginalFile(); + editedFile = attachment.getEditedFile(); + } + // copy new data - attachmentBinder.copy(attachment, currentAttachment); + currentAttachment.setAddedByUser(attachment.isAddedByUser()); + currentAttachment.setEditedFile(editedFile); + currentAttachment.setOriginalFile(originalFile); - // persist - AttachmentFile editedFile = currentAttachment.getEditedFile(); + // ici les pieces jointes peuvent être sauvegardées sans que les pièces jointes + // soit présentes dans les entités car l'ui ne les a pas copiées + // pour ne pas les charger inutilement + // donc on les remet manuellement + + //if (originalFile != null) { + if (!originalFile.isPersisted()) { + attachementFileTopiaDao.create(originalFile); + } else { + attachementFileTopiaDao.update(originalFile); + } + /*} else if (attachment.isPersisted()) { + AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), true); + currentAttachment.setOriginalFile(attachmentFile); + }*/ + if (editedFile != null) { if (!editedFile.isPersisted()) { attachementFileTopiaDao.create(editedFile); } else { attachementFileTopiaDao.update(editedFile); } - } else if (attachment.isPersisted()) { + } /*else if (attachment.isPersisted()) { AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), false); currentAttachment.setEditedFile(attachmentFile); - } + }*/ - AttachmentFile originalFile = currentAttachment.getOriginalFile(); - if (originalFile != null) { - if (!originalFile.isPersisted()) { - attachementFileTopiaDao.create(originalFile); - } else { - attachementFileTopiaDao.update(originalFile); - } - } else if (attachment.isPersisted()) { - AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), true); - currentAttachment.setOriginalFile(attachmentFile); - } - - if (!attachment.isPersisted()) { + if (!currentAttachment.isPersisted()) { // persist using cascade email.addAttachment(currentAttachment); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 16:46:34 UTC (rev 223) @@ -43,9 +43,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; @@ -84,8 +82,6 @@ log.info("faxtomail initialization started"); } - checkStorage(); - boolean devMode = serviceContext.getApplicationConfig().isDevMode(); if (devMode) { @@ -102,38 +98,6 @@ } - protected void checkStorage() { - - FaxToMailConfiguration applicationConfig = getApplicationConfig(); - - File storageFile = applicationConfig.getStorageFile(); - - if (storageFile.exists()) { - if (log.isInfoEnabled()) { - log.info("storage directory exists " + storageFile.getAbsolutePath()); - } - } else { - if (log.isInfoEnabled()) { - log.info("storage directory does not exist, creating " + storageFile.getAbsolutePath()); - } - - boolean created = storageFile.mkdirs(); - - if ( ! created) { - throw new ApplicationTechnicalException("unable to create directory " + storageFile.getAbsolutePath()); - } - } - - if ( ! storageFile.isDirectory()) { - throw new ApplicationTechnicalException("file exists but is not a directory " + storageFile.getAbsolutePath()); - } - - if ( ! storageFile.canWrite()) { - throw new ApplicationTechnicalException("directory exists but is not writable " + storageFile.getAbsolutePath()); - } - - } - protected void initSampleData() { log.debug("init Sample Data"); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 16:46:34 UTC (rev 223) @@ -5,14 +5,12 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentItem; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DesktopUtil; -import java.awt.*; import java.io.File; -import java.io.IOException; import static org.nuiton.i18n.I18n.t; @@ -50,14 +48,8 @@ attachment.setEditedFile(attachmentFile); } } -// AttachmentFile attachmentFile = original ? attachment.getOriginalFile() : attachment.getEditedFile(); - Desktop desktop = FaxToMailUIUtil.getDesktopForOpen(); - try { - File file = attachmentFile.getFile(); - desktop.open(file); - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); - } + File file = attachmentFile.getFile(); + DesktopUtil.browse(file.toURI()); } } 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-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-06-18 16:46:34 UTC (rev 223) @@ -27,12 +27,12 @@ import static org.nuiton.i18n.I18n.t; import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; + import org.apache.commons.io.FileUtils; -import org.nuiton.util.FileUtil; +import org.nuiton.util.DesktopUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import java.awt.Component; -import java.awt.Desktop; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -55,7 +55,6 @@ import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +64,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Lists; /** @@ -282,14 +280,8 @@ public void openAttachment(AttachmentFile attachment) { File file = attachment.getFile(); + DesktopUtil.open(file); - Desktop desktop = FaxToMailUIUtil.getDesktopForOpen(); - try { - desktop.open(file); - - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); - } } protected class FileComboBoxEditor implements ComboBoxEditor { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/pom.xml 2014-06-18 16:46:34 UTC (rev 223) @@ -100,7 +100,7 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion>

1 0

r222 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 17:23:42 +0200 (Wed, 18 Jun 2014) New Revision: 222 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/222 Log: Add notNull constraints Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 15:23:25 UTC (rev 221) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 15:23:42 UTC (rev 222) @@ -54,11 +54,12 @@ # Attachment -#com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFile.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFile.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFileName.tagvalue.notNull=true # AttachmentFile com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true -#com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true # MailFolder com.franciaflex.faxtomail.persistence.entities.MailFolder.class.tagvalue.naturalIdMutable=true @@ -73,6 +74,7 @@ # Email com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Email.attribute.originalEmail.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.Email.attribute.rangeRow.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.attachment.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.history.tagvalue.lazy=false Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:25 UTC (rev 221) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:42 UTC (rev 222) @@ -404,7 +404,8 @@ Email.PROPERTY_RECEPTION_DATE, now, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); if (opened) { @@ -451,7 +452,8 @@ Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); if (opened) {

1 0