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

r406 - trunk
by echatellier＠users.forge.codelutin.com July 17, 2014

July 17, 2014

Author: echatellier Date: 2014-07-17 11:16:57 +0200 (Thu, 17 Jul 2014) New Revision: 406 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/406 Log: Update to angularjs 1.2.20 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-17 08:54:07 UTC (rev 405) +++ trunk/pom.xml 2014-07-17 09:16:57 UTC (rev 406) @@ -532,7 +532,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.19-1</version> + <version>1.2.20-1</version> <scope>runtime</scope> </dependency>

1 0

r405 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/actions java/com/franciaflex/faxtomail/ui/swing/content/demande resources/i18n
by echatellier＠users.forge.codelutin.com July 17, 2014

July 17, 2014

Author: echatellier Date: 2014-07-17 10:54:07 +0200 (Thu, 17 Jul 2014) New Revision: 405 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/405 Log: Ajout d'un message si l'utilisateur n'a vraiment aucun droit Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 08:26:39 UTC (rev 404) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 08:54:07 UTC (rev 405) @@ -45,8 +45,10 @@ import static org.nuiton.i18n.I18n.t; /** + * Action de chargement des demandes d'un dossier lors de la selection d'un dossier dans l'arbre + * des dossiers. + * * @author Kevin Morin (Code Lutin) - * */ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListUIModel, DemandeListUI, DemandeListUIHandler> { 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-07-17 08:26:39 UTC (rev 404) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-17 08:54:07 UTC (rev 405) @@ -40,6 +40,7 @@ import java.util.Map; import javax.swing.JComponent; +import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.JTable; import javax.swing.JTree; @@ -57,9 +58,11 @@ import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -322,6 +325,12 @@ ui.getNavigationTree().setSelectionPath(new TreePath(node.getPath())); } + + // affichage d'un message si l'utilisateur n'a aucun droit + if (CollectionUtils.isEmpty(model.getFolders())) { + JOptionPane.showMessageDialog(ui, t("faxtomail.demandeList.noRigthsFound"), + t("faxtomail.demandeList.title"), JOptionPane.ERROR_MESSAGE); + } } public void goToNextPage() { 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-07-17 08:26:39 UTC (rev 404) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-17 08:54:07 UTC (rev 405) @@ -8,7 +8,7 @@ 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 -faxtomail.action.exit.tip= +faxtomail.action.exit.tip=Quitter l'application faxtomail.action.generateAnnotatedAttachment.tip=Générer le pdf annoté faxtomail.action.goto.demand.tip=Aller au détail de l'élément faxtomail.action.goto.demandList.tip=Aller à la liste des éléments @@ -139,6 +139,7 @@ faxtomail.demandeList.demandNbLabel=Nombre de demandes faxtomail.demandeList.goToNextPage=> faxtomail.demandeList.goToPreviousPage=< +faxtomail.demandeList.noRigthsFound=Aucun permission n'a été trouvée pour vous. Veuillez contacter l'administrateur pour résoudre ce problème \! faxtomail.demandeList.pages=Pages \: faxtomail.demandeList.pfNbLabel=Nombre de produits finis faxtomail.demandeList.quotationNbLabel=Nombre de devis

1 0

r404 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com July 17, 2014

July 17, 2014

Author: echatellier Date: 2014-07-17 10:26:39 +0200 (Thu, 17 Jul 2014) New Revision: 404 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/404 Log: Modification de l'import pour supporter les mises ?\195?\160 jour Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-17 08:26:07 UTC (rev 403) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-17 08:26:39 UTC (rev 404) @@ -43,6 +43,7 @@ import org.nuiton.util.beans.BinderFactory; import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; @@ -112,17 +113,30 @@ ClientTopiaDao dao = getPersistenceContext().getClientDao(); ClientImportModel clientImportModel = new ClientImportModel(';'); + Binder<Client, Client> clientBinder = BinderFactory.newBinder(Client.class); + Import<Client> importer = null; try { - Import<Client> importer = Import.newImport(clientImportModel, inputStream); - try { - for (Client client : importer) { - result.add(dao.create(client)); + importer = Import.newImport(clientImportModel, inputStream); + for (Client client : importer) { + + Client current = dao.forCodeEquals(client.getCode()).addEquals(Client.PROPERTY_BRAND, client.getBrand()).findAnyOrNull(); + if (current == null) { + current = new ClientImpl(); } - getPersistenceContext().commit(); - } finally { - IOUtils.closeQuietly(importer); + clientBinder.copyExcluding(client, current, + Client.PROPERTY_TOPIA_ID, + Client.PROPERTY_TOPIA_CREATE_DATE, + Client.PROPERTY_TOPIA_VERSION); + + if (client.isPersisted()) { + current = dao.update(current); + } else { + current = dao.create(current); + } + result.add(current); } + getPersistenceContext().commit(); } catch (ImportRuntimeException e) { String message; @@ -134,6 +148,7 @@ throw new ApplicationTechnicalException(message, e); } finally { + IOUtils.closeQuietly(importer); IOUtils.closeQuietly(inputStream); } return result;

