checkstyle corrections

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271817 13f79535-47bb-0310-9956-ffa450edef68

proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java

@@ -158,8 +158,7 @@ public class AntLibHandler extends ElementHandler {
                     qualifiedName);
                 String factoryClass = factoryHandler.getClassName();
                 antLibrarySpec.setFactory(factoryClass);
-            }
-            else {
+            } else {
                 super.startElement(uri, localName, qualifiedName, attributes);
             }
         } catch (ConfigException e) {

proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java

@@ -83,36 +83,36 @@ import org.apache.tools.ant.util.FileUtils;
 public class Project implements org.apache.ant.common.event.BuildListener {
 
     /** String which indicates Java version 1.0 */
-    public final static String JAVA_1_0 = "1.0";
+    public static final String JAVA_1_0 = "1.0";
     /** String which indicates Java version 1.1 */
-    public final static String JAVA_1_1 = "1.1";
+    public static final String JAVA_1_1 = "1.1";
     /** String which indicates Java version 1.2 */
-    public final static String JAVA_1_2 = "1.2";
+    public static final String JAVA_1_2 = "1.2";
     /** String which indicates Java version 1.3 */
-    public final static String JAVA_1_3 = "1.3";
+    public static final String JAVA_1_3 = "1.3";
     /** String which indicates Java version 1.4 */
-    public final static String JAVA_1_4 = "1.4";
+    public static final String JAVA_1_4 = "1.4";
 
     /**
      * @see MessageLevel.MSG_ERR
      */
-    public final static int MSG_ERR = MessageLevel.MSG_ERR;
+    public static final int MSG_ERR = MessageLevel.MSG_ERR;
     /**
      * @see MessageLevel.MSG_WARN
      */
-    public final static int MSG_WARN = MessageLevel.MSG_WARN;
+    public static final int MSG_WARN = MessageLevel.MSG_WARN;
     /**
      * @see MessageLevel.MSG_INFO
      */
-    public final static int MSG_INFO = MessageLevel.MSG_INFO;
+    public static final int MSG_INFO = MessageLevel.MSG_INFO;
     /**
      * @see MessageLevel.MSG_VERBOSE
      */
-    public final static int MSG_VERBOSE = MessageLevel.MSG_VERBOSE;
+    public static final int MSG_VERBOSE = MessageLevel.MSG_VERBOSE;
     /**
      * @see MessageLevel.MSG_DEBUG
      */
-    public final static int MSG_DEBUG = MessageLevel.MSG_DEBUG;
+    public static final int MSG_DEBUG = MessageLevel.MSG_DEBUG;
 
     /** The java version detected that Ant is running on */
     private static String javaVersion;

proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java

@@ -92,8 +92,7 @@ public class FileConverter extends AbstractConverter {
             FileService fileService 
                 = (FileService)getContext().getCoreService(FileService.class);
             return fileService.resolveFile(value);
-        }
-        catch (AntException e) {
+        } catch (AntException e) {
             throw new ExecutionException("Unable to resolve file: " 
                 + value, e);
         }

proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java

@@ -87,8 +87,7 @@ public class URLConverter extends AbstractConverter {
     public Object convert(String value, Class type) throws ExecutionException {
         try {
             return new URL(value);
-        }
-        catch (MalformedURLException e) {
+        } catch (MalformedURLException e) {
             throw new ExecutionException(e);
         }
     }

proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java

@@ -82,6 +82,9 @@ public class Builder {
     /** the filters root */
     private static final File FILTERS_ROOT
          = new File(PACKAGE_ROOT, "filters");
+    /** the util root */
+    private static final File UTIL_ROOT
+         = new File(PACKAGE_ROOT, "util");
          
          
     /** the root forthe depend task's support classes */
@@ -120,16 +123,16 @@ public class Builder {
         files.add(new File(TYPES_ROOT, "Parameter.java"));
         files.add(new File(TYPES_ROOT, "Parameterizable.java"));
         files.add(new File(TYPES_ROOT, "RegularExpression.java"));
-        files.add(new File(PACKAGE_ROOT, "util/FileNameMapper.java"));
-        files.add(new File(PACKAGE_ROOT, "util/FlatFileNameMapper.java"));
-        files.add(new File(PACKAGE_ROOT, "util/SourceFileScanner.java"));
-        files.add(new File(PACKAGE_ROOT, "util/IdentityMapper.java"));
-        files.add(new File(PACKAGE_ROOT, "util/MergingMapper.java"));
-        files.add(new File(PACKAGE_ROOT, "util/GlobPatternMapper.java"));
-        files.add(new File(PACKAGE_ROOT, "util/regexp/Regexp.java"));
-        files.add(new File(PACKAGE_ROOT, "util/regexp/RegexpMatcher.java"));
-        files.add(new File(PACKAGE_ROOT, "util/regexp/RegexpFactory.java"));
-        files.add(new File(PACKAGE_ROOT, "util/regexp/RegexpMatcherFactory.java"));
+        files.add(new File(UTIL_ROOT, "FileNameMapper.java"));
+        files.add(new File(UTIL_ROOT, "FlatFileNameMapper.java"));
+        files.add(new File(UTIL_ROOT, "SourceFileScanner.java"));
+        files.add(new File(UTIL_ROOT, "IdentityMapper.java"));
+        files.add(new File(UTIL_ROOT, "MergingMapper.java"));
+        files.add(new File(UTIL_ROOT, "GlobPatternMapper.java"));
+        files.add(new File(UTIL_ROOT, "regexp/Regexp.java"));
+        files.add(new File(UTIL_ROOT, "regexp/RegexpMatcher.java"));
+        files.add(new File(UTIL_ROOT, "regexp/RegexpFactory.java"));
+        files.add(new File(UTIL_ROOT, "regexp/RegexpMatcherFactory.java"));
         files.add(new File(TYPES_ROOT, "Commandline.java"));
         files.add(new File(PACKAGE_ROOT, "BuildException.java"));
         files.add(new File(PACKAGE_ROOT, "Location.java"));
@@ -141,7 +144,7 @@ public class Builder {
         files.add(new File(PACKAGE_ROOT, "PathTokenizer.java"));
         files.add(new File(PACKAGE_ROOT, "TaskAdapter.java"));
         files.add(new File(PACKAGE_ROOT, "MatchingTask.java"));
-        files.add(new File(PACKAGE_ROOT, "util/FileUtils.java"));
+        files.add(new File(UTIL_ROOT, "FileUtils.java"));
         files.add(new File(PACKAGE_ROOT, "defaultManifest.mf"));
         files.add(new File(TASKDEFS_ROOT, "defaults.properties"));
         files.add(new File(TYPES_ROOT, "defaults.properties"));