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 D6CD5D0A5 for ; Tue, 11 Dec 2012 20:59:43 +0000 (UTC) Received: (qmail 58887 invoked by uid 500); 11 Dec 2012 20:59:43 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 58812 invoked by uid 500); 11 Dec 2012 20:59:43 -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 58805 invoked by uid 99); 11 Dec 2012 20:59:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 20:59:43 +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, 11 Dec 2012 20:59:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 761D323889BF; Tue, 11 Dec 2012 20:59:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1420402 - in /commons/proper/email/trunk/src/main/java/org/apache/commons/mail: HtmlEmail.java MultiPartEmail.java Date: Tue, 11 Dec 2012 20:59:18 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121211205919.761D323889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Tue Dec 11 20:59:15 2012 New Revision: 1420402 URL: http://svn.apache.org/viewvc?rev=1420402&view=rev Log: Add PMD suppress comments, minor formatting. Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java commons/proper/email/trunk/src/main/java/org/apache/commons/mail/MultiPartEmail.java 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=1420402&r1=1420401&r2=1420402&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 11 20:59:15 2012 @@ -304,7 +304,7 @@ public class HtmlEmail extends MultiPart is.close(); } } - catch (IOException ioe) + catch (IOException ioe) // NOPMD { /* sigh */ } } 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=1420402&r1=1420401&r2=1420402&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 11 20:59:15 2012 @@ -241,10 +241,10 @@ public class MultiPartEmail extends Emai { body.getContent(); } - catch (IOException e) + catch (IOException e) // NOPMD { - // do nothing here. content will be set to an empty string - // as a result. + // do nothing here. + // content will be set to an empty string as a result. // (Should this really be rethrown as an email exception?) // throw new EmailException(e); } @@ -290,9 +290,7 @@ public class MultiPartEmail extends Emai } catch (IOException e) { - throw new EmailException( - "Cannot attach file \"" + fileName + "\"", - e); + throw new EmailException("Cannot attach file \"" + fileName + "\"", e); } } @@ -326,8 +324,7 @@ public class MultiPartEmail extends Emai File file = new File(fileName); if (!file.exists()) { - throw new IOException( - "\"" + fileName + "\" does not exist"); + throw new IOException("\"" + fileName + "\" does not exist"); } result = attach( @@ -338,9 +335,7 @@ public class MultiPartEmail extends Emai } catch (IOException e) { - throw new EmailException( - "Cannot attach file \"" + fileName + "\"", - e); + throw new EmailException("Cannot attach file \"" + fileName + "\"", e); } } else