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/taskdefs/condition ConditionBase.java
Date Sun, 28 Oct 2001 21:27:52 GMT
sbailliez    01/10/28 13:27:52

  Modified:    src/main/org/apache/tools/ant/listener Log4jListener.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java Gcj.java Javac12.java
                        Javac13.java JavacExternal.java Jikes.java Jvc.java
                        Kjc.java Sj.java
               src/main/org/apache/tools/ant/taskdefs/condition
                        ConditionBase.java
  Log:
  Code clean up:
   - removed useless/duplicate imports
   - added explicit imports rather than *
   - changed specifiers order to be conform to JLS.
  
  Revision  Changes    Path
  1.3       +6 -2      jakarta-ant/src/main/org/apache/tools/ant/listener/Log4jListener.java
  
  Index: Log4jListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/Log4jListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Log4jListener.java	2001/08/18 14:59:39	1.2
  +++ Log4jListener.java	2001/10/28 21:27:51	1.3
  @@ -54,7 +54,11 @@
   
   package org.apache.tools.ant.listener;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildListener;
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Target;
  +import org.apache.tools.ant.Task;
   
   import org.apache.log4j.Category;
   import org.apache.log4j.helpers.NullEnumeration;
  @@ -66,7 +70,7 @@
    * @author <a href="mailto:conor@apache.org>Conor MacNeill </a>
    */
   public class Log4jListener implements BuildListener {
  -    static final String LOG4J_CONFIG_PROPERTY = "log4j.configuration";
  +    final static String LOG4J_CONFIG_PROPERTY = "log4j.configuration";
       
       private boolean initialized = false;
       
  
  
  
  1.10      +13 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultCompilerAdapter.java	2001/09/30 13:21:54	1.9
  +++ DefaultCompilerAdapter.java	2001/10/28 21:27:51	1.10
  @@ -54,11 +54,20 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Location;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.taskdefs.Javac;
  +import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.LogStreamHandler;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.FileSet;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.IOException;
   import java.util.Random;
   
   /**
  
  
  
  1.4       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
  
  Index: Gcj.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Gcj.java	2001/10/12 08:14:08	1.3
  +++ Gcj.java	2001/10/28 21:27:51	1.4
  @@ -54,10 +54,11 @@
   
   package org.apache.tools.ant.taskdefs.compilers;
   
  -import java.io.File;
  +
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * The implementation of the gcj compiler.
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
  
  Index: Javac12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Javac12.java	2001/07/13 12:54:43	1.2
  +++ Javac12.java	2001/10/28 21:27:51	1.3
  @@ -59,7 +59,8 @@
   import org.apache.tools.ant.taskdefs.LogOutputStream;
   import org.apache.tools.ant.types.Commandline;
   
  -import java.io.*;
  +import java.io.OutputStream;
  +import java.io.IOException;
   import java.lang.reflect.Constructor;
   import java.lang.reflect.Method;
   
  
  
  
  1.5       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Javac13.java	2001/09/30 13:21:54	1.4
  +++ Javac13.java	2001/10/28 21:27:51	1.5
  @@ -56,11 +56,11 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.taskdefs.LogOutputStream;
  +
   import org.apache.tools.ant.types.Commandline;
   
   import java.lang.reflect.Method;
  -import java.io.*;
  +
   
   /**
    * The implementation of the javac compiler for JDK 1.3
  @@ -77,7 +77,7 @@
       /**
        * Integer returned by the "Modern" jdk1.3 compiler to indicate success.
        */
  -    private static final int MODERN_COMPILER_SUCCESS = 0;
  +    private final static int MODERN_COMPILER_SUCCESS = 0;
   
       public boolean execute() throws BuildException {
           attributes.log("Using modern compiler", Project.MSG_VERBOSE);
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
  
  Index: JavacExternal.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavacExternal.java	2001/08/08 14:51:14	1.2
  +++ JavacExternal.java	2001/10/28 21:27:51	1.3
  @@ -56,7 +56,7 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * Performs a compile using javac externally.
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Jikes.java	2001/08/18 14:59:39	1.2
  +++ Jikes.java	2001/10/28 21:27:51	1.3
  @@ -56,7 +56,8 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * The implementation of the jikes compiler.
  
  
  
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  
  Index: Jvc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Jvc.java	2001/01/26 08:43:02	1.2
  +++ Jvc.java	2001/10/28 21:27:51	1.3
  @@ -56,7 +56,8 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * The implementation of the jvc compiler from microsoft.
  
  
  
  1.2       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
  
  Index: Kjc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Kjc.java	2001/08/01 15:54:24	1.1
  +++ Kjc.java	2001/10/28 21:27:51	1.2
  @@ -56,12 +56,12 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.taskdefs.LogOutputStream;
  +
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  +
  +
   
  -import java.io.*;
  -import java.lang.reflect.Constructor;
   import java.lang.reflect.Method;
   
   /**
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java
  
  Index: Sj.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Sj.java	2001/08/06 09:04:26	1.1
  +++ Sj.java	2001/10/28 21:27:51	1.2
  @@ -56,7 +56,7 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * The implementation of the sj compiler.
  
  
  
  1.3       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
  
  Index: ConditionBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConditionBase.java	2001/10/01 14:14:22	1.2
  +++ ConditionBase.java	2001/10/28 21:27:52	1.3
  @@ -58,7 +58,7 @@
   import java.util.NoSuchElementException;
   import java.util.Vector;
   
  -import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.ProjectComponent;
   import org.apache.tools.ant.taskdefs.Available;
   import org.apache.tools.ant.taskdefs.UpToDate;
  @@ -69,7 +69,7 @@
    * and the "container" conditions are in sync.
    *
    * @author <a href="mailto:stefan.bodewig@epost.de>Stefan Bodewig</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public abstract class ConditionBase extends ProjectComponent {
       private Vector conditions = new Vector();
  
  
  

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