diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java index 182e76c92..03608ec1d 100644 --- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java +++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java @@ -262,8 +262,7 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina // Change all EOL characters to match the calculated EOL string. If // configured to do so, append a trailing EOL so that the file ends on // a EOL. - if (eol != CrLf.ASIS) - { + if (eol != CrLf.ASIS) { in = new NormalizeEolFilter(in, calculateEolString(eol), getFixlast()); } diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java index 199003168..b8230a651 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java @@ -198,7 +198,7 @@ public final class ChainReaderHelper { * Deregisters Classloaders from the project so GC can remove them later. */ private static void cleanUpClassLoaders(List loaders) { - for (Iterator it = loaders.iterator(); it.hasNext(); ) { + for (Iterator it = loaders.iterator(); it.hasNext();) { it.next().cleanup(); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java index 31b0ffa35..ddacd9987 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java @@ -80,6 +80,7 @@ public class IsLastModified extends ProjectComponent implements Condition { /** * The resource to test. + * @param r the resource to test */ public void add(Resource r) { if (resource != null) { @@ -90,6 +91,7 @@ public class IsLastModified extends ProjectComponent implements Condition { /** * The type of comparison to test. + * @param mode the mode of comparison. */ public void setMode(CompareMode mode) { this.mode = mode; @@ -97,6 +99,8 @@ public class IsLastModified extends ProjectComponent implements Condition { /** * Argument validation. + * @throws BuildException if the required attributes are not supplied or + * if there is an inconsistency in the attributes. */ protected void validate() throws BuildException { if (millis >= 0 && dateTime != null) { @@ -114,6 +118,8 @@ public class IsLastModified extends ProjectComponent implements Condition { /** * Calculate timestamp as millis either based on millis or * dateTime (and pattern) attribute. + * @return time in milliseconds + * @throws BuildException if the date cannot be parsed. */ protected long getMillis() throws BuildException { if (millis >= 0) { @@ -145,6 +151,11 @@ public class IsLastModified extends ProjectComponent implements Condition { return 0; } + /** + * evaluate the condition + * @return true or false depending on the compoarison mode and the time of the resource + * @throws BuildException + */ public boolean eval() throws BuildException { validate(); long expected = getMillis(); @@ -170,6 +181,9 @@ public class IsLastModified extends ProjectComponent implements Condition { throw new BuildException("Unknown mode " + mode.getValue()); } + /** + * describes comparison modes. + */ public static class CompareMode extends EnumeratedAttribute { private static final String EQUALS_TEXT = "equals"; private static final String BEFORE_TEXT = "before"; @@ -179,10 +193,17 @@ public class IsLastModified extends ProjectComponent implements Condition { private static final CompareMode EQUALS = new CompareMode(EQUALS_TEXT); + /** + * creates a CompareMode instance of type equals + */ public CompareMode() { this(EQUALS_TEXT); } + /** + * creates a comparemode instance + * @param s one of the authorized values for comparemode + */ public CompareMode(String s) { super(); setValue(s); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index 1b05751da..8b5a2f919 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java @@ -213,7 +213,7 @@ public class Image extends MatchingTask { * the directory. * @since Ant 1.8.0 */ - public int processDir(final File srcDir, final String srcNames[], + public int processDir(final File srcDir, final String[] srcNames, final File dstDir, final FileNameMapper mapper) { int writeCount = 0; diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java index fbf42e327..db70d0c27 100644 --- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java +++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java @@ -47,7 +47,7 @@ public class TokenizedPath { private static final boolean[] CS_THEN_NON_CS = new boolean[] {true, false}; private final String path; - private final String tokenizedPath[]; + private final String[] tokenizedPath; /** * Initialize the TokenizedPath by parsing it. diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java index ee5a38ee6..82884deaf 100644 --- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java +++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java @@ -38,7 +38,7 @@ public class TokenizedPattern { new TokenizedPattern("", new String[0]); private final String pattern; - private final String tokenizedPattern[]; + private final String[] tokenizedPattern; /** * Initialize the PathPattern by parsing it.