Merge branch 'progress' into develop

api/src/main/java/org/jboss/seam/mail/core/EmailContact.java

@@ -17,7 +17,13 @@
 
 package org.jboss.seam.mail.core;
 
+/**
+ * 
+ * @author Cody Lerum
+ * 
+ */
 public interface EmailContact {
+
     public String getName();
 
     public String getAddress();

api/src/main/java/org/jboss/seam/mail/core/EmailMessage.java

@@ -19,7 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.List;
 
 import javax.mail.internet.InternetAddress;
 
@@ -38,21 +38,21 @@ public class EmailMessage {
     private EmailMessageType type = EmailMessageType.STANDARD;
     private String messageId;
     private String lastMessageId;
-    private Collection<InternetAddress> fromAddresses = new HashSet<InternetAddress>();
-    private Collection<InternetAddress> replyToAddresses = new HashSet<InternetAddress>();
-    private Collection<InternetAddress> toAddresses = new HashSet<InternetAddress>();
-    private Collection<InternetAddress> ccAddresses = new HashSet<InternetAddress>();
-    private Collection<InternetAddress> bccAddresses = new HashSet<InternetAddress>();
-    private Collection<Header> headers = new ArrayList<Header>();
+    private List<InternetAddress> fromAddresses = new ArrayList<InternetAddress>();
+    private List<InternetAddress> replyToAddresses = new ArrayList<InternetAddress>();
+    private List<InternetAddress> toAddresses = new ArrayList<InternetAddress>();
+    private List<InternetAddress> ccAddresses = new ArrayList<InternetAddress>();
+    private List<InternetAddress> bccAddresses = new ArrayList<InternetAddress>();
+    private List<Header> headers = new ArrayList<Header>();
 
     private String subject;
     private String textBody;
     private String htmlBody;
 
-    private Collection<EmailAttachment> attachments = new ArrayList<EmailAttachment>();
+    private List<EmailAttachment> attachments = new ArrayList<EmailAttachment>();
 
-    private Collection<InternetAddress> deliveryReceiptAddresses = new HashSet<InternetAddress>();
-    private Collection<InternetAddress> readReceiptAddresses = new HashSet<InternetAddress>();
+    private List<InternetAddress> deliveryReceiptAddresses = new ArrayList<InternetAddress>();
+    private List<InternetAddress> readReceiptAddresses = new ArrayList<InternetAddress>();
 
     private MessagePriority importance = MessagePriority.NORMAL;
 
@@ -133,9 +133,13 @@ public void setLastMessageId(String lastMessageId) {
      *
      * @return Collection of InternetAddresses addresses
      */
-    public Collection<InternetAddress> getFromAddresses() {
+    public List<InternetAddress> getFromAddresses() {
         return fromAddresses;
     }
+
+    public void setFromAddresses(List<InternetAddress> fromAddresses) {
+        this.fromAddresses = fromAddresses;
+    }
 
     /**
      * Adds a single InternetAddress to the FROM addresses on the EmailMessage
@@ -161,9 +165,13 @@ public void addFromAddresses(Collection<InternetAddress> fromAddresses) {
      *
      * @return Collection of InternetAddresses addresses
      */
-    public Collection<InternetAddress> getReplyToAddresses() {
+    public List<InternetAddress> getReplyToAddresses() {
         return replyToAddresses;
     }
+
+    public void setReplyToAddresses(List<InternetAddress> replyToAddresses) {
+        this.replyToAddresses = replyToAddresses;
+    }
 
     /**
      * Adds a single InternetAddress to the REPLY-TO addresses on the
@@ -189,7 +197,7 @@ public void addReplyToAddresses(Collection<InternetAddress> replyToAddresses) {
      *
      * @return Collection of InternetAddresses addresses
      */
-    public Collection<InternetAddress> getToAddresses() {
+    public List<InternetAddress> getToAddresses() {
         return toAddresses;
     }
 
@@ -210,6 +218,10 @@ public void addToAddress(InternetAddress toAddress) {
     public void addToAddresses(Collection<InternetAddress> toAddresses) {
         this.toAddresses.addAll(toAddresses);
     }
+
+    public void setToAddresses(List<InternetAddress> toAddresses) {
+        this.toAddresses = toAddresses;
+    }
 
     /**
      * Remove an InternetAddress from the TO addressses
@@ -226,9 +238,13 @@ public boolean removeToAddress(InternetAddress toAddress) {
      *
      * @return Collection of InternetAddresses addresses
      */
-    public Collection<InternetAddress> getCcAddresses() {
+    public List<InternetAddress> getCcAddresses() {
         return ccAddresses;
     }
+
+    public void setCcAddresses(List<InternetAddress> ccAddresses) {
+        this.ccAddresses = ccAddresses;
+    }
 
     /**
      * Adds a single InternetAddress to the CC addresses on the EmailMessage
@@ -263,9 +279,13 @@ public boolean removeCcAddress(InternetAddress ccAddress) {
      *
      * @return Collection of InternetAddresses addresses
      */
-    public Collection<InternetAddress> getBccAddresses() {
+    public List<InternetAddress> getBccAddresses() {
         return bccAddresses;
     }
+
+    public void setBccAddresses(List<InternetAddress> bccAddresses) {
+        this.bccAddresses = bccAddresses;
+    }
 
     /**
      * Adds a single InternetAddress to the BCC addresses on the EmailMessage
@@ -300,9 +320,13 @@ public boolean removeBccAddress(InternetAddress bccAddress) {
      *
      * @return Collection of Header
      */
-    public Collection<Header> getHeaders() {
+    public List<Header> getHeaders() {
         return headers;
     }
+
+    public void setHeaders(List<Header> headers) {
+        this.headers = headers;
+    }
 
     /**
      * Add a single Header to the EmailMessage
@@ -381,9 +405,13 @@ public void setHtmlBody(String htmlBody) {
      *
      * @return Collection of InternetAddress
      */
-    public Collection<InternetAddress> getDeliveryReceiptAddresses() {
+    public List<InternetAddress> getDeliveryReceiptAddresses() {
         return deliveryReceiptAddresses;
     }
+
+    public void setDeliveryReceiptAddresses(List<InternetAddress> deliveryReceiptAddresses) {
+        this.deliveryReceiptAddresses = deliveryReceiptAddresses;
+    }
 
     /**
      * Adds a InternetAddress as a Delivery Receipt address
@@ -408,9 +436,13 @@ public void addDeliveryReceiptAddresses(Collection<InternetAddress> deliveryRece
      *
      * @return Collection of InternetAddress
      */
-    public Collection<InternetAddress> getReadReceiptAddresses() {
+    public List<InternetAddress> getReadReceiptAddresses() {
         return readReceiptAddresses;
     }
+
+    public void setReadReceiptAddresses(List<InternetAddress> readReceiptAddresses) {
+        this.readReceiptAddresses = readReceiptAddresses;
+    }
 
     /**
      * Adds a InternetAddress as a Read Receipt address
@@ -474,7 +506,11 @@ public void addAttachments(Collection<? extends EmailAttachment> attachments) {
      *
      * @return Collection of EmailAttachment
      */
-    public Collection<EmailAttachment> getAttachments() {
+    public List<EmailAttachment> getAttachments() {
         return attachments;
     }
+
+    public void setAttachments(List<EmailAttachment> attachments) {
+        this.attachments = attachments;
+    }    
 }

api/src/main/java/org/jboss/seam/mail/core/Header.java

@@ -56,4 +56,16 @@ public String getValue() {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public boolean equals(Object o) {
+
+        Header h = (Header) o;
+
+        return name.equals(h.getName()) || value.equals(h.getValue());
+    }
+
+    public int hashCode() {
+        return name.hashCode() + value.hashCode();
+    }
+
 }