commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ep...@apache.org
Subject svn commit: r155282 - in jakarta/commons/proper/email/trunk: ./ src/java/org/apache/commons/mail/ src/test/org/apache/commons/mail/ src/test/org/apache/commons/mail/mocks/
Date Fri, 25 Feb 2005 00:45:16 GMT
Author: epugh
Date: Thu Feb 24 16:45:12 2005
New Revision: 155282

URL: http://svn.apache.org/viewcvs?view=rev&rev=155282
Log:
Checkstyle fixes.  Remove ArrayList in favor of List.

Modified:
    jakarta/commons/proper/email/trunk/project.xml
    jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
    jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailException.java
    jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
    jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/BaseEmailTestCase.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
    jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java

Modified: jakarta/commons/proper/email/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/project.xml?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/project.xml (original)
+++ jakarta/commons/proper/email/trunk/project.xml Thu Feb 24 16:45:12 2005
@@ -3,7 +3,7 @@
     <name>Commons Email</name>
     <groupId>commons-email</groupId>
     <artifactId>commons-email</artifactId>
-    <currentVersion>1.0-rc2</currentVersion>
+    <currentVersion>1.0-rc3</currentVersion>
     <organization/>
     <inceptionYear>2001</inceptionYear>
     <package>org.apache.commons.mail</package>

Modified: jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java (original)
+++ jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Thu Feb
24 16:45:12 2005
@@ -20,6 +20,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Properties;
 
 import javax.mail.Authenticator;
