diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 866b987e4..edcda4798 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -45,6 +45,7 @@ import org.apache.tools.ant.taskdefs.condition.Os; * @since Ant 1.3 */ public abstract class DefaultCompilerAdapter implements CompilerAdapter { + private static final int COMMAND_LINE_LIMIT = 4096; // 4K // CheckStyle:VisibilityModifier OFF - bc private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); @@ -460,7 +461,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { * POSIX seems to define a lower limit of 4k, so use a temporary * file if the total length of the command line exceeds this limit. */ - if (Commandline.toString(args).length() > 4096 + if (Commandline.toString(args).length() > COMMAND_LINE_LIMIT && firstFileName >= 0) { PrintWriter out = null; try { diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index 85236e0c8..a1f0336fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java @@ -149,7 +149,9 @@ class ChangeLogParser { */ private void processFile(final String line) { if (line.startsWith("Working file:")) { + // CheckStyle:MagicNumber OFF file = line.substring(14, line.length()); + // CheckStyle:MagicNumber ON status = GET_REVISION; } } @@ -161,7 +163,9 @@ class ChangeLogParser { */ private void processRevision(final String line) { if (line.startsWith("revision")) { + // CheckStyle:MagicNumber OFF revision = line.substring(9); + // CheckStyle:MagicNumber ON status = GET_DATE; } else if (line.startsWith("======")) { //There were no revisions in this changelog diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index 3433cc40e..e8290905b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -169,8 +169,10 @@ public class ChangeLogTask extends AbstractCvsTask { * @param days the number of days of log to process. */ public void setDaysinpast(final int days) { + // CheckStyle:MagicNumber OFF final long time = System.currentTimeMillis() - (long) days * 24 * 60 * 60 * 1000; + // CheckStyle:MagicNumber ON setStart(new Date(time)); } 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 a8557d8db..e144ba3df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -39,6 +39,8 @@ import org.apache.tools.ant.util.ClasspathUtils; * @ant.task name="mail" category="network" */ public class EmailTask extends Task { + private static final int SMTP_PORT = 25; + /** Constant to show that the best available mailer should be used. */ public static final String AUTO = "auto"; /** Constant to allow the Mime mailer to be requested */ @@ -65,7 +67,7 @@ public class EmailTask extends Task { private String encoding = AUTO; /** host running SMTP */ private String host = "localhost"; - private int port = 25; + private int port = SMTP_PORT; /** subject field */ private String subject = null; /** any text */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index d97fd4dfb..008fc15f2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -374,7 +374,8 @@ public class ANTLR extends Task { while ((line = in.readLine()) != null) { int extendsIndex = line.indexOf(" extends "); if (line.startsWith("class ") && extendsIndex > -1) { - generatedFileName = line.substring(6, extendsIndex).trim(); + generatedFileName = line.substring( + "class ".length(), extendsIndex).trim(); break; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index f706ceb41..c3a6b6a57 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -44,7 +44,7 @@ import org.apache.tools.ant.util.FileUtils; */ public class Cab extends MatchingTask { - + private static final int DEFAULT_RESULT = -99; private File cabFile; private File baseDir; private Vector filesets = new Vector(); @@ -279,7 +279,8 @@ public class Cab extends MatchingTask { out.flush(); out.close(); - int result = -99; // A wild default for when the thread is interrupted + // A wild default for when the thread is interrupted + int result = DEFAULT_RESULT; try { // Wait for the process to finish diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java index dd11ab4cc..c61f960cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java @@ -503,9 +503,11 @@ public class SchemaValidate extends XMLValidateTask { */ public int hashCode() { int result; + // CheckStyle:MagicNumber OFF result = (namespace != null ? namespace.hashCode() : 0); result = 29 * result + (file != null ? file.hashCode() : 0); result = 29 * result + (url != null ? url.hashCode() : 0); + // CheckStyle:MagicNumber OFF return result; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index a60e762eb..14293a433 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -44,6 +44,8 @@ import org.apache.tools.ant.util.depend.DependencyAnalyzer; * */ public class Depend extends MatchingTask { + private static final int ONE_SECOND = 1000; + /** * A class (struct) user to manage information about a class * @@ -693,7 +695,7 @@ public class Depend extends MatchingTask { determineOutOfDateClasses(); int count = deleteAllAffectedFiles(); - long duration = (System.currentTimeMillis() - start) / 1000; + long duration = (System.currentTimeMillis() - start) / ONE_SECOND; final int summaryLogLevel; if (count > 0) { @@ -817,8 +819,9 @@ public class Depend extends MatchingTask { } else if (file.getName().endsWith(".class")) { ClassFileInfo info = new ClassFileInfo(); info.absoluteFile = file; - String relativeName = file.getPath().substring(rootLength + 1, - file.getPath().length() - 6); + String relativeName = file.getPath().substring( + rootLength + 1, + file.getPath().length() - ".class".length()); info.className = ClassFileUtils.convertSlashName(relativeName); info.sourceFile = findSourceFile(relativeName); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index 4d5774fc0..c67c73129 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -70,6 +70,8 @@ import org.apache.tools.ant.types.EnumeratedAttribute; public abstract class DotnetCompile extends DotnetBaseMatchingTask { + private static final int DEFAULT_WARN_LEVEL = 3; + /** * list of reference classes. (pretty much a classpath equivalent) */ @@ -194,7 +196,7 @@ public abstract class DotnetCompile win32icon = null; srcDir = null; mainClass = null; - warnLevel = 3; + warnLevel = DEFAULT_WARN_LEVEL; optimize = false; debug = true; references = null;