diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 7c5f7cfff..f05acd449 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -93,7 +93,7 @@ public class CommandlineJava implements Cloneable {
         Properties sys = null;
 
         public String[] getVariables() throws BuildException {
-            String props[] = super.getVariables();
+            String[] props = super.getVariables();
       
             if (props == null) {
               return null;
diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java
index d3e5cfe66..a348fd264 100644
--- a/src/main/org/apache/tools/ant/types/FileList.java
+++ b/src/main/org/apache/tools/ant/types/FileList.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights 
+ * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -145,7 +145,7 @@ public class FileList extends DataType {
             throw new BuildException("No files specified for filelist.");
         }
 
-        String result[] = new String[filenames.size()];
+        String[] result = new String[filenames.size()];
         filenames.copyInto(result);
         return result;
     }
diff --git a/src/main/org/apache/tools/ant/types/FileSet.java b/src/main/org/apache/tools/ant/types/FileSet.java
index 4ba5c885c..a5f09e464 100644
--- a/src/main/org/apache/tools/ant/types/FileSet.java
+++ b/src/main/org/apache/tools/ant/types/FileSet.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -290,13 +290,14 @@ public class FileSet extends DataType implements Cloneable {
         
         ds.setBasedir(dir);
 
-        for (int i=0; i<additionalPatterns.size(); i++) {
+        final int count = additionalPatterns.size();
+        for (int i = 0; i < count; i++) {
             Object o = additionalPatterns.elementAt(i);
             defaultPatterns.append((PatternSet) o, p);
         }
 
         p.log( "FileSet: Setup file scanner in dir " + dir + 
-            " with " + defaultPatterns, p.MSG_DEBUG );
+            " with " + defaultPatterns, Project.MSG_DEBUG );
         
         ds.setIncludes(defaultPatterns.getIncludePatterns(p));
         ds.setExcludes(defaultPatterns.getExcludePatterns(p));
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 7f27e9bcb..df597d3e9 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -427,7 +427,7 @@ public class FilterSet extends DataType implements Cloneable {
             throw noChildrenAllowed();
         }
         for (Enumeration e = filterSet.getFilters().elements(); e.hasMoreElements();) {
-            filters.addElement((Filter)e.nextElement());
+            filters.addElement(e.nextElement());
         }
     }
     
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index b0cb4338e..848f562a4 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -403,7 +403,7 @@ public class PatternSet extends DataType {
             }
         }
 
-        String result[] = new String[tmpNames.size()];
+        String[] result = new String[tmpNames.size()];
         tmpNames.copyInto(result);
         return result;
     }