[jbpm-commits] JBoss JBPM SVN: r4413 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter.

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-03 11:30:53 -0400 (Fri, 03 Apr 2009)
New Revision: 4413

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Updated to remove repetitive code.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java	2009-04-03 15:07:44 UTC (rev 4412)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java	2009-04-03 15:30:53 UTC (rev 4413)
@@ -6,12 +6,10 @@
 
 public interface AddressFilter {
 	/**
-	 * This method should remove addresses from to, cc, and bcc based on the filter implementation.
+	 * This method should remove addresses based on the filter implementation.
 	 * 
-	 * @param to To addresses for the email.
-	 * @param cc CC addresses for the email.
-	 * @param bcc BCC addresses for the email.
+	 * @param addresses Email Addresses to filter.
 	 */
-	public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc);
+	public void filter(Collection<InternetAddress> addresses);
 
 }

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java	2009-04-03 15:07:44 UTC (rev 4412)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java	2009-04-03 15:30:53 UTC (rev 4413)
@@ -17,49 +17,21 @@
 	private Collection<String> includePatterns;
 	private Collection<String> excludePatterns;
 	
-	public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc)
+	public void filter(Collection<InternetAddress> addresses)
 	{
 		Collection<InternetAddress> toRemove = new HashSet<InternetAddress>();
-		if(to!=null)
+		if(addresses!=null)
 		{
 			//Loop over for addresses to remove.
-			for(InternetAddress address : to)
+			for(InternetAddress address : addresses)
 			{
 				if(!keepAddress(address))
 				{
 					toRemove.add(address);
 				}
 			}
+			addresses.removeAll(toRemove);
 		}
-		
-		if(cc!=null)
-		{
-			//Loop over for addresses to remove.
-			for(InternetAddress address : cc)
-			{
-				if(!keepAddress(address))
-				{
-					toRemove.add(address);
-				}
-			}
-		}
-		
-		if(bcc!=null)
-		{
-			//Loop over for addresses to remove.
-			for(InternetAddress address : bcc)
-			{
-				if(!keepAddress(address))
-				{
-					toRemove.add(address);
-				}
-			}
-		}
-		
-		//Now remove all collected excludes.
-		if(to!=null)to.removeAll(toRemove);
-		if(cc!=null)cc.removeAll(toRemove);
-		if(bcc!=null)bcc.removeAll(toRemove);
 	}
 	
 	/***