git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@477343 13f79535-47bb-0310-9956-ffa450edef68master
@@ -295,7 +295,7 @@ public class Length extends Task implements Condition { | |||||
} | } | ||||
private class AllHandler extends Handler { | private class AllHandler extends Handler { | ||||
long accum = 0L; | |||||
private long accum = 0L; | |||||
AllHandler(PrintStream ps) { | AllHandler(PrintStream ps) { | ||||
super(ps); | super(ps); | ||||
} | } | ||||
@@ -427,7 +427,7 @@ public class EmailTask extends Task { | |||||
} | } | ||||
} | } | ||||
// SMTP auth only allowed with MIME mail | // 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))) { | && (encoding.equals(UU) || encoding.equals(PLAIN))) { | ||||
throw new BuildException("SMTP auth only possible with MIME mail"); | throw new BuildException("SMTP auth only possible with MIME mail"); | ||||
} | } | ||||
@@ -58,7 +58,7 @@ import org.apache.tools.ant.BuildException; | |||||
* @since Ant 1.5 | * @since Ant 1.5 | ||||
*/ | */ | ||||
public class MimeMailer extends Mailer { | 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 */ | /** Default character set */ | ||||
private static final String DEFAULT_CHARSET | private static final String DEFAULT_CHARSET | ||||
@@ -2531,7 +2531,7 @@ public class FTP | |||||
private static final String[] VALID_LANGUAGE_CODES = | private static final String[] VALID_LANGUAGE_CODES = | ||||
getValidLanguageCodes(); | getValidLanguageCodes(); | ||||
private static final String[] getValidLanguageCodes() { | |||||
private static String[] getValidLanguageCodes() { | |||||
Collection c = FTPClientConfig.getSupportedLanguageCodes(); | Collection c = FTPClientConfig.getSupportedLanguageCodes(); | ||||
String[] ret = new String[c.size() + 1]; | String[] ret = new String[c.size() + 1]; | ||||
int i = 0; | int i = 0; | ||||
@@ -32,8 +32,9 @@ import java.io.InputStreamReader; | |||||
* | * | ||||
*/ | */ | ||||
public class SmtpResponseReader { | public class SmtpResponseReader { | ||||
// CheckStyle:VisibilityModifier OFF - bc | |||||
protected BufferedReader reader = null; | protected BufferedReader reader = null; | ||||
// CheckStyle:VisibilityModifier ON | |||||
private StringBuffer result = new StringBuffer(); | private StringBuffer result = new StringBuffer(); | ||||
/** | /** | ||||