Author: tn Date: Thu Oct 10 21:33:22 2013 New Revision: 1531118 URL: http://svn.apache.org/r1531118 Log: Fix checkstyle warnings.
Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.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/util/MimeMessageParser.java Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1531118&r1=1531117&r2=1531118&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java Thu Oct 10 21:33:22 2013 @@ -29,7 +29,6 @@ import java.util.Properties; import javax.mail.Authenticator; import javax.mail.Message; import javax.mail.MessagingException; -import javax.mail.SendFailedException; import javax.mail.Session; import javax.mail.Store; import javax.mail.Transport; @@ -1174,7 +1173,8 @@ public abstract class Email { this.headers.clear(); - for (Map.Entry<String, String> entry : map.entrySet()) { + for (Map.Entry<String, String> entry : map.entrySet()) + { addHeader(entry.getKey(), entry.getValue()); } } @@ -1706,7 +1706,7 @@ public abstract class Email * Sets whether the email is partially send in case of invalid addresses. * <p> * In case the mail server rejects an address as invalid, the call to {@link #send()} - * may throw a {@link SendFailedException}, even if partial send mode is enabled (emails + * may throw a {@link javax.mail.SendFailedException}, even if partial send mode is enabled (emails * to valid addresses will be transmitted). In case the email server does not reject * invalid addresses immediately, but return a bounce message, no exception will be thrown * by the {@link #send()} method. 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=1531118&r1=1531117&r2=1531118&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 Thu Oct 10 21:33:22 2013 @@ -588,7 +588,8 @@ public class HtmlEmail extends MultiPart msgHtml.setContent(this.html, EmailConstants.TEXT_HTML); } - for (InlineImage image : this.inlineEmbeds.values()) { + for (InlineImage image : this.inlineEmbeds.values()) + { bodyEmbedsContainer.addBodyPart(image.getMbp()); } } Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java?rev=1531118&r1=1531117&r2=1531118&view=diff ============================================================================== --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java Thu Oct 10 21:33:22 2013 @@ -171,14 +171,14 @@ public class MimeMessageParser throws MessagingException, IOException { if (part.isMimeType("text/plain") && (plainContent == null) - && (! MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))) + && (!MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))) { plainContent = (String) part.getContent(); } else { if (part.isMimeType("text/html") && (htmlContent == null) - && (! MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))) + && (!MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))) { htmlContent = (String) part.getContent(); }