1 0

r403 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com July 17, 2014

July 17, 2014

Author: echatellier Date: 2014-07-17 10:26:07 +0200 (Thu, 17 Jul 2014) New Revision: 403 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/403 Log: Correction du test sur le numero de fax (notation octal) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-16 16:15:28 UTC (rev 402) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-17 08:26:07 UTC (rev 403) @@ -84,7 +84,8 @@ // on essaye de voir si on peut gérer l'adresse de l'expediteur comme un fax if (CollectionUtils.isEmpty(clients)) { String faxNumber = emailAddress.substring(0, emailAddress.indexOf('@')).replaceAll(" ", ""); - if (NumberUtils.isNumber(faxNumber)) { + // NumberUtils.isNumber peut echouer (notation octal) + if (StringUtils.isNumeric(faxNumber)) { emailAddress = StringUtils.leftPad(faxNumber, 10, '0'); clients = clientDao.forFaxNumberEquals(emailAddress).findAll(); email.setFax(true);

1 0

r402 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 18:15:28 +0200 (Wed, 16 Jul 2014) New Revision: 402 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/402 Log: Mise ?\195?\160 jour des clients qui existe d?\195?\169j?\195?\160 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-16 15:44:06 UTC (rev 401) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-16 16:15:28 UTC (rev 402) @@ -26,6 +26,8 @@ import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.ClientImpl; + +import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; @@ -49,13 +51,28 @@ return s; } }; + + // parser qui retire les non nombres des numero de fax + ValueParser<String> faxParser = new ValueParser<String>() { + @Override + public String parse(String s) throws ParseException { + if ("NULL".equals(s)) { + s = null; + } + if (s != null) { + s = StringUtils.removePattern(s, "[^0-9]"); + } + return s; + } + }; + newMandatoryColumn("Id_Correspondance", Client.PROPERTY_ID); newMandatoryColumn("Societe", Client.PROPERTY_BRAND); newMandatoryColumn("Nom", Client.PROPERTY_NAME); newMandatoryColumn("Caracteristique1", Client.PROPERTY_CARACTERISTIC1, nullParser); newMandatoryColumn("Caracteristique2", Client.PROPERTY_CARACTERISTIC2, nullParser); newMandatoryColumn("Caracteristique3", Client.PROPERTY_CARACTERISTIC3, nullParser); - newMandatoryColumn("Numero_Fax", Client.PROPERTY_FAX_NUMBER, nullParser); + newMandatoryColumn("Numero_Fax", Client.PROPERTY_FAX_NUMBER, faxParser); newMandatoryColumn("Adresse_Mail", Client.PROPERTY_EMAIL_ADDRESS, nullParser); newMandatoryColumn("Code_Client", Client.PROPERTY_CODE);

1 0

r401 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 17:44:06 +0200 (Wed, 16 Jul 2014) New Revision: 401 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/401 Log: Add fixme 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-07-16 15:35:15 UTC (rev 400) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-16 15:44:06 UTC (rev 401) @@ -540,6 +540,7 @@ model.setOriginalDemand(demand); + //FIXME echatellier 20140716 : ajouter dans le TODO ce qui doit être testé //TODO kmorin 20140626 to test String sender = JAXXUtil.getStringValue(demand.getSender()); if (demand.isFax()) {

1 0