@@ -49,8 +50,8 @@
  * @author <a href="mailto:colin.chalmers@maxware.nl">Colin Chalmers</a>
  * @author <a href="mailto:matthias@wessendorf.net">Matthias Wessendorf</a>
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Revision: 1.6 $ $Date: 2005/01/26 15:49:42 $
- * @version $Id: Email.java,v 1.6 2005/01/26 15:49:42 dims Exp $
+ * @version $Revision: 1.6 $ $Date$
+ * @version $Id$
  */
 public abstract class Email
 {
@@ -151,16 +152,16 @@
     protected String smtpPort = "25";
 
     /** List of "to" email adresses */
-    protected ArrayList toList = new ArrayList();
+    protected List toList = new ArrayList();
 
     /** List of "cc" email adresses */
-    protected ArrayList ccList = new ArrayList();
+    protected List ccList = new ArrayList();
 
     /** List of "bcc" email adresses */
-    protected ArrayList bccList = new ArrayList();
+    protected List bccList = new ArrayList();
 
     /** List of "replyTo" email adresses */
-    protected ArrayList replyList = new ArrayList();
+    protected List replyList = new ArrayList();
 
     /** 
      * Address to which undeliverable mail should be sent. 
@@ -380,17 +381,14 @@
     
     /**
     * Creates a InternetAddress
-    * @param name
-    * @param email
+    * @param email An Email
+    * @param name A Name.  
     * @return An internet address
-    * @throws EmailException
+    * @throws EmailException thrown when the address supplied or name were invalid
     */
-    private InternetAddress createInternetAddress(String email,String name) 
+    private InternetAddress createInternetAddress(String email, String name) 
         throws EmailException
     {
-
-
-        
         InternetAddress address = null;
         
         try 
@@ -403,7 +401,7 @@
             
             if (StringUtils.isNotEmpty(this.charset))
             {
-                address = new InternetAddress(email, name,this.charset);
+                address = new InternetAddress(email, name, this.charset);
             }
             else
             {
@@ -425,7 +423,7 @@
      *
      * @param email A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email setFrom(String email) 
         throws EmailException 
@@ -439,12 +437,12 @@
      * @param email A String.
      * @param name A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email setFrom(String email, String name) 
         throws EmailException
     {
-        this.fromAddress = createInternetAddress(email,name);
+        this.fromAddress = createInternetAddress(email, name);
 
         return this;
     }
@@ -454,7 +452,7 @@
      *
      * @param email A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email addTo(String email) 
         throws EmailException
@@ -468,13 +466,12 @@
      * @param email A String.
      * @param name A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email addTo(String email, String name) 
         throws EmailException
     {
-
-        this.toList.add(createInternetAddress(email,name));
+        this.toList.add(createInternetAddress(email, name));
 
         return this;
     }
@@ -484,7 +481,7 @@
      *
      * @param   aCollection collection of InternetAddress objects
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email setTo(Collection aCollection) throws EmailException
     {
@@ -502,7 +499,7 @@
      *
      * @param email A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email addCc(String email) 
         throws EmailException
@@ -516,13 +513,12 @@
      * @param email A String.
      * @param name A String.
      * @return An Email.
-     * @throws AddressException Indicates an invalid email address
+     * @throws EmailException Indicates an invalid email address
      */
     public Email addCc(String email, String name) 
         throws EmailException
     {
-        
-        this.ccList.add(createInternetAddress(email,name));
+        this.ccList.add(createInternetAddress(email, name));
 
         return this;
     }
@@ -531,7 +527,7 @@
      * Set a list of "CC" addresses
      *
      * @param   aCollection collection of InternetAddress objects
-     * @return An AddressException.
+     * @return An EmailException.
      * @throws EmailException Indicates an invalid email address
      */
     public Email setCc(Collection aCollection) throws EmailException
@@ -720,7 +716,8 @@
      */
     public void send() throws EmailException
     {
-        try {
+        try 
+        {
             this.getMailSession();
             this.message = new MimeMessage(this.session);
     
@@ -820,7 +817,8 @@
     
             Transport.send(this.message);
         }
-        catch (MessagingException me) {
+        catch (MessagingException me)
+        {
             throw new EmailException(me);
         }    
     }
@@ -854,13 +852,13 @@
     }
 
     /**
-     * Utility to copy ArrayList of known InternetAddress objects into an
+     * Utility to copy List of known InternetAddress objects into an
      * array.
      *
-     * @param aList A ArrayList.
+     * @param aList A List of InternetAddress.
      * @return An InternetAddress[].
      */
-    protected InternetAddress[] toInternetAddressArray(ArrayList aList)
+    protected InternetAddress[] toInternetAddressArray(List aList)
     {
         InternetAddress[] ia =
             (InternetAddress[]) aList.toArray(new InternetAddress[0]);

Modified: jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailException.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailException.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailException.java
(original)
+++ jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailException.java
Thu Feb 24 16:45:12 2005
@@ -17,23 +17,41 @@
 
 import org.apache.commons.lang.exception.NestableException;
 
+/**
+ * EmailException
+ * @author jakarta-commons
+ */
 public class EmailException extends NestableException 
 {
+    /** */
     public EmailException()
     {
         super();
     }
     
+    /**
+     * 
+     * @param msg msg
+     */
     public EmailException(String msg)
     {
         super(msg);
     }
     
-    public EmailException(String msg,Throwable cause)
+    /**
+     * 
+     * @param msg msg
+     * @param cause cause
+     */
+    public EmailException(String msg, Throwable cause)
     {
-        super(msg,cause);
+        super(msg, cause);
     }
     
+    /**
+     * 
+     * @param cause cause
+     */
     public EmailException(Throwable cause)
     {
         super(cause);

Modified: jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java (original)
+++ jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java Thu
Feb 24 16:45:12 2005
@@ -53,7 +53,7 @@
  *
  * @author <a href="mailto:unknown">Regis Koenig</a>
  * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
- * @version $Id: HtmlEmail.java,v 1.2 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 public class HtmlEmail extends MultiPartEmail
 {
@@ -77,7 +77,7 @@
      *
      * @param aText A String.
      * @return An HtmlEmail.
-     * @throws MessagingException see javax.mail.internet.MimeBodyPart
+     * @throws EmailException see javax.mail.internet.MimeBodyPart
      *  for defintions
      */
     public HtmlEmail setTextMsg(String aText) throws EmailException
@@ -96,7 +96,7 @@
      *
      * @param aHtml A String.
      * @return An HtmlEmail.
-     * @throws MessagingException see javax.mail.internet.MimeBodyPart
+     * @throws EmailException see javax.mail.internet.MimeBodyPart
      *  for defintions
      */
     public HtmlEmail setHtmlMsg(String aHtml) throws EmailException
@@ -121,7 +121,7 @@
      *
      * @param msg A String.
      * @return An Email.
-     * @throws MessagingException see javax.mail.internet.MimeBodyPart
+     * @throws EmailException see javax.mail.internet.MimeBodyPart
      *  for defintions
      */
     public Email setMsg(String msg) throws EmailException
@@ -164,7 +164,7 @@
      * @param name The name that will be set in the filename header
      * field.
      * @return A String with the Content-ID of the file.
-     * @throws MessagingException when URL suplpied is invalid
+     * @throws EmailException when URL suplpied is invalid
      *  also see javax.mail.internet.MimeBodyPart for defintions
      */
     public String embed(URL url, String name) throws EmailException
@@ -182,7 +182,8 @@
 
         MimeBodyPart mbp = new MimeBodyPart();
 
-        try {
+        try
+        {
             mbp.setDataHandler(new DataHandler(new URLDataSource(url)));
             mbp.setFileName(name);
             mbp.setDisposition("inline");
@@ -191,7 +192,8 @@
             this.inlineImages.add(mbp);
             return cid;            
         } 
-        catch (MessagingException me) {
+        catch (MessagingException me)
+        {
             throw new EmailException(me);
         }
         
@@ -200,11 +202,12 @@
     /**
      * Does the work of actually sending the email.
      *
-     * @exception MessagingException if there was an error.
+     * @exception EmailException if there was an error.
      */
     public void send() throws EmailException
     {
-        try {
+        try
+        {
             // if the email has attachments then the base type is mixed, 
             // otherwise it should be related
             if (this.isBoolHasAttachments())
@@ -217,13 +220,15 @@
             }
 
         }
-        catch (MessagingException me){
+        catch (MessagingException me)
+        {
             throw new EmailException(me);
         }
         super.send();
     }
 
     /**
+     * @throws EmailException EmailException
      * @throws MessagingException MessagingException
      */
     private void buildAttachments() throws MessagingException, EmailException
@@ -296,6 +301,7 @@
     }
 
     /**
+     * @throws EmailException EmailException
      * @throws MessagingException MessagingException
      */
     private void buildNoAttachments() throws MessagingException, EmailException

Modified: jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
(original)
+++ jakarta/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
Thu Feb 24 16:45:12 2005
@@ -44,7 +44,7 @@
  * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
  * @author <a href="mailto:unknown">Regis Koenig</a>
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MultiPartEmail.java,v 1.2 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 public class MultiPartEmail extends Email
 {
@@ -93,11 +93,13 @@
         throws EmailException
     {
         MimeBodyPart bodyPart = new MimeBodyPart();
-        try {
+        try
+        {
             bodyPart.setContent(content, contentType);
             getContainer().addBodyPart(bodyPart);
         }
-        catch (MessagingException me){
+        catch (MessagingException me)
+        {
             throw new EmailException(me);
         }
 

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/BaseEmailTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/BaseEmailTestCase.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/BaseEmailTestCase.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/BaseEmailTestCase.java
Thu Feb 24 16:45:12 2005
@@ -18,9 +18,9 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 
 import javax.mail.Multipart;
 import javax.mail.internet.InternetAddress;
@@ -37,7 +37,7 @@
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
  * @author <a href="mailto:epugh@opensourceconnections.com">Eric Pugh</a>
- * @version $Id: BaseEmailTestCase.java,v 1.1 2004/11/25 11:14:53 epugh Exp $
+ * @version $Id$
  */
 
 public class BaseEmailTestCase extends TestCase
@@ -187,9 +187,9 @@
      * @param mailServer reference to the fake mail server
      * @param strSubject expected subject
      * @param fromAdd expected from address
-     * @param toAdd arraylist of expected to addresses
-     * @param ccAdd arraylist of expected cc addresses
-     * @param bccAdd arraylist of expected bcc addresses
+     * @param toAdd list of expected to addresses
+     * @param ccAdd list of expected cc addresses
+     * @param bccAdd list of expected bcc addresses
      * @param boolSaveToFile true will output to file, false doesnt
      * @return SmtpMessage email to check
      * @throws IOException Exception
@@ -198,9 +198,9 @@
         SimpleSmtpServer mailServer,
         String strSubject,
         InternetAddress fromAdd,
-        ArrayList toAdd,
-        ArrayList ccAdd,
-        ArrayList bccAdd,
+        List toAdd,
+        List ccAdd,
+        List bccAdd,
         boolean boolSaveToFile)
         throws IOException
     {
@@ -248,9 +248,9 @@
      * @param strSubject expected subject
      * @param content the expected message content
      * @param fromAdd expected from address
-     * @param toAdd arraylist of expected to addresses
-     * @param ccAdd arraylist of expected cc addresses
-     * @param bccAdd arraylist of expected bcc addresses
+     * @param toAdd list of expected to addresses
+     * @param ccAdd list of expected cc addresses
+     * @param bccAdd list of expected bcc addresses
      * @param boolSaveToFile true will output to file, false doesnt
      * @throws IOException Exception
      */
@@ -259,9 +259,9 @@
         String strSubject,
         Multipart content,
         InternetAddress fromAdd,
-        ArrayList toAdd,
-        ArrayList ccAdd,
-        ArrayList bccAdd,
+        List toAdd,
+        List ccAdd,
+        List bccAdd,
         boolean boolSaveToFile)
         throws IOException
     {
@@ -296,9 +296,9 @@
      * @param strSubject expected subject
      * @param strMessage the expected message as a string
      * @param fromAdd expected from address
-     * @param toAdd arraylist of expected to addresses
-     * @param ccAdd arraylist of expected cc addresses
-     * @param bccAdd arraylist of expected bcc addresses
+     * @param toAdd list of expected to addresses
+     * @param ccAdd list of expected cc addresses
+     * @param bccAdd list of expected bcc addresses
      * @param boolSaveToFile true will output to file, false doesnt
      * @throws IOException Exception
      */
@@ -307,9 +307,9 @@
         String strSubject,
         String strMessage,
         InternetAddress fromAdd,
-        ArrayList toAdd,
-        ArrayList ccAdd,
-        ArrayList bccAdd,
+        List toAdd,
+        List ccAdd,
+        List bccAdd,
         boolean boolSaveToFile)
         throws IOException
     {

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java (original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java Thu
Feb 24 16:45:12 2005
@@ -35,7 +35,7 @@
  * JUnit test case for Email Class
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: EmailTest.java,v 1.2 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 
 public class EmailTest extends BaseEmailTestCase
@@ -78,7 +78,10 @@
         }
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testGetSetSession() throws Exception
     {
 
@@ -275,7 +278,10 @@
 
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testSetFrom() throws Exception
     {
         // ====================================================================
@@ -312,7 +318,10 @@
         }
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testSetFromWithEnconding() throws Exception
     {
         // ====================================================================
@@ -332,7 +341,10 @@
 
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testSetFrom2() throws Exception
     {
         // ====================================================================

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Thu Feb 24 16:45:12 2005
@@ -26,7 +26,7 @@
  * JUnit test case for HtmlEmail Class
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: HtmlEmailTest.java,v 1.3 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 
 public class HtmlEmailTest extends BaseEmailTestCase
@@ -176,7 +176,10 @@
 
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testEmbed() throws Exception
     {
         // ====================================================================
@@ -345,7 +348,10 @@
         }
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testSend2() throws Exception
     {
         // ====================================================================

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Thu Feb 24 16:45:12 2005
@@ -31,7 +31,7 @@
  * JUnit test case for MultiPartEmail Class
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MultiPartEmailTest.java,v 1.3 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 
 public class MultiPartEmailTest extends BaseEmailTestCase
@@ -433,7 +433,10 @@
         }
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testAddPart() throws Exception
     {
 
@@ -460,7 +463,10 @@
    
     }
 
-    /** */
+    /**
+     * 
+     * @throws Exception Exception
+     */
     public void testAddPart2() throws Exception
     {
 

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
Thu Feb 24 16:45:12 2005
@@ -15,11 +15,10 @@
  */
 package org.apache.commons.mail.mocks;
 
-import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
 
 import javax.mail.Authenticator;
-import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
@@ -34,7 +33,7 @@
  * getters for methods that normally only have setters.
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MockEmailConcrete.java,v 1.2 2004/11/29 17:33:12 epugh Exp $
+ * @version $Id$
  */
 public class MockEmailConcrete extends Email
 {
@@ -43,7 +42,7 @@
      * Not Implemented, should be implemented in subclasses of Email
      * @param msg The email message
      * @return Email msg.
-     * @throws MessagingException MessagingException
+     * @throws EmailException EmailException
      */
     public Email setMsg(String msg) throws EmailException
     {
@@ -73,7 +72,7 @@
     /**
      * @return bccList
      */
-    public ArrayList getBccList()
+    public List getBccList()
     {
         return this.bccList;
     }
@@ -81,7 +80,7 @@
     /**
      * @return ccList
      */
-    public ArrayList getCcList()
+    public List getCcList()
     {
         return this.ccList;
     }
@@ -177,7 +176,7 @@
     /**
      * @return replyList
      */
-    public ArrayList getReplyList()
+    public List getReplyList()
     {
         return this.replyList;
     }
@@ -201,7 +200,7 @@
     /**
      * @return toList
      */
-    public ArrayList getToList()
+    public List getToList()
     {
         return this.toList;
     }

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
Thu Feb 24 16:45:12 2005
@@ -16,7 +16,6 @@
 package org.apache.commons.mail.mocks;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.mail.MessagingException;
@@ -29,7 +28,7 @@
  * (used to allow testing only)
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MockHtmlEmailConcrete.java,v 1.1 2004/11/25 11:14:53 epugh Exp $
+ * @version $Id$
  */
 public class MockHtmlEmailConcrete extends HtmlEmail
 {
@@ -90,7 +89,7 @@
     /**
      * @return toList
      */
-    public ArrayList getToList()
+    public List getToList()
     {
         return this.toList;
     }
@@ -98,7 +97,7 @@
     /**
      * @return bccList
      */
-    public ArrayList getBccList()
+    public List getBccList()
     {
         return this.bccList;
     }
@@ -106,7 +105,7 @@
     /**
      * @return ccList
      */
-    public ArrayList getCcList()
+    public List getCcList()
     {
         return this.ccList;
     }

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
Thu Feb 24 16:45:12 2005
@@ -16,7 +16,7 @@
 package org.apache.commons.mail.mocks;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.List;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.InternetAddress;
@@ -28,7 +28,7 @@
  * (used to allow testing only)
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MockMultiPartEmailConcrete.java,v 1.1 2004/11/25 11:14:53 epugh Exp $
+ * @version $Id$
  */
 public class MockMultiPartEmailConcrete extends MultiPartEmail
 {
@@ -72,7 +72,7 @@
     /**
      * @return toList
      */
-    public ArrayList getToList()
+    public List getToList()
     {
         return this.toList;
     }
@@ -80,7 +80,7 @@
     /**
      * @return bccList
      */
-    public ArrayList getBccList()
+    public List getBccList()
     {
         return this.bccList;
     }
@@ -88,7 +88,7 @@
     /**
      * @return ccList
      */
-    public ArrayList getCcList()
+    public List getCcList()
     {
         return this.ccList;
     }

Modified: jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java?view=diff&r1=155281&r2=155282
==============================================================================
--- jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
(original)
+++ jakarta/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
Thu Feb 24 16:45:12 2005
@@ -15,7 +15,7 @@
  */
 package org.apache.commons.mail.mocks;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import javax.mail.internet.InternetAddress;
 
@@ -26,7 +26,7 @@
  * (used to allow testing only)
  *
  * @author <a href="mailto:corey.scott@gmail.com">Corey Scott</a>
- * @version $Id: MockSimpleEmail.java,v 1.1 2004/11/25 11:14:53 epugh Exp $
+ * @version $Id$
  */
 public class MockSimpleEmail extends SimpleEmail
 {
@@ -50,7 +50,7 @@
     /**
      * @return toList
      */
-    public ArrayList getToList()
+    public List getToList()
     {
         return this.toList;
     }
@@ -58,7 +58,7 @@
     /**
      * @return bccList
      */
-    public ArrayList getBccList()
+    public List getBccList()
     {
         return this.bccList;
     }
@@ -66,7 +66,7 @@
     /**
      * @return ccList
      */
-    public ArrayList getCcList()
+    public List getCcList()
     {
         return this.ccList;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message