sbailliez 01/10/28 13:25:27
Modified: src/main/org/apache/tools/ant AntClassLoader.java
BuildException.java BuildLogger.java
DefaultLogger.java DemuxOutputStream.java
DesirableFilter.java DirectoryScanner.java
FileScanner.java IntrospectionHelper.java
Launcher.java Location.java Main.java
PathTokenizer.java Project.java ProjectHelper.java
Target.java TaskAdapter.java XmlLogger.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.35 +16 -7
jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AntClassLoader.java 2001/08/30 13:26:36 1.34
+++ AntClassLoader.java 2001/10/28 21:25:26 1.35
@@ -54,11 +54,20 @@
package org.apache.tools.ant;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.zip.*;
-import java.io.*;
-import java.net.*;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Enumeration;
+import java.util.Vector;
+import java.util.Hashtable;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+import java.io.File;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ByteArrayOutputStream;
+import java.net.URL;
+import java.net.MalformedURLException;
import org.apache.tools.ant.types.Path;
/**
@@ -163,7 +172,7 @@
/**
* The size of buffers to be used in this classloader.
*/
- static private final int BUFFER_SIZE = 8192;
+ private final static int BUFFER_SIZE = 8192;
/**
* The components of the classpath that the classloader searches for
classes
@@ -402,7 +411,7 @@
* Force initialization of a class in a JDK 1.1 compatible, albeit hacky
* way
*/
- static public void initializeClass(Class theClass) {
+ public static void initializeClass(Class theClass) {
// ***HACK*** We try to create an instance to force the VM to run the
// class' static initializer. We don't care if the instance can't
// be created - we are just interested in the side effect.
1.12 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/BuildException.java
Index: BuildException.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/BuildException.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BuildException.java 2001/08/02 12:19:35 1.11
+++ BuildException.java 2001/10/28 21:25:26 1.12
@@ -54,7 +54,8 @@
package org.apache.tools.ant;
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.PrintStream;
/**
* Signals an error condition during a build.
1.6 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/BuildLogger.java
Index: BuildLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/BuildLogger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BuildLogger.java 2001/09/13 08:40:37 1.5
+++ BuildLogger.java 2001/10/28 21:25:26 1.6
@@ -54,7 +54,7 @@
package org.apache.tools.ant;
-import java.io.*;
+import java.io.PrintStream;
/**
* Interface used by Ant to log the build output.
1.19 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java
Index: DefaultLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultLogger.java 2001/08/30 13:26:37 1.18
+++ DefaultLogger.java 2001/10/28 21:25:26 1.19
@@ -54,7 +54,7 @@
package org.apache.tools.ant;
-import java.io.*;
+import java.io.PrintStream;
/**
* Writes build event to a PrintStream. Currently, it
1.2 +5 -3
jakarta-ant/src/main/org/apache/tools/ant/DemuxOutputStream.java
Index: DemuxOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DemuxOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DemuxOutputStream.java 2001/07/22 13:12:28 1.1
+++ DemuxOutputStream.java 2001/10/28 21:25:26 1.2
@@ -54,8 +54,10 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Hashtable;
/**
@@ -67,7 +69,7 @@
*/
public class DemuxOutputStream extends OutputStream {
- static private final int MAX_SIZE = 1024;
+ private final static int MAX_SIZE = 1024;
private Hashtable buffers = new Hashtable();
// private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
1.6 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/DesirableFilter.java
Index: DesirableFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DesirableFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DesirableFilter.java 2001/07/12 13:02:41 1.5
+++ DesirableFilter.java 2001/10/28 21:25:26 1.6
@@ -56,7 +56,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import java.io.IOException;
+
/**
* Filters filenames to determine whether or not the file is desirable.
1.17 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DirectoryScanner.java 2001/09/30 13:21:53 1.16
+++ DirectoryScanner.java 2001/10/28 21:25:26 1.17
@@ -54,8 +54,9 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.util.Vector;
+import java.util.StringTokenizer;
/**
* Class for scanning a directory for files/directories that match a certain
1.7 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/FileScanner.java
Index: FileScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileScanner.java 2001/09/30 13:21:53 1.6
+++ FileScanner.java 2001/10/28 21:25:26 1.7
@@ -53,7 +53,7 @@
*/
package org.apache.tools.ant;
-import java.io.*;
+import java.io.File;
/**
* An interface used to describe the actions required by any type of
1.23 +6 -3
jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- IntrospectionHelper.java 2001/09/13 08:40:37 1.22
+++ IntrospectionHelper.java 2001/10/28 21:25:26 1.23
@@ -58,9 +58,12 @@
import org.apache.tools.ant.types.DataType;
import org.apache.tools.ant.types.EnumeratedAttribute;
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Constructor;
import java.io.File;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
/**
* Helper class that collects the methods a task or nested element
@@ -250,7 +253,7 @@
/**
* Factory method for helper objects.
*/
- public synchronized static IntrospectionHelper getHelper(Class c) {
+ public static synchronized IntrospectionHelper getHelper(Class c) {
IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c);
if (ih == null) {
ih = new IntrospectionHelper(c);
1.2 +12 -9 jakarta-ant/src/main/org/apache/tools/ant/Launcher.java
Index: Launcher.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Launcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Launcher.java 2001/07/17 12:12:39 1.1
+++ Launcher.java 2001/10/28 21:25:26 1.2
@@ -54,10 +54,13 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import java.lang.reflect.*;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.StringTokenizer;
+import java.util.Properties;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.lang.reflect.Method;
/**
* This is the Ant command line front end to end. This front end
@@ -67,7 +70,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Conor MacNeill</a>
*/
public class Launcher {
- static private File determineAntHome11() {
+ private static File determineAntHome11() {
String classpath = System.getProperty("java.class.path");
StringTokenizer tokenizer = new StringTokenizer(classpath,
System.getProperty("path.separator"));
while (tokenizer.hasMoreTokens()) {
@@ -82,7 +85,7 @@
return null;
}
- static private File determineAntHome(ClassLoader systemClassLoader) {
+ private static File determineAntHome(ClassLoader systemClassLoader) {
try {
String className = Launcher.class.getName().replace('.', '/') +
".class";
URL classResource = systemClassLoader.getResource(className);
@@ -119,7 +122,7 @@
return null;
}
- static private void addDirJars(AntClassLoader classLoader, File jarDir) {
+ private static void addDirJars(AntClassLoader classLoader, File jarDir) {
String[] fileList = jarDir.list(new FilenameFilter() {
public boolean accept(File dir,
String name) {
return name.endsWith(".jar");
@@ -134,7 +137,7 @@
}
}
- static private void addToolsJar(AntClassLoader antLoader) {
+ private static void addToolsJar(AntClassLoader antLoader) {
String javaHome = System.getProperty("java.home");
if (javaHome.endsWith("jre")) {
javaHome = javaHome.substring(0, javaHome.length() - 4);
@@ -150,7 +153,7 @@
}
- static public void main(String[] args) {
+ public static void main(String[] args) {
File antHome = null;
ClassLoader systemClassLoader = Launcher.class.getClassLoader();
if (systemClassLoader == null) {
1.4 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/Location.java
Index: Location.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Location.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Location.java 2001/01/03 14:18:26 1.3
+++ Location.java 2001/10/28 21:25:26 1.4
@@ -62,7 +62,7 @@
private int lineNumber;
private int columnNumber;
- public static final Location UNKNOWN_LOCATION = new Location();
+ public final static Location UNKNOWN_LOCATION = new Location();
/**
* Creates an "unknown" location.
1.48 +10 -4 jakarta-ant/src/main/org/apache/tools/ant/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Main.java 2001/10/26 10:19:06 1.47
+++ Main.java 2001/10/28 21:25:26 1.48
@@ -54,8 +54,14 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.PrintStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Vector;
+import java.util.Properties;
+import java.util.Enumeration;
/**
* Command line entry point into Ant. This class is entered via the
@@ -72,7 +78,7 @@
public class Main {
/** The default build file name */
- public static final String DEFAULT_BUILD_FILENAME = "build.xml";
+ public final static String DEFAULT_BUILD_FILENAME = "build.xml";
/** Our current message output status. Follows Project.MSG_XXX */
private int msgOutputLevel = Project.MSG_INFO;
@@ -562,7 +568,7 @@
private static String antVersion = null;
- public synchronized static String getAntVersion() throws BuildException {
+ public static synchronized String getAntVersion() throws BuildException {
if (antVersion == null) {
try {
Properties props = new Properties();
1.5 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/PathTokenizer.java
Index: PathTokenizer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/PathTokenizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PathTokenizer.java 2001/01/03 14:18:27 1.4
+++ PathTokenizer.java 2001/10/28 21:25:26 1.5
@@ -53,8 +53,9 @@
*/
package org.apache.tools.ant;
-import java.util.*;
-import java.io.*;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
+import java.io.File;
/**
* A Path tokenizer takes a path and returns the components that make up
1.77 +24 -18 jakarta-ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Project.java 2001/10/19 07:24:29 1.76
+++ Project.java 2001/10/28 21:25:26 1.77
@@ -54,10 +54,16 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
+import java.util.Properties;
+import java.util.Enumeration;
+import java.util.Stack;
+
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
import org.apache.tools.ant.util.FileUtils;
@@ -76,27 +82,27 @@
public class Project {
- public static final int MSG_ERR = 0;
- public static final int MSG_WARN = 1;
- public static final int MSG_INFO = 2;
- public static final int MSG_VERBOSE = 3;
- public static final int MSG_DEBUG = 4;
+ public final static int MSG_ERR = 0;
+ public final static int MSG_WARN = 1;
+ public final static int MSG_INFO = 2;
+ public final static int MSG_VERBOSE = 3;
+ public final static int MSG_DEBUG = 4;
// private set of constants to represent the state
// of a DFS of the Target dependencies
- private static final String VISITING = "VISITING";
- private static final String VISITED = "VISITED";
+ private final static String VISITING = "VISITING";
+ private final static String VISITED = "VISITED";
private static String javaVersion;
- public static final String JAVA_1_0 = "1.0";
- public static final String JAVA_1_1 = "1.1";
- public static final String JAVA_1_2 = "1.2";
- public static final String JAVA_1_3 = "1.3";
- public static final String JAVA_1_4 = "1.4";
+ public final static String JAVA_1_0 = "1.0";
+ public final static String JAVA_1_1 = "1.1";
+ public final static String JAVA_1_2 = "1.2";
+ public final static String JAVA_1_3 = "1.3";
+ public final static String JAVA_1_4 = "1.4";
- public static final String TOKEN_START = FilterSet.DEFAULT_TOKEN_START;
- public static final String TOKEN_END = FilterSet.DEFAULT_TOKEN_END;
+ public final static String TOKEN_START = FilterSet.DEFAULT_TOKEN_START;
+ public final static String TOKEN_END = FilterSet.DEFAULT_TOKEN_END;
private String name;
private String description;
@@ -641,7 +647,7 @@
* @return the native version of to_process or
* an empty string if to_process is null or empty
*/
- static public String translatePath(String to_process) {
+ public static String translatePath(String to_process) {
if ( to_process == null || to_process.length() == 0 ) {
return "";
}
1.63 +19 -6
jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ProjectHelper.java 2001/09/30 13:21:53 1.62
+++ ProjectHelper.java 2001/10/28 21:25:26 1.63
@@ -54,12 +54,25 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-import org.apache.tools.ant.taskdefs.*;
-import javax.xml.parsers.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
+import java.util.Enumeration;
+import org.xml.sax.Locator;
+import org.xml.sax.InputSource;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.AttributeList;
+
+
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.ParserConfigurationException;
/**
* Configures a Project (complete with Targets and Tasks) based on
1.25 +3 -1 jakarta-ant/src/main/org/apache/tools/ant/Target.java
Index: Target.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Target.java 2001/10/01 07:44:42 1.24
+++ Target.java 2001/10/28 21:25:26 1.25
@@ -54,7 +54,9 @@
package org.apache.tools.ant;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Vector;
+import java.util.StringTokenizer;
/**
* This class implements a target object with required parameters.
1.8 +2 -2
jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TaskAdapter.java 2001/10/13 00:08:27 1.7
+++ TaskAdapter.java 2001/10/28 21:25:26 1.8
@@ -54,8 +54,8 @@
package org.apache.tools.ant;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Method;
+
/**
* Use introspection to "adapt" an arbitrary Bean ( not extending Task, but
with similar
1.15 +22 -15 jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java
Index: XmlLogger.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/XmlLogger.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XmlLogger.java 2001/10/08 13:52:54 1.14
+++ XmlLogger.java 2001/10/28 21:25:26 1.15
@@ -54,10 +54,17 @@
package org.apache.tools.ant;
-import java.io.*;
-import java.util.*;
-import javax.xml.parsers.*;
-import org.w3c.dom.*;
+import java.io.Writer;
+import java.io.OutputStreamWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Stack;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
import org.apache.tools.ant.util.DOMElementWriter;
/**
@@ -68,7 +75,7 @@
*/
public class XmlLogger implements BuildListener {
- private static final DocumentBuilder builder = getDocumentBuilder();
+ private final static DocumentBuilder builder = getDocumentBuilder();
private static DocumentBuilder getDocumentBuilder() {
try {
@@ -80,15 +87,15 @@
}
// XML constants for tag names and attribute names
- private static final String BUILD_TAG = "build";
- private static final String TARGET_TAG = "target";
- private static final String TASK_TAG = "task";
- private static final String MESSAGE_TAG = "message";
- private static final String NAME_ATTR = "name";
- private static final String TIME_ATTR = "time";
- private static final String PRIORITY_ATTR = "priority";
- private static final String LOCATION_ATTR = "location";
- private static final String ERROR_ATTR = "error";
+ private final static String BUILD_TAG = "build";
+ private final static String TARGET_TAG = "target";
+ private final static String TASK_TAG = "task";
+ private final static String MESSAGE_TAG = "message";
+ private final static String NAME_ATTR = "name";
+ private final static String TIME_ATTR = "time";
+ private final static String PRIORITY_ATTR = "priority";
+ private final static String LOCATION_ATTR = "location";
+ private final static String ERROR_ATTR = "error";
private Document doc;
private Hashtable tasks = new Hashtable();
@@ -96,7 +103,7 @@
private Hashtable threadStacks = new Hashtable();
private TimedElement buildElement = null;
- static private class TimedElement {
+ private static class TimedElement {
long startTime;
Element element;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
