[jbpm-commits] JBoss JBPM SVN: r4433 - in jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email: resolver and 1 other directories.

Author: bradsdavis Date: 2009-04-03 15:47:50 -0400 (Fri, 03 Apr 2009) New Revision: 4433 Added: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java Log: Removed @Override for methods implementing interfaces. This is reserved for Java 6. Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java =================================================================== --- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java 2009-04-03 19:30:09 UTC (rev 4432) +++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java 2009-04-03 19:47:50 UTC (rev 4433) @@ -15,7 +15,6 @@ public class SimpleMailProducer implements MailProducer { - @Override public Collection<Email> produce(final Environment env, final MailContext mailContext) throws Exception { //Create a simple email with the body set. Email email = new SimpleEmail(); @@ -57,7 +56,7 @@ for(User user : mailContext.getActors()) { InternetAddress address = resolver.resolveUserAddress(user); - email.addTo(address.getAddress(), user.getFamilyName()+", "+user.getGivenName()); + email.addTo(address.getAddress(), this.constructName(user)); } for(Group group : mailContext.getGroups()) { @@ -68,5 +67,27 @@ } } } + + protected String constructName(User user) + { + String name = null; + if(user.getGivenName()!=null&&!user.getGivenName().isEmpty()) + { + name = user.getGivenName(); + } + if(user.getFamilyName()!=null&&!user.getFamilyName().isEmpty()) + { + if(name==null) + { + name = user.getFamilyName(); + } + else + { + name += " "+user.getFamilyName(); + } + } + + return name; + } } Added: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java =================================================================== --- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java (rev 0) +++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-03 19:47:50 UTC (rev 4433) @@ -0,0 +1,26 @@ +package org.jbpm.pvm.internal.email.resolver; + +import java.util.Collection; +import java.util.HashSet; + +import javax.mail.internet.InternetAddress; + +import org.jbpm.identity.Group; +import org.jbpm.identity.User; + +public class IdentityAddressResolver implements AddressResolver { + + public Collection<InternetAddress> resolveGroupAddresses(Group group) { + Collection<InternetAddress> addresses = new HashSet<InternetAddress>(); + + //Could be a group address... otherwise look up all users. + + return addresses; + } + + public InternetAddress resolveUserAddress(User user) { + // TODO Auto-generated method stub + return null; + } + +} Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java =================================================================== --- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:30:09 UTC (rev 4432) +++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:47:50 UTC (rev 4433) @@ -21,7 +21,6 @@ Collection<MailServerConfiguration> serverConfigs; - @Override public void send(Collection<Email> emails) { //Emails need to have the sessions populated.