r400 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 17:35:15 +0200 (Wed, 16 Jul 2014) New Revision: 400 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/400 Log: Suppression du mail m?\195?\170me s'il est rejet?\195?\169 (enfin surtout s'il est rejet?\195?\169) Ajout d'un fixme... encore. Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-07-16 15:14:12 UTC (rev 399) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-16 15:35:15 UTC (rev 400) @@ -301,6 +301,10 @@ } } } + + // FIXME echatellier 20140716 : le mail doit-il rester sur le serveur potentiellement traité suite à l'ajout d'un futur filtre + // doit-il est supprimé ? + // you decide : delete mail or add proper comment continue; } @@ -376,6 +380,10 @@ recipient = FaxToMailServiceUtils.addFaxDomainToFaxNumber(recipient, mailFolder); } emailService.rejectEmail(senderEmail, recipient, t("faxtomail.email.subject.re", message.getSubject()), rejectMessage); + + // important, delete mail + deleteMail(message); + continue; } } @@ -388,7 +396,6 @@ Date now = new Date(); - Decorator<Date> dateDecorator = decoratorService.getDecoratorByType(Date.class, DecoratorService.DATE); String projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(now)); email.setProjectReference(projectRef); @@ -437,16 +444,15 @@ if (log.isDebugEnabled()) { log.debug(" ==> Message placé dans le dossier " + email.getMailFolder().getName()); } - // suppression des mails sur le serveur distant (automatique par default) - if (config.isMailDelete()) { - message.setFlag(Flags.Flag.DELETED, true); - } + // important, delete mail + deleteMail(message); + } catch (Exception e) { log.error("Error while reading the email", e); } } - if (log.isDebugEnabled()){ + if (log.isDebugEnabled()) { log.debug("End of emails"); } @@ -456,6 +462,19 @@ } /** + * Supprime le mail sur le serveur (si nécéssaire). + * + * @param message message to delete + * @throws MessagingException + */ + protected void deleteMail(Message message) throws MessagingException { + // suppression des mails sur le serveur distant (non actif par default) + if (config.isMailDelete()) { + message.setFlag(Flags.Flag.DELETED, true); + } + } + + /** * Decompose a multipart part. * - sets the email content if the part contains a text bodypart * - adds attachments to the email

1 0

r399 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 17:14:12 +0200 (Wed, 16 Jul 2014) New Revision: 399 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/399 Log: Pas de lock pour la creation d'une demande Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-07-16 14:17:36 UTC (rev 398) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-07-16 15:14:12 UTC (rev 399) @@ -130,6 +130,8 @@ } // au final, on a ouvert la demande, on peut locker la demande - getContext().getEmailService().lockEmail(currentEmail.getTopiaId(), currentUser); + if (StringUtils.isNotBlank(currentEmail.getTopiaId())) { + getContext().getEmailService().lockEmail(currentEmail.getTopiaId(), currentUser); + } } }

1 0

r398 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/content/reply resources/com/franciaflex/faxtomail/ui/swing/content resources/com/franciaflex/faxtomail/ui/swing/content/reply resources/i18n
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 16:17:36 +0200 (Wed, 16 Jul 2014) New Revision: 398 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/398 Log: refs #5447: copier/coller no justu. Bon par contre, ca fonctionne pas, mais imposible de savoir pourquoi Added: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 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/ReplyFormUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-07-16 12:44:35 UTC (rev 397) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-07-16 14:17:36 UTC (rev 398) @@ -39,6 +39,10 @@ public ReplyFormUI(FaxToMailUI parentUI) { FaxToMailUIUtil.setParentUI(this, parentUI); + + // WFT echatellier 20140716 : aucune idée de ce à quoi ca sert, mais sinon ca fonctione pas + model = new ReplyFormUIModel(); + setContextValue(model); } ]]></script> @@ -50,6 +54,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='from' component='fromComboBox'/> <field name='to' component='toField'/> + <field name='subject' component='subjectField'/> <field name='totalAttachmentLength' component="attachmentsPanel"/> </BeanValidator> 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-07-16 12:44:35 UTC (rev 397) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-07-16 14:17:36 UTC (rev 398) @@ -55,7 +55,6 @@ import javax.swing.JTextField; import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -158,6 +157,7 @@ } ui.getFromComboBox().setModel(newComboModel(replyToAddresses.toArray())); + model.setSenderAllowedAddresses(replyToAddresses); } }); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-16 12:44:35 UTC (rev 397) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-16 14:17:36 UTC (rev 398) @@ -24,10 +24,14 @@ * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.google.common.base.Preconditions; -import com.google.common.base.Preconditions; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; @@ -56,6 +60,7 @@ public static final String PROPERTY_TOTAL_ATTACHMENT_LENGTH = "totalAttachmentLength"; public static final String PROPERTY_VALID = "valid"; public static final String PROPERTY_SENDER_ALLOWED_DOMAINS = "senderAllowedDomains"; + public static final String PROPERTY_SENDER_ALLOWED_ADDRESSES = "senderAllowedAddresses"; protected String to; protected String from; @@ -67,6 +72,7 @@ protected boolean valid = true; protected boolean readonly = false; protected List<String> senderAllowedDomains; + protected List<String> senderAllowedAddresses; protected Set<ReplyAttachmentModel> attachments = new HashSet<ReplyAttachmentModel>(); protected Set<ReplyAttachmentModel> availableAttachments = new HashSet<ReplyAttachmentModel>(); @@ -130,7 +136,6 @@ public void addAttachment(ReplyAttachmentModel attachment) { attachments.add(attachment); firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachments()); - setTotalAttachmentLength(totalAttachmentLength + attachment.getLength()); } @@ -201,6 +206,57 @@ firePropertyChange(PROPERTY_VALID, oldValue, valid); } + /** + * Appelée par la validation. + * + * Voir le fichier src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml + * + * @param field field to validate + * @return validity + */ + public boolean isValid(String field) { + boolean result = true; + if (PROPERTY_FROM.equals(field)) { + // si les deux listes liste getSenderAllowedAddresses et getSenderAllowedDomains sont + // toutes les deux vides on ne valide pas + // sinon un des deux autres test doit forcement etre vrai sinon de n'est pas valide + result = getSenderAllowedAddresses().isEmpty() && getSenderAllowedDomains().isEmpty() || isEmailAllowed(getFrom()) || isDomainAllowed(getFrom()); + } + return result; + } + + /** + * Test si un email est present dans une liste (sans tenir compte de la casse). + * + * @param mail email to test + * @return true/false + */ + protected boolean isEmailAllowed(String mail) { + Preconditions.checkNotNull(mail); + for (String address : getSenderAllowedAddresses()) { + if (mail.equalsIgnoreCase(address)) { + return true; + } + } + return false; + } + + /** + * Test si un email se termine par un des domaines autorisés. + * + * @param mail email to test + * @return true/false + */ + protected boolean isDomainAllowed(String mail) { + Preconditions.checkNotNull(mail); + for (String domain : getSenderAllowedDomains()) { + if (mail.endsWith(domain)) { + return true; + } + } + return false; + } + // Do not remove the unused parameter, it is just for the validation // to bind the totalAttachmentLength property public boolean isAttachmentSizeValid(long totalAttachmentLength) { @@ -218,14 +274,13 @@ firePropertyChange(PROPERTY_SENDER_ALLOWED_DOMAINS, oldValue, senderAllowedDomains); } - public boolean isDomainAllowed(String from) { - Preconditions.checkNotNull(from); - for (String domain : getSenderAllowedDomains()) { - if (from.endsWith(domain)) { - return true; - } - } - return getSenderAllowedDomains().isEmpty(); + public void setSenderAllowedAddresses(List<String> senderAllowedAddresses) { + Object oldValue = getSenderAllowedAddresses(); + this.senderAllowedAddresses = senderAllowedAddresses; + firePropertyChange(PROPERTY_SENDER_ALLOWED_ADDRESSES, oldValue, senderAllowedAddresses); } + public List<String> getSenderAllowedAddresses() { + return senderAllowedAddresses; + } } Added: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 2014-07-16 14:17:36 UTC (rev 398) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + +<validators> + + <field name="to"> + <field-validator type="required" short-circuit="true"> + <message>faxtomail.validator.error.reply.to.required</message> + </field-validator> + <field-validator type="email" short-circuit="true"> + <message>faxtomail.validator.error.reply.to.email</message> + </field-validator> + </field> + + <field name="from"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("from") ]]> + </param> + <message>faxtomail.validator.error.reply.from.invalidDomain</message> + </field-validator> + </field> + + <field name="subject"> + <field-validator type="required" short-circuit="true"> + <message>faxtomail.validator.error.reply.subject.required</message> + </field-validator> + </field> + +</validators> Property changes on: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-16 12:44:35 UTC (rev 397) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-16 14:17:36 UTC (rev 398) @@ -273,6 +273,8 @@ faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis faxtomail.validator.error.reply.from.invalidDomain= faxtomail.validator.error.reply.from.required= +faxtomail.validator.error.reply.subject.required= +faxtomail.validator.error.reply.to.email= faxtomail.validator.error.reply.to.required= faxtomail.validator.error.reply.totalAttachmentLength.required= jaxx.application.error.cannot.mail=

1 0

r397 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: echatellier Date: 2014-07-16 14:44:35 +0200 (Wed, 16 Jul 2014) New Revision: 397 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/397 Log: Ajout de traduction manquante Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-07-16 12:26:07 UTC (rev 396) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-16 12:44:35 UTC (rev 397) @@ -263,12 +263,12 @@ faxtomail.searchToGroup.title=Recherche de l'élément avec lequel grouper l'élément %s faxtomail.systemUser=Système faxtomail.validator.error.email.clientCode.required=Code client requis -faxtomail.validator.error.email.comment.required= -faxtomail.validator.error.email.companyReference.required= +faxtomail.validator.error.email.comment.required=Message requis +faxtomail.validator.error.email.companyReference.required=Notre référence requis faxtomail.validator.error.email.demandType.required=Type de demande requis -faxtomail.validator.error.email.etatAttente.required= +faxtomail.validator.error.email.etatAttente.required=État d'attente requis faxtomail.validator.error.email.object.required=Objet requis -faxtomail.validator.error.email.priority.required= +faxtomail.validator.error.email.priority.required=Priorité requise faxtomail.validator.error.email.projectReference.required=Référence chantier requise faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis faxtomail.validator.error.reply.from.invalidDomain=

1 0