ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder Builder.java
Date Mon, 11 Mar 2002 12:12:47 GMT
conor       02/03/11 04:12:47

  Modified:    proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib
                        AntLibHandler.java
               proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant
                        Project.java
               proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system
                        FileConverter.java URLConverter.java
               proposal/mutant/src/java/bootstrap/org/apache/ant/builder
                        Builder.java
  Log:
  checkstyle corrections
  
  Revision  Changes    Path
  1.6       +1 -2      jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java
  
  Index: AntLibHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- AntLibHandler.java	18 Feb 2002 12:36:03 -0000	1.5
  +++ AntLibHandler.java	11 Mar 2002 12:12:46 -0000	1.6
  @@ -158,8 +158,7 @@
                       qualifiedName);
                   String factoryClass = factoryHandler.getClassName();
                   antLibrarySpec.setFactory(factoryClass);
  -            }
  -            else {
  +            } else {
                   super.startElement(uri, localName, qualifiedName, attributes);
               }
           } catch (ConfigException e) {
  
  
  
  1.12      +10 -10    jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- Project.java	6 Mar 2002 08:17:06 -0000	1.11
  +++ Project.java	11 Mar 2002 12:12:46 -0000	1.12
  @@ -83,36 +83,36 @@
   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;
  
  
  
  1.2       +1 -2      jakarta-ant/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java
  
  Index: FileConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -u -r1.1 -r1.2
  --- FileConverter.java	11 Feb 2002 15:42:18 -0000	1.1
  +++ FileConverter.java	11 Mar 2002 12:12:47 -0000	1.2
  @@ -92,8 +92,7 @@
               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);
           }
  
  
  
  1.2       +1 -2      jakarta-ant/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java
  
  Index: URLConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -u -r1.1 -r1.2
  --- URLConverter.java	11 Feb 2002 15:42:18 -0000	1.1
  +++ URLConverter.java	11 Mar 2002 12:12:47 -0000	1.2
  @@ -87,8 +87,7 @@
       public Object convert(String value, Class type) throws ExecutionException {
           try {
               return new URL(value);
  -        }
  -        catch (MalformedURLException e) {
  +        } catch (MalformedURLException e) {
               throw new ExecutionException(e);
           }
       }
  
  
  
  1.6       +14 -11    jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
  
  Index: Builder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- Builder.java	6 Mar 2002 12:37:28 -0000	1.5
  +++ Builder.java	11 Mar 2002 12:12:47 -0000	1.6
  @@ -82,6 +82,9 @@
       /** 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 @@
           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 @@
           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"));
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message