Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4EACBE12C for ; Tue, 4 Dec 2012 18:36:47 +0000 (UTC) Received: (qmail 5218 invoked by uid 500); 4 Dec 2012 18:36:47 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 5143 invoked by uid 500); 4 Dec 2012 18:36:47 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 5135 invoked by uid 99); 4 Dec 2012 18:36:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 18:36:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 18:36:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0920423889BF; Tue, 4 Dec 2012 18:36:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417101 - in /commons/proper/email/trunk/src: main/java/org/apache/commons/mail/ test/java/org/apache/commons/mail/ test/java/org/apache/commons/mail/mocks/ Date: Tue, 04 Dec 2012 18:36:20 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121204183625.0920423889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Tue Dec 4 18:36:16 2012 New Revision: 1417101 URL: http://svn.apache.org/viewvc?rev=1417101&view=rev Log: Add missing @Override tags Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailException.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/SimpleEmail.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidAddressTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java Tue Dec 4 18:36:16 2012 @@ -52,6 +52,7 @@ public class DefaultAuthenticator extend * login information. * @since 1.0 */ + @Override protected PasswordAuthentication getPasswordAuthentication() { return this.authentication; Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailException.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailException.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailException.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailException.java Tue Dec 4 18:36:16 2012 @@ -86,6 +86,7 @@ public class EmailException /** * Prints the stack trace of this exception to the standard error stream. */ + @Override public void printStackTrace() { printStackTrace(System.err); @@ -96,6 +97,7 @@ public class EmailException * * @param out the PrintStream to use for output */ + @Override public void printStackTrace(PrintStream out) { synchronized (out) @@ -113,6 +115,7 @@ public class EmailException * * @param out the PrintWriter to use for output */ + @Override public void printStackTrace(PrintWriter out) { synchronized (out) Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java Tue Dec 4 18:36:16 2012 @@ -171,6 +171,7 @@ public class HtmlEmail extends MultiPart * see javax.mail.internet.MimeBodyPart for definitions * @since 1.0 */ + @Override public Email setMsg(String msg) throws EmailException { if (EmailUtils.isEmpty(msg)) @@ -504,6 +505,7 @@ public class HtmlEmail extends MultiPart * @exception EmailException if there was an error. * @since 1.0 */ + @Override public void buildMimeMessage() throws EmailException { try @@ -671,6 +673,7 @@ public class HtmlEmail extends MultiPart * {@inheritDoc} * @return true if the other object is also an InlineImage with the same cid. */ + @Override public boolean equals(Object obj) { if (this == obj) @@ -691,6 +694,7 @@ public class HtmlEmail extends MultiPart * {@inheritDoc} * @return the cid hashCode. */ + @Override public int hashCode() { return cid.hashCode(); Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java Tue Dec 4 18:36:16 2012 @@ -91,6 +91,7 @@ public class ImageHtmlEmail extends Html * @see org.apache.commons.mail.HtmlEmail#buildMimeMessage() * @throws EmailException building the MimeMessage failed */ + @Override public void buildMimeMessage() throws EmailException { try Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java Tue Dec 4 18:36:16 2012 @@ -188,6 +188,7 @@ public class MultiPartEmail extends Emai * for definitions * @since 1.0 */ + @Override public Email setMsg(String msg) throws EmailException { // throw exception on null message @@ -224,6 +225,7 @@ public class MultiPartEmail extends Emai * @exception EmailException if there was an error. * @since 1.0 */ + @Override public void buildMimeMessage() throws EmailException { try Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/SimpleEmail.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/SimpleEmail.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/SimpleEmail.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/SimpleEmail.java Tue Dec 4 18:36:16 2012 @@ -40,6 +40,7 @@ public class SimpleEmail extends Email * for definitions * @since 1.0 */ + @Override public Email setMsg(String msg) throws EmailException { if (EmailUtils.isEmpty(msg)) Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java Tue Dec 4 18:36:16 2012 @@ -116,6 +116,7 @@ public abstract class BaseEmailTestCase } /** */ + @Override protected void tearDown() { //stop the fake email server (if started) Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java Tue Dec 4 18:36:16 2012 @@ -42,6 +42,7 @@ public class EmailAttachmentTest extends /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java Tue Dec 4 18:36:16 2012 @@ -52,6 +52,7 @@ public class EmailLiveTest extends BaseE /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java Tue Dec 4 18:36:16 2012 @@ -66,6 +66,7 @@ public class EmailTest extends BaseEmail /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java Tue Dec 4 18:36:16 2012 @@ -49,6 +49,7 @@ public class HtmlEmailTest extends BaseE super(name); } + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java Tue Dec 4 18:36:16 2012 @@ -51,6 +51,7 @@ public class ImageHtmlEmailTest extends super(name); } + @Override protected void setUp() throws Exception { super.setUp(); // reusable objects to be used across multiple tests Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidAddressTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidAddressTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidAddressTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidAddressTest.java Tue Dec 4 18:36:16 2012 @@ -75,6 +75,7 @@ public class InvalidAddressTest extends /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java Tue Dec 4 18:36:16 2012 @@ -82,6 +82,7 @@ public class InvalidInternetAddressTest * Setup for a test * @throws Exception on any error */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java Tue Dec 4 18:36:16 2012 @@ -54,6 +54,7 @@ public class MultiPartEmailTest extends /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java Tue Dec 4 18:36:16 2012 @@ -46,6 +46,7 @@ public class SendWithAttachmentsTest ext /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java Tue Dec 4 18:36:16 2012 @@ -41,6 +41,7 @@ public class SimpleEmailTest extends Bas /** * @throws Exception */ + @Override protected void setUp() throws Exception { super.setUp(); Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java Tue Dec 4 18:36:16 2012 @@ -44,6 +44,7 @@ public class MockEmailConcrete extends E * @param msg The email message * @return Email msg. */ + @Override public Email setMsg(String msg) { // This abstract method should be tested in the concrete @@ -104,6 +105,7 @@ public class MockEmailConcrete extends E /** * @return fromAddress */ + @Override public InternetAddress getFromAddress() { return this.fromAddress; @@ -120,6 +122,7 @@ public class MockEmailConcrete extends E /** * @return hostName */ + @Override public String getHostName() { return this.hostName; @@ -160,6 +163,7 @@ public class MockEmailConcrete extends E /** * @return smtpPort */ + @Override public String getSmtpPort() { return this.smtpPort; @@ -168,6 +172,7 @@ public class MockEmailConcrete extends E /** * @return subject */ + @Override public String getSubject() { return this.subject; Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java Tue Dec 4 18:36:16 2012 @@ -92,6 +92,7 @@ public class MockHtmlEmailConcrete exten /** * @return fromAddress */ + @Override public InternetAddress getFromAddress() { return this.fromAddress; Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java Tue Dec 4 18:36:16 2012 @@ -64,6 +64,7 @@ public class MockMultiPartEmailConcrete /** * @return fromAddress */ + @Override public InternetAddress getFromAddress() { return this.fromAddress; Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java?rev=1417101&r1=1417100&r2=1417101&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java Tue Dec 4 18:36:16 2012 @@ -42,6 +42,7 @@ public class MockSimpleEmail extends Sim /** * @return fromAddress */ + @Override public InternetAddress getFromAddress() { return this.fromAddress;