From 0f3a4ae2e2f52ddb7ea22dc8da6fd1b9e4ccbb20 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Mon, 20 Nov 2006 21:18:41 +0000 Subject: [PATCH] checkstyle git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@477343 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Length.java | 2 +- src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java | 2 +- src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java | 2 +- src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +- src/main/org/apache/tools/mail/SmtpResponseReader.java | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java index 234b1c21f..6de77ddf6 100755 --- a/src/main/org/apache/tools/ant/taskdefs/Length.java +++ b/src/main/org/apache/tools/ant/taskdefs/Length.java @@ -295,7 +295,7 @@ public class Length extends Task implements Condition { } private class AllHandler extends Handler { - long accum = 0L; + private long accum = 0L; AllHandler(PrintStream ps) { super(ps); } diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index 4bd125eaa..f49d66953 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -427,7 +427,7 @@ public class EmailTask extends Task { } } // SMTP auth only allowed with MIME mail - if (autoFound == false && ((user != null) || (password != null)) + if (!autoFound && ((user != null) || (password != null)) && (encoding.equals(UU) || encoding.equals(PLAIN))) { throw new BuildException("SMTP auth only possible with MIME mail"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index 6641c6979..c85d16bb4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -58,7 +58,7 @@ import org.apache.tools.ant.BuildException; * @since Ant 1.5 */ public class MimeMailer extends Mailer { - private final static String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; + private static final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; /** Default character set */ private static final String DEFAULT_CHARSET diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 9b6123b49..9399222a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -2531,7 +2531,7 @@ public class FTP private static final String[] VALID_LANGUAGE_CODES = getValidLanguageCodes(); - private static final String[] getValidLanguageCodes() { + private static String[] getValidLanguageCodes() { Collection c = FTPClientConfig.getSupportedLanguageCodes(); String[] ret = new String[c.size() + 1]; int i = 0; diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java index 66463c70d..6d6e6468f 100644 --- a/src/main/org/apache/tools/mail/SmtpResponseReader.java +++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java @@ -32,8 +32,9 @@ import java.io.InputStreamReader; * */ public class SmtpResponseReader { - + // CheckStyle:VisibilityModifier OFF - bc protected BufferedReader reader = null; + // CheckStyle:VisibilityModifier ON private StringBuffer result = new StringBuffer(); /**