ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types FileList.java FilterSet.java FileSet.java CommandlineJava.java PatternSet.java
Date Sat, 26 Jan 2002 20:16:23 GMT
sbailliez    02/01/26 12:16:23

  Modified:    src/main/org/apache/tools/ant/types FileList.java
                        FilterSet.java FileSet.java CommandlineJava.java
                        PatternSet.java
  Log:
  Fix audit violations
  
  Revision  Changes    Path
  1.4       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/types/FileList.java
  
  Index: FileList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FileList.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileList.java	13 Dec 2001 11:53:43 -0000	1.3
  +++ FileList.java	26 Jan 2002 20:16:22 -0000	1.4
  @@ -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
  @@ -72,7 +72,7 @@
    * exists in the file system.
    * 
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.3 $ $Date: 2001/12/13 11:53:43 $
  + * @version $Revision: 1.4 $ $Date: 2002/01/26 20:16:22 $
    */
   public class FileList extends DataType {
       
  @@ -145,7 +145,7 @@
               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;
       }
  
  
  
  1.9       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java
  
  Index: FilterSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FilterSet.java	10 Jan 2002 11:21:20 -0000	1.8
  +++ FilterSet.java	26 Jan 2002 20:16:22 -0000	1.9
  @@ -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 @@
               throw noChildrenAllowed();
           }
           for (Enumeration e = filterSet.getFilters().elements(); e.hasMoreElements();) {
  -            filters.addElement((Filter)e.nextElement());
  +            filters.addElement(e.nextElement());
           }
       }
       
  
  
  
  1.22      +4 -3      jakarta-ant/src/main/org/apache/tools/ant/types/FileSet.java
  
  Index: FileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FileSet.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- FileSet.java	10 Jan 2002 11:21:20 -0000	1.21
  +++ FileSet.java	26 Jan 2002 20:16:22 -0000	1.22
  @@ -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 @@
           
           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));
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- CommandlineJava.java	11 Jan 2002 14:59:40 -0000	1.25
  +++ CommandlineJava.java	26 Jan 2002 20:16:22 -0000	1.26
  @@ -93,7 +93,7 @@
           Properties sys = null;
   
           public String[] getVariables() throws BuildException {
  -            String props[] = super.getVariables();
  +            String[] props = super.getVariables();
         
               if (props == null) {
                 return null;
  
  
  
  1.19      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java
  
  Index: PatternSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- PatternSet.java	20 Jan 2002 20:45:57 -0000	1.18
  +++ PatternSet.java	26 Jan 2002 20:16:22 -0000	1.19
  @@ -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 @@
               }
           }
   
  -        String result[] = new String[tmpNames.size()];
  +        String[] result = new String[tmpNames.size()];
           tmpNames.copyInto(result);
           return result;
       }
  
  
  

--
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