diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 93dd2694e..bd4da260b 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -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 @@ public class AntClassLoader extends ClassLoader implements BuildListener { /** * 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 @@ public class AntClassLoader extends ClassLoader implements BuildListener { * 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. diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java index 08b269b1b..77a83662a 100644 --- a/src/main/org/apache/tools/ant/BuildException.java +++ b/src/main/org/apache/tools/ant/BuildException.java @@ -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. diff --git a/src/main/org/apache/tools/ant/BuildLogger.java b/src/main/org/apache/tools/ant/BuildLogger.java index 85f289cfc..8f1ae8024 100644 --- a/src/main/org/apache/tools/ant/BuildLogger.java +++ b/src/main/org/apache/tools/ant/BuildLogger.java @@ -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. diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java index 3aa4db32e..0e6229475 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/src/main/org/apache/tools/ant/DefaultLogger.java @@ -54,7 +54,7 @@ package org.apache.tools.ant; -import java.io.*; +import java.io.PrintStream; /** * Writes build event to a PrintStream. Currently, it diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java index 8568e7ff1..145924135 100644 --- a/src/main/org/apache/tools/ant/DemuxOutputStream.java +++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java @@ -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 @@ import java.util.*; */ 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(); diff --git a/src/main/org/apache/tools/ant/DesirableFilter.java b/src/main/org/apache/tools/ant/DesirableFilter.java index 92672ad0b..1c1be0133 100644 --- a/src/main/org/apache/tools/ant/DesirableFilter.java +++ b/src/main/org/apache/tools/ant/DesirableFilter.java @@ -56,7 +56,7 @@ package org.apache.tools.ant; import java.io.File; import java.io.FilenameFilter; -import java.io.IOException; + /** * Filters filenames to determine whether or not the file is desirable. diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index a64eac64d..0964079b9 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -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 diff --git a/src/main/org/apache/tools/ant/FileScanner.java b/src/main/org/apache/tools/ant/FileScanner.java index 08e03a5d1..79363a968 100644 --- a/src/main/org/apache/tools/ant/FileScanner.java +++ b/src/main/org/apache/tools/ant/FileScanner.java @@ -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 diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index df7976118..9361e35bf 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -58,9 +58,12 @@ import org.apache.tools.ant.types.Path; 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 @@ public class IntrospectionHelper implements BuildListener { /** * 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); diff --git a/src/main/org/apache/tools/ant/Launcher.java b/src/main/org/apache/tools/ant/Launcher.java index 6b14b98a5..097c4596e 100644 --- a/src/main/org/apache/tools/ant/Launcher.java +++ b/src/main/org/apache/tools/ant/Launcher.java @@ -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 @@ import java.lang.reflect.*; * @author Conor MacNeill */ 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 @@ public class Launcher { 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 @@ public class Launcher { 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 @@ public class Launcher { } } - 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 @@ public class Launcher { } - static public void main(String[] args) { + public static void main(String[] args) { File antHome = null; ClassLoader systemClassLoader = Launcher.class.getClassLoader(); if (systemClassLoader == null) { diff --git a/src/main/org/apache/tools/ant/Location.java b/src/main/org/apache/tools/ant/Location.java index 5562ca3cc..6d4bf69f9 100644 --- a/src/main/org/apache/tools/ant/Location.java +++ b/src/main/org/apache/tools/ant/Location.java @@ -62,7 +62,7 @@ public class Location { 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. diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 59ab77549..13972cba2 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -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 @@ import java.util.*; 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 @@ public class Main { 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(); diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java index 95daea91d..56d9b2ad4 100644 --- a/src/main/org/apache/tools/ant/PathTokenizer.java +++ b/src/main/org/apache/tools/ant/PathTokenizer.java @@ -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 diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index b6c0ef557..c7369d602 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -54,9 +54,15 @@ 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; @@ -76,27 +82,27 @@ import org.apache.tools.ant.util.FileUtils; 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 @@ public class Project { * @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 ""; } diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 62e1887aa..c6ec2fd03 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -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 diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java index b9b861c5c..18a80a630 100644 --- a/src/main/org/apache/tools/ant/Target.java +++ b/src/main/org/apache/tools/ant/Target.java @@ -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. diff --git a/src/main/org/apache/tools/ant/TaskAdapter.java b/src/main/org/apache/tools/ant/TaskAdapter.java index a1f6225da..55e192f90 100644 --- a/src/main/org/apache/tools/ant/TaskAdapter.java +++ b/src/main/org/apache/tools/ant/TaskAdapter.java @@ -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 diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index b9c23a34d..c6c324f14 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -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 @@ import org.apache.tools.ant.util.DOMElementWriter; */ 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 @@ public class XmlLogger implements BuildListener { } // 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 @@ public class XmlLogger implements BuildListener { private Hashtable threadStacks = new Hashtable(); private TimedElement buildElement = null; - static private class TimedElement { + private static class TimedElement { long startTime; Element element; } diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java index 263cd7fd0..d61641b67 100644 --- a/src/main/org/apache/tools/ant/listener/Log4jListener.java +++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java @@ -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 @@ import org.apache.log4j.helpers.NullEnumeration; * @author Provides automated ejb jar file creation for ant. Extends the MatchingTask @@ -175,10 +179,10 @@ public class EjbJar extends MatchingTask { } public static class NamingScheme extends EnumeratedAttribute { - static public final String EJB_NAME = "ejb-name"; - static public final String DIRECTORY = "directory"; - static public final String DESCRIPTOR = "descriptor"; - static public final String BASEJARNAME = "basejarname"; + public final static String EJB_NAME = "ejb-name"; + public final static String DIRECTORY = "directory"; + public final static String DESCRIPTOR = "descriptor"; + public final static String BASEJARNAME = "basejarname"; public String[] getValues() { return new String[] {EJB_NAME, DIRECTORY, DESCRIPTOR, BASEJARNAME}; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 6122cda3f..ae2554c48 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -53,9 +53,12 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.Path; import java.io.File; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java index 7b7556d2a..a2a65d312 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java @@ -53,8 +53,13 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.ObjectInputStream; +import java.io.FileWriter; +import java.io.PrintWriter; +import java.util.Vector; import javax.ejb.deployment.EntityDescriptor; import javax.ejb.deployment.DeploymentDescriptor; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index c0c20f0f8..39f354ecd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -53,18 +53,32 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; -import java.util.*; -import java.util.jar.*; -import java.util.zip.*; -import java.net.*; +import java.io.File; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.FileOutputStream; +import java.util.Hashtable; +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; +import java.util.zip.ZipEntry; + import javax.xml.parsers.SAXParser; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.apache.tools.ant.*; -import org.apache.tools.ant.types.*; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Location; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.FileSet; /** * A deployment tool which creates generic EJB jars. Generic jars contains @@ -76,8 +90,8 @@ import org.apache.tools.ant.types.*; */ public class GenericDeploymentTool implements EJBDeploymentTool { /** Private constants that are used when constructing the standard jarfile */ - protected static final String META_DIR = "META-INF/"; - protected static final String EJB_DD = "ejb-jar.xml"; + protected final static String META_DIR = "META-INF/"; + protected final static String EJB_DD = "ejb-jar.xml"; /** * The configuration from the containing task. This config combined with the diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java index 2f1f0d19f..c0be24895 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java @@ -150,7 +150,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool { * written in the completed JAR file as "ias-ejb-jar.xml". This is the * naming convention implemented by iAS. */ - private static final String IAS_DD = "ias-ejb-jar.xml"; + private final static String IAS_DD = "ias-ejb-jar.xml"; /** * Setter method used to store the "home" directory of the user's iAS diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index 00da15623..a58c108f1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -69,8 +69,8 @@ import java.util.Iterator; import java.util.StringTokenizer; import java.util.Properties; import java.util.Date; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; + + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -106,9 +106,9 @@ import org.xml.sax.AttributeList; public class IPlanetEjbc { /* Constants used for the "beantype" attribute */ - private static final String ENTITY_BEAN = "entity"; - private static final String STATELESS_SESSION = "stateless"; - private static final String STATEFUL_SESSION = "stateful"; + private final static String ENTITY_BEAN = "entity"; + private final static String STATELESS_SESSION = "stateless"; + private final static String STATEFUL_SESSION = "stateful"; /* Filenames of the standard EJB descriptor and the iAS-specific descriptor */ private File stdDescriptor; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java index 48c892ac9..0b2babc87 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java @@ -53,7 +53,8 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; +import java.io.FilenameFilter; +import java.io.File; public class InnerClassFilenameFilter implements FilenameFilter { private String baseClassName; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java index 63e9b40ed..eb95ef49f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java @@ -53,9 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; -import java.util.*; -import org.apache.tools.ant.*; +import java.io.File; +import java.util.Hashtable; +import org.apache.tools.ant.Project; /** * The deployment tool to add the jboss specific deployment descriptor to the ejb jar file. @@ -67,8 +67,8 @@ import org.apache.tools.ant.*; * @see EjbJar#createJboss */ public class JbossDeploymentTool extends GenericDeploymentTool { - protected static final String JBOSS_DD = "jboss.xml"; - protected static final String JBOSS_CMPD = "jaws.xml"; + protected final static String JBOSS_DD = "jboss.xml"; + protected final static String JBOSS_CMPD = "jaws.xml"; /** Instance variable that stores the suffix for the jboss jarfile. */ private String jarSuffix = ".jar"; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 1cd06ad3a..4075639a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -55,9 +55,9 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; + import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Path; import java.io.File; @@ -69,9 +69,9 @@ import java.io.File; * @author Conor MacNeill, Cortex ebusiness Pty Limited */ public class WLRun extends Task { - static protected final String DEFAULT_WL51_POLICY_FILE = "weblogic.policy"; - static protected final String DEFAULT_WL60_POLICY_FILE = "lib/weblogic.policy"; - static protected final String DEFAULT_PROPERTIES_FILE = "weblogic.properties"; + protected final static String DEFAULT_WL51_POLICY_FILE = "weblogic.policy"; + protected final static String DEFAULT_WL60_POLICY_FILE = "lib/weblogic.policy"; + protected final static String DEFAULT_PROPERTIES_FILE = "weblogic.properties"; /** * The classpath to be used when running the Java VM. It must contain the weblogic diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java index f25fe4093..d1049e75c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java @@ -55,9 +55,9 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; + import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Path; import java.io.File; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 2d3558dae..b9b1fa8e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -54,49 +54,60 @@ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; -import java.util.jar.*; -import java.util.*; -import java.net.*; - -import javax.xml.parsers.*; -import org.xml.sax.*; - -import org.apache.tools.ant.*; -import org.apache.tools.ant.types.*; +import java.io.File; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.jar.JarEntry; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Enumeration; + + +import javax.xml.parsers.SAXParserFactory; +import javax.xml.parsers.SAXParser; +import org.xml.sax.InputSource; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.taskdefs.Java; public class WeblogicDeploymentTool extends GenericDeploymentTool { - public static final String PUBLICID_EJB11 + public final static String PUBLICID_EJB11 = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"; - public static final String PUBLICID_EJB20 + public final static String PUBLICID_EJB20 = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"; - public static final String PUBLICID_WEBLOGIC_EJB510 + public final static String PUBLICID_WEBLOGIC_EJB510 = "-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN"; - public static final String PUBLICID_WEBLOGIC_EJB600 + public final static String PUBLICID_WEBLOGIC_EJB600 = "-//BEA Systems, Inc.//DTD WebLogic 6.0.0 EJB//EN"; - protected static final String DEFAULT_WL51_EJB11_DTD_LOCATION + protected final static String DEFAULT_WL51_EJB11_DTD_LOCATION = "/weblogic/ejb/deployment/xml/ejb-jar.dtd"; - protected static final String DEFAULT_WL60_EJB11_DTD_LOCATION + protected final static String DEFAULT_WL60_EJB11_DTD_LOCATION = "/weblogic/ejb20/dd/xml/ejb11-jar.dtd"; - protected static final String DEFAULT_WL60_EJB20_DTD_LOCATION + protected final static String DEFAULT_WL60_EJB20_DTD_LOCATION = "/weblogic/ejb20/dd/xml/ejb20-jar.dtd"; - protected static final String DEFAULT_WL51_DTD_LOCATION + protected final static String DEFAULT_WL51_DTD_LOCATION = "/weblogic/ejb/deployment/xml/weblogic-ejb-jar.dtd"; - protected static final String DEFAULT_WL60_51_DTD_LOCATION + protected final static String DEFAULT_WL60_51_DTD_LOCATION = "/weblogic/ejb20/dd/xml/weblogic510-ejb-jar.dtd"; - protected static final String DEFAULT_WL60_DTD_LOCATION + protected final static String DEFAULT_WL60_DTD_LOCATION = "/weblogic/ejb20/dd/xml/weblogic600-ejb-jar.dtd"; - protected static final String DEFAULT_COMPILER = "default"; + protected final static String DEFAULT_COMPILER = "default"; - protected static final String WL_DD = "weblogic-ejb-jar.xml"; - protected static final String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml"; + protected final static String WL_DD = "weblogic-ejb-jar.xml"; + protected final static String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml"; - protected static final String COMPILER_EJB11 = "weblogic.ejbc"; - protected static final String COMPILER_EJB20 = "weblogic.ejbc20"; + protected final static String COMPILER_EJB11 = "weblogic.ejbc"; + protected final static String COMPILER_EJB20 = "weblogic.ejbc20"; /** Instance variable that stores the suffix for the weblogic jarfile. */ private String jarSuffix = ".jar"; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java index 6e1e44aaf..70a6f9402 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java @@ -54,15 +54,15 @@ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; public class WeblogicTOPLinkDeploymentTool extends WeblogicDeploymentTool { - private static final String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd"; + private final static String TL_DTD_LOC = "http://www.objectpeople.com/tlwl/dtd/toplink-cmp_2_5_1.dtd"; private String toplinkDescriptor; private String toplinkDTD; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java index 1d9e02682..5c9ab7c8f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java @@ -57,7 +57,7 @@ package org.apache.tools.ant.taskdefs.optional.ide; import com.ibm.ivj.util.base.Project; import com.ibm.ivj.util.base.ToolData; -import com.ibm.ivj.util.base.IvjException; + import org.apache.tools.ant.BuildException; @@ -71,7 +71,7 @@ import org.apache.tools.ant.BuildException; * @author: Wolf Siberski */ public class VAJAntTool { - private static final String TOOL_DATA_KEY = "AntTool"; + private final static String TOOL_DATA_KEY = "AntTool"; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index 9cd8bcd3d..df7d73404 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -88,7 +88,7 @@ class VAJBuildInfo implements Runnable { /** * This exception is thrown when a build is interrupted */ - static public class BuildInterruptedException extends BuildException { + public static class BuildInterruptedException extends BuildException { public String toString() { return "BUILD INTERRUPTED"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java index e059d0970..5f3115788 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java @@ -150,8 +150,8 @@ import java.io.File; */ public class VAJExportServlet extends VAJToolsServlet { // constants for servlet param names - public static final String WITH_DEBUG_INFO = "deb"; - public static final String OVERWRITE_PARAM = "owr"; + public final static String WITH_DEBUG_INFO = "deb"; + public final static String OVERWRITE_PARAM = "owr"; /** * Respond to a request to export packages from the Workbench. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index 5b100f533..481bdaedf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -53,12 +53,12 @@ */ package org.apache.tools.ant.taskdefs.optional.ide; -import java.io.File; + import java.util.Enumeration; import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Task; + import org.apache.tools.ant.types.FileSet; import java.lang.reflect.Field; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java index a0676a159..758f32193 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java @@ -56,11 +56,11 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Enumeration; -import java.util.Vector; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; + + + + + /** * This is only there for backward compatibility with the default task list diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java index e8d44a15e..c193b7e73 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java @@ -83,7 +83,7 @@ import java.util.Vector; public class VAJLoadServlet extends VAJToolsServlet { // constants for servlet param names - public static final String VERSION_PARAM = "version"; + public final static String VERSION_PARAM = "version"; /** * Respond to a request to load a project from the Repository diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 6a5f5591d..8761fa475 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -59,7 +59,7 @@ import java.util.Vector; import java.util.Enumeration; import java.io.File; -import com.ibm.ivj.util.base.*; + import com.ibm.ivj.util.base.Package; import org.apache.tools.ant.BuildException; @@ -74,7 +74,7 @@ import org.apache.tools.ant.DirectoryScanner; */ abstract class VAJLocalUtil implements VAJUtil{ // singleton containing the VAJ workspace - static private Workspace workspace; + private static Workspace workspace; /** * Wraps IvjException into a BuildException diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java index f272ad53a..d9fb978e8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java @@ -55,7 +55,7 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.util.Vector; -import java.net.URLConnection; + import java.net.HttpURLConnection; import java.util.Enumeration; import java.net.URL; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 4855d0d12..21f4d5049 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -54,9 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import com.ibm.ivj.toolserver.servletclasses.servlet.*; -import com.ibm.ivj.toolserver.servletclasses.servlet.http.*; -import java.io.*; + + +import java.io.IOException; +import java.io.StringWriter; +import java.io.PrintWriter; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -99,14 +101,14 @@ public abstract class VAJToolsServlet extends HttpServlet { } // constants for servlet param names - public static final String DIR_PARAM = "dir"; - public static final String INCLUDE_PARAM = "include"; - public static final String EXCLUDE_PARAM = "exclude"; - public static final String CLASSES_PARAM = "cls"; - public static final String SOURCES_PARAM = "src"; - public static final String RESOURCES_PARAM = "res"; - public static final String DEFAULT_EXCLUDES_PARAM = "dex"; - public static final String PROJECT_NAME_PARAM = "project"; + public final static String DIR_PARAM = "dir"; + public final static String INCLUDE_PARAM = "include"; + public final static String EXCLUDE_PARAM = "exclude"; + public final static String CLASSES_PARAM = "cls"; + public final static String SOURCES_PARAM = "src"; + public final static String RESOURCES_PARAM = "res"; + public final static String DEFAULT_EXCLUDES_PARAM = "dex"; + public final static String PROJECT_NAME_PARAM = "project"; // current request diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index fda6421ac..b1a3069f9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -77,18 +77,18 @@ import java.util.Enumeration; public class JJTree extends Task { // keys to optional attributes - private static final String BUILD_NODE_FILES = "BUILD_NODE_FILES"; - private static final String MULTI = "MULTI"; - private static final String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID"; - private static final String NODE_FACTORY = "NODE_FACTORY"; - private static final String NODE_SCOPE_HOOK = "NODE_SCOPE_HOOK"; - private static final String NODE_USES_PARSER = "NODE_USES_PARSER"; - private static final String STATIC = "STATIC"; - private static final String VISITOR = "VISITOR"; - - private static final String NODE_PACKAGE = "NODE_PACKAGE"; - private static final String VISITOR_EXCEPTION = "VISITOR_EXCEPTION"; - private static final String NODE_PREFIX = "NODE_PREFIX"; + private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES"; + private final static String MULTI = "MULTI"; + private final static String NODE_DEFAULT_VOID = "NODE_DEFAULT_VOID"; + private final static String NODE_FACTORY = "NODE_FACTORY"; + private final static String NODE_SCOPE_HOOK = "NODE_SCOPE_HOOK"; + private final static String NODE_USES_PARSER = "NODE_USES_PARSER"; + private final static String STATIC = "STATIC"; + private final static String VISITOR = "VISITOR"; + + private final static String NODE_PACKAGE = "NODE_PACKAGE"; + private final static String VISITOR_EXCEPTION = "VISITOR_EXCEPTION"; + private final static String NODE_PREFIX = "NODE_PREFIX"; private final Hashtable optionalAttrs = new Hashtable(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index ae2d29d81..37ef2b550 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -58,13 +58,13 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.taskdefs.LogStreamHandler; + import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; import java.io.File; -import java.io.IOException; + import java.util.Hashtable; import java.util.Enumeration; @@ -77,27 +77,27 @@ import java.util.Enumeration; public class JavaCC extends Task { // keys to optional attributes - private static final String LOOKAHEAD = "LOOKAHEAD"; - private static final String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK"; - private static final String OTHER_AMBIGUITY_CHECK = "OTHER_AMBIGUITY_CHECK"; - - private static final String STATIC = "STATIC"; - private static final String DEBUG_PARSER = "DEBUG_PARSER"; - private static final String DEBUG_LOOKAHEAD = "DEBUG_LOOKAHEAD"; - private static final String DEBUG_TOKEN_MANAGER = "DEBUG_TOKEN_MANAGER"; - private static final String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER"; - private static final String ERROR_REPORTING = "ERROR_REPORTING"; - private static final String JAVA_UNICODE_ESCAPE = "JAVA_UNICODE_ESCAPE"; - private static final String UNICODE_INPUT = "UNICODE_INPUT"; - private static final String IGNORE_CASE = "IGNORE_CASE"; - private static final String COMMON_TOKEN_ACTION = "COMMON_TOKEN_ACTION"; - private static final String USER_TOKEN_MANAGER = "USER_TOKEN_MANAGER"; - private static final String USER_CHAR_STREAM = "USER_CHAR_STREAM"; - private static final String BUILD_PARSER = "BUILD_PARSER"; - private static final String BUILD_TOKEN_MANAGER = "BUILD_TOKEN_MANAGER"; - private static final String SANITY_CHECK = "SANITY_CHECK"; - private static final String FORCE_LA_CHECK = "FORCE_LA_CHECK"; - private static final String CACHE_TOKENS = "CACHE_TOKENS"; + private final static String LOOKAHEAD = "LOOKAHEAD"; + private final static String CHOICE_AMBIGUITY_CHECK = "CHOICE_AMBIGUITY_CHECK"; + private final static String OTHER_AMBIGUITY_CHECK = "OTHER_AMBIGUITY_CHECK"; + + private final static String STATIC = "STATIC"; + private final static String DEBUG_PARSER = "DEBUG_PARSER"; + private final static String DEBUG_LOOKAHEAD = "DEBUG_LOOKAHEAD"; + private final static String DEBUG_TOKEN_MANAGER = "DEBUG_TOKEN_MANAGER"; + private final static String OPTIMIZE_TOKEN_MANAGER = "OPTIMIZE_TOKEN_MANAGER"; + private final static String ERROR_REPORTING = "ERROR_REPORTING"; + private final static String JAVA_UNICODE_ESCAPE = "JAVA_UNICODE_ESCAPE"; + private final static String UNICODE_INPUT = "UNICODE_INPUT"; + private final static String IGNORE_CASE = "IGNORE_CASE"; + private final static String COMMON_TOKEN_ACTION = "COMMON_TOKEN_ACTION"; + private final static String USER_TOKEN_MANAGER = "USER_TOKEN_MANAGER"; + private final static String USER_CHAR_STREAM = "USER_CHAR_STREAM"; + private final static String BUILD_PARSER = "BUILD_PARSER"; + private final static String BUILD_TOKEN_MANAGER = "BUILD_TOKEN_MANAGER"; + private final static String SANITY_CHECK = "SANITY_CHECK"; + private final static String FORCE_LA_CHECK = "FORCE_LA_CHECK"; + private final static String CACHE_TOKENS = "CACHE_TOKENS"; private final Hashtable optionalAttrs = new Hashtable(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 63d507c95..4528b1e4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -58,8 +58,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Enumeration; -import java.util.Vector; + + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.PathTokenizer; import org.apache.tools.ant.Project; @@ -247,11 +247,11 @@ public class JDependTask extends Task { /** * No problems with this test. */ - private static final int SUCCESS = 0; + private final static int SUCCESS = 0; /** * An error occured. */ - private static final int ERRORS = 1; + private final static int ERRORS = 1; public void execute() throws BuildException { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java index 4b8c7d01c..12645587b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java @@ -53,7 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import java.io .*; +import java.io.IOException; +import java.io.DataInput; +import java.io.InputStream; +import java.io.DataInputStream; /** * Reads just enough of a class file to determine the class' full name. @@ -64,7 +67,7 @@ import java.io .*; */ class ConstantPool extends Object{ - static final + final static byte UTF8 = 1, UNUSED = 2, INTEGER = 3, FLOAT = 4, LONG = 5, DOUBLE = 6, CLASS = 7, STRING = 8, FIELDREF = 9, METHODREF = 10, INTERFACEMETHODREF = 11, NAMEANDTYPE = 12; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index a2172320e..c47e66539 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -53,9 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import org.apache.tools.ant .*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types .*; +import org.apache.tools.ant.types.Path; import java.io.File; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index dac3679a3..91c91dec1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -64,10 +64,20 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import java.io .*; +import java.io.FileOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.FileInputStream; +import java.io.BufferedInputStream; import java.util .Enumeration; import java.util .Vector; -import java.util.zip .*; +import java.util.zip.ZipOutputStream; +import java.util.zip.Deflater; +import java.util.zip.ZipFile; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +import java.util.zip.CRC32; public class jlink extends Object{ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 2a7aa721a..3010e9e6e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -56,15 +56,16 @@ package org.apache.tools.ant.taskdefs.optional.jsp; import java.io.File; import java.util.Date; -import java.util.Enumeration; + import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; + import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.optional.jsp.compilers.*; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter; +import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory; + import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; @@ -132,7 +133,7 @@ public class JspC extends MatchingTask */ private File uriroot; - private static final String FAIL_MSG + private final static String FAIL_MSG = "Compile failed, messages should have been provided."; /* ------------------------------------------------------------ */ /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java index 424bf5f2c..160fe6c3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java @@ -55,7 +55,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; + /** * Creates the necessary compiler adapter, given basic criteria. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 9676335aa..17e909bc2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java @@ -54,10 +54,10 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.optional.*; +import org.apache.tools.ant.Project; + import org.apache.tools.ant.taskdefs.optional.jsp.JspC; -import org.apache.tools.ant.types.*; +import org.apache.tools.ant.types.Commandline; import java.util.Vector; import java.util.Enumeration; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 39a651338..e951b58c7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -56,9 +56,9 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; 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.taskdefs.optional.jsp.JspC; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.Java; /** * The implementation of the jasper compiler. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index 3881bd9dd..9a1970d7f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -58,10 +58,17 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.EnumeratedAttribute; -import java.io.*; +import java.io.File; +import java.io.InputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.FileNotFoundException; +import java.io.OutputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; + + -import java.util.Enumeration; -import java.util.Hashtable; import java.lang.reflect.Field; import java.net.URL; @@ -72,7 +79,7 @@ import org.apache.xalan.xslt.XSLTResultTarget; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.ParserConfigurationException; + import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.Source; @@ -83,12 +90,12 @@ import javax.xml.transform.stream.StreamResult; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; -import org.xml.sax.SAXException; -import org.xml.sax.InputSource; + + + + + /** * Transform a JUnit xml report. @@ -127,7 +134,7 @@ public class AggregateTransformer { protected String format; /** XML Parser factory */ - protected static final DocumentBuilderFactory dbfactory = DocumentBuilderFactory.newInstance(); + protected final static DocumentBuilderFactory dbfactory = DocumentBuilderFactory.newInstance(); public AggregateTransformer(Task task){ this.task = task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index e67c3dd89..9b000869f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -54,13 +54,14 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.BuildException; + import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Reference; -import java.util.*; + +import java.util.Enumeration; +import java.util.Vector; import java.io.File; /** @@ -182,7 +183,7 @@ public final class BatchTest extends BaseTest { * @param filename the filename to "convert" to a classname. * @return the classname matching the filename. */ - public final static String javaToClass(String filename){ + public static final String javaToClass(String filename){ return filename.replace(File.separatorChar, '.'); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java index 0a63415fe..8ea83de4f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java @@ -56,7 +56,8 @@ package org.apache.tools.ant.taskdefs.optional.junit; import org.apache.tools.ant.BuildException; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.AssertionFailedError; /** * Prints plain text output of the test to a specified Writer. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java index 5e23d2b22..b7d64aa00 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java @@ -60,7 +60,7 @@ import org.w3c.dom.Comment; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Attr; -import org.w3c.dom.EntityReference; + import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; import org.w3c.dom.NodeList; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index 3646b9b6b..91183bcb4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -55,9 +55,9 @@ package org.apache.tools.ant.taskdefs.optional.junit; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Commandline; -import java.io.File; + + import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 5d57aa469..340958859 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -54,15 +54,25 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.*; - -import junit.framework.*; -import java.lang.reflect.*; -import java.io.*; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.BuildException; + +import junit.framework.TestListener; +import junit.framework.TestResult; +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.framework.AssertionFailedError; +import java.lang.reflect.Method; +import java.io.PrintStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.File; import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; -import java.util.StringTokenizer; + import java.util.Vector; /** @@ -89,17 +99,17 @@ public class JUnitTestRunner implements TestListener { /** * No problems with this test. */ - public static final int SUCCESS = 0; + public final static int SUCCESS = 0; /** * Some tests failed. */ - public static final int FAILURES = 1; + public final static int FAILURES = 1; /** * An error occured. */ - public static final int ERRORS = 2; + public final static int ERRORS = 2; /** * Holds the registered formatters. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index 213aa69ee..839f7f660 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -56,7 +56,10 @@ package org.apache.tools.ant.taskdefs.optional.junit; import org.apache.tools.ant.BuildException; -import java.io.*; +import java.io.OutputStream; +import java.io.StringWriter; +import java.io.PrintWriter; +import java.io.IOException; import java.text.NumberFormat; import junit.framework.AssertionFailedError; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 95a7538c1..5bf8c697f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -54,12 +54,21 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import java.io.*; -import java.text.CharacterIterator; -import java.text.StringCharacterIterator; -import java.util.*; -import javax.xml.parsers.*; -import org.w3c.dom.*; +import java.io.OutputStream; +import java.io.Writer; +import java.io.OutputStreamWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.io.PrintWriter; + + +import java.util.Properties; +import java.util.Enumeration; +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.BuildException; import org.apache.tools.ant.util.DOMElementWriter; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 9cd3b38c9..c592ad896 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -65,8 +65,8 @@ import java.util.Vector; import org.w3c.dom.Element; import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.*; + + import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 8dffd42b0..ddbaf3bc3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -56,12 +56,22 @@ package org.apache.tools.ant.taskdefs.optional.metamata; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; +import org.apache.tools.ant.taskdefs.Execute; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.DirectoryScanner; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.FileWriter; +import java.io.PrintWriter; +import java.util.Hashtable; +import java.util.Vector; +import java.util.Enumeration; +import java.util.Random; /** * Somewhat abstract framework to be used for other metama 2.0 tasks. @@ -279,7 +289,7 @@ public abstract class AbstractMetamataTask extends Task{ } } - protected final static File createTmpFile(){ + protected static final File createTmpFile(){ // must be compatible with JDK 1.1 !!!! final long rand = (new Random(System.currentTimeMillis())).nextLong(); File file = new File("metamata" + rand + ".tmp"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java index 28673920d..01c8e6832 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java @@ -55,14 +55,18 @@ package org.apache.tools.ant.taskdefs.optional.metamata; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.util.regexp.*; -import java.io.*; -import java.util.*; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; +import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.types.Path; + + + +import java.io.File; +import java.io.OutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Vector; /** * Metamata Audit evaluates Java code for programming errors, weaknesses, and @@ -113,7 +117,7 @@ public class MAudit extends AbstractMetamataTask { /** pattern used by maudit to report the error for a file */ /** RE does not seems to support regexp pattern with comments so i'm stripping it*/ // (?:file:)?((?#filepath).+):((?#line)\\d+)\\s*:\\s+((?#message).*) - static final String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)"; + final static String AUDIT_PATTERN = "(?:file:)?(.+):(\\d+)\\s*:\\s+(.*)"; protected File outFile = null; @@ -237,7 +241,7 @@ public class MAudit extends AbstractMetamataTask { } /** the inner class used to report violation information */ - static final class Violation { + final static class Violation { int line; String error; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index 6717e4b7c..497dd8b19 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -54,18 +54,29 @@ package org.apache.tools.ant.taskdefs.optional.metamata; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; -import org.apache.tools.ant.util.regexp.*; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.DOMElementWriter; -import org.w3c.dom.*; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; + +import org.apache.tools.ant.util.regexp.RegexpMatcher; +import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; + +import org.apache.tools.ant.util.DOMElementWriter; -import java.io.*; -import java.util.*; -import javax.xml.parsers.*; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import java.io.BufferedReader; +import java.io.OutputStream; +import java.io.InputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Writer; +import java.io.OutputStreamWriter; +import java.util.Hashtable; +import java.util.Enumeration; +import java.util.Vector; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java index 20049adf4..88dd6be1a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java @@ -55,14 +55,18 @@ package org.apache.tools.ant.taskdefs.optional.metamata; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; +import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.types.Path; -import java.io.*; -import java.util.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.FileOutputStream; +import java.util.Vector; /** * Calculates global complexity and quality metrics on Java source code. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index a5ad561d0..4af92e8ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -54,14 +54,28 @@ package org.apache.tools.ant.taskdefs.optional.metamata; -import org.xml.sax.*; -import org.xml.sax.helpers.*; -import javax.xml.transform.*; -import javax.xml.transform.stream.*; -import javax.xml.transform.sax.*; -import java.util.*; -import java.io.*; -import java.text.*; +import org.xml.sax.SAXException; +import org.xml.sax.Attributes; +import org.xml.sax.helpers.AttributesImpl; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.sax.SAXTransformerFactory; +import java.util.Stack; +import java.util.EmptyStackException; +import java.util.Enumeration; +import java.util.Vector; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.text.ParseException; +import java.text.NumberFormat; +import java.text.DecimalFormat; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index 038935fe1..a31c9d68d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -57,13 +57,19 @@ package org.apache.tools.ant.taskdefs.optional.metamata; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; +import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.FileWriter; +import java.io.PrintWriter; +import java.util.Vector; +import java.util.Random; /** * Simple Metamata MParse task based on the original written by @@ -341,7 +347,7 @@ public class MParse extends Task { } /** create a temporary file in the current directory */ - protected final static File createTmpFile(){ + protected static final File createTmpFile(){ // must be compatible with JDK 1.1 !!!! final long rand = (new Random(System.currentTimeMillis())).nextLong(); File file = new File("metamata" + rand + ".tmp"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 98202a3c5..f93880fb8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -54,12 +54,25 @@ package org.apache.tools.ant.taskdefs.optional.net; -import com.oroinc.net.ftp.*; -import java.io.*; -import java.net.*; -import java.util.*; -import org.apache.tools.ant.*; -import org.apache.tools.ant.types.*; + +import java.io.File; +import java.io.IOException; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.InputStream; +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.OutputStream; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; + +import java.util.Vector; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.FileScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.FileSet; /** * Basic FTP client that performs the following actions: diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index 251096ff0..c46d32f79 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -63,12 +63,12 @@ import java.io.FileInputStream; import java.io.IOException; //imported for the mail api -import javax.mail.Address; + import javax.mail.Session; import javax.mail.Message; -import javax.mail.BodyPart; -import javax.mail.Multipart; -import javax.mail.SendFailedException; + + + import javax.mail.MessagingException; import javax.mail.Transport; import javax.mail.internet.InternetAddress; @@ -84,10 +84,10 @@ import javax.activation.FileDataSource; // Ant imports import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.FileScanner; + import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.EnumeratedAttribute; + import org.apache.tools.ant.types.FileSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index 3388d0ef1..ae1a8acce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -57,13 +57,17 @@ package org.apache.tools.ant.taskdefs.optional.net; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; -import com.oroinc.net.telnet.*; -import org.apache.tools.ant.BuildException; -import java.io.*; -import java.lang.*; -import java.util.*; + + + + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import java.util.Vector; +import java.util.Enumeration; +import java.util.Calendar; /** * Class to provide automated telnet protocol support for the Ant build tool diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index 8a0472983..ae65a7654 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -61,7 +61,9 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.File; import java.util.Vector; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; /** P4Add - add the specified files to perforce. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 6450cf278..53263ea56 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -58,11 +58,12 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import java.io.*; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; -import org.apache.oro.text.perl.*; +import java.io.IOException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; +import org.apache.tools.ant.types.Commandline; +import org.apache.oro.text.perl.Perl5Util; /** Base class for Perforce (P4) ANT tasks. See individual task for example usage. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java index a5764820d..40cc38007 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java @@ -58,9 +58,10 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import java.io.*; -import org.apache.tools.ant.*; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** P4Change - grab a new changelist from Perforce. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java index de6c29653..f20c92e37 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java @@ -58,7 +58,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** P4Counter - Obtain or set the value of a counter. * P4Counter can be used to either print the value of a counter diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java index a4ea22ce5..7c432f8ed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; /** P4Delete - checkout file(s) for delete. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java index 4cb6439c7..36e287bf6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java @@ -58,7 +58,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; /** P4Edit - checkout file(s) for edit. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java index a17009871..00f63eac0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java @@ -54,8 +54,13 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import java.io.*; -import org.apache.tools.ant.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.InputStream; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.SequenceInputStream; +import org.apache.tools.ant.BuildException; public abstract class P4HandlerAdapter implements P4Handler { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java index b771f01f6..89771cce3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java @@ -58,7 +58,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; /** P4Have - lists files currently on client. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java index ef86dc70e..681b417c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java @@ -58,7 +58,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import java.util.Date; import java.text.SimpleDateFormat; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java index 8663f66b0..1a9eb2592 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java @@ -58,7 +58,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; /* P4Reopen - move files to a new changelist * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java index 57b2629dc..8d0b95402 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java @@ -58,7 +58,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; /* P4Revert - revert open files or files in a changelist * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java index 09444b76f..19a0c2740 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java @@ -58,7 +58,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** P4Submit - submit a numbered changelist to Perforce. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index 4a1563c6f..810e3dd81 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -58,7 +58,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** P4Sync - synchronise client space to a perforce depot view. * The API allows additional functionality of the "p4 sync" command diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java index c4b57a399..7bb964fe0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java @@ -58,7 +58,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; public class SimpleP4OutputHandler extends P4HandlerAdapter { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 67d11e4f0..725eaffea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -57,10 +57,18 @@ */ package org.apache.tools.ant.taskdefs.optional.pvcs; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.FileNotFoundException; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.BufferedWriter; +import java.io.FileWriter; import java.util.Enumeration; import java.util.Vector; -import java.text.*; +import java.text.ParseException; +import java.text.MessageFormat; import java.util.Random; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -105,17 +113,17 @@ public class Pvcs extends org.apache.tools.ant.Task { /** * Constant for the thing to execute */ - private static final String PCLI_EXE = "pcli"; + private final static String PCLI_EXE = "pcli"; /** * Constant for the PCLI listversionedfiles recursive i a format "get" understands */ - private static final String PCLI_LVF_ARGS = "lvf -z -aw"; + private final static String PCLI_LVF_ARGS = "lvf -z -aw"; /** * Constant for the thing to execute */ - private static final String GET_EXE = "get"; + private final static String GET_EXE = "get"; protected int runCmd(Commandline cmd, ExecuteStreamHandler out) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java index aceb5b8cb..1fb0ba30a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java @@ -56,7 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.pvcs; -import org.apache.tools.ant.Project; + /** * class to handle <pvcsprojec> elements diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index 5111b25df..983e8f1fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -54,11 +54,11 @@ */ package org.apache.tools.ant.taskdefs.optional.scm; -import com.starbase.starteam.*; + import com.starbase.util.Platform; -import java.io.*; -import java.util.*; -import org.apache.tools.ant.*; + +import java.util.StringTokenizer; +import org.apache.tools.ant.BuildException; /** * Checks out files from a specific StarTeam server, project, view, and @@ -116,7 +116,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getForceAsBoolean() * @see #setForce(String force) */ - static public final String DEFAULT_FORCESETTING = "false"; + public final static String DEFAULT_FORCESETTING = "false"; /** * This field is used in setting verbose to "false", the @@ -131,7 +131,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getVerboseAsBoolean() * @see #setVerbose(String verbose) */ - static public final String DEFAULT_VERBOSESETTING = "false"; + public final static String DEFAULT_VERBOSESETTING = "false"; /** * DEFAULT_RECURSIONSETTING contains the normal setting -- @@ -143,7 +143,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getRecursion() * @see #setRecursion(String recursion) */ - static public final String DEFAULT_RECURSIONSETTING = "true"; + public final static String DEFAULT_RECURSIONSETTING = "true"; /** * This constant sets the filter to include all files. This default has @@ -152,7 +152,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getIncludes() * @see #setIncludes(String includes) */ - static public final String DEFAULT_INCLUDESETTING = "*"; + public final static String DEFAULT_INCLUDESETTING = "*"; /** * This disables the exclude filter by default. In other words, no files @@ -162,7 +162,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getExcludes() * @see #setExcludes(String excludes) */ - static public final String DEFAULT_EXCLUDESETTING = null; + public final static String DEFAULT_EXCLUDESETTING = null; /** * The default folder to search; the root folder. Since @@ -172,7 +172,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task * @see #getFolderName() * @see #setFolderName(String folderName) */ - static public final String DEFAULT_FOLDERSETTING = null; + public final static String DEFAULT_FOLDERSETTING = null; /** * This is used when formatting the output. The directory name is diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index a1f0df2e9..70262cee2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -57,16 +57,17 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Path; + + import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.DirectoryScanner; import java.util.Vector; import java.util.Random; import java.io.File; -import java.io.FilenameFilter; + import java.io.FileWriter; import java.io.PrintWriter; import java.io.IOException; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index 8704cafa8..b7ac6d0f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -57,26 +57,31 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.*; +import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; + import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.DirectoryScanner; + + import java.util.Vector; import java.io.File; -import java.io.FilenameFilter; + import java.io.IOException; -import javax.xml.transform.*; -import javax.xml.transform.stream.*; -import javax.xml.transform.dom.*; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Result; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; -import org.apache.tools.ant.taskdefs.optional.depend.*; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*; -import java.io.*; + + + /** * Convenient task to run the snapshot merge utility for JProbe Coverage 3.0. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 7b7e74dcf..e0815fc4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -62,7 +62,7 @@ import java.io.OutputStream; import java.io.IOException; import java.util.Vector; import java.util.Random; -import java.util.Hashtable; + import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java index fd2eae1c3..46ea019ef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java @@ -105,7 +105,7 @@ public class Filters { return buf.toString(); } - public static abstract class FilterElement { + abstract public static class FilterElement { protected String clazz; protected String method = "*"; // default is all methods protected boolean enabled = true; // default is enable diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java index 4ded331fe..cf34e9ef3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java @@ -55,8 +55,9 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import java.util.Vector; -import java.util.Enumeration; -import org.apache.tools.ant.util.regexp.*; + +import org.apache.tools.ant.util.regexp.RegexpMatcher; +import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; /** * Filters information from coverage, somewhat similar to a FileSet. @@ -131,7 +132,7 @@ public class ReportFilters { /** default abstract filter element class */ - public static abstract class FilterElement { + abstract public static class FilterElement { protected String clazz = "*"; // default is all classes protected String method = "*"; // default is all methods diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 416eb56e7..f6c3bc0d9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java @@ -55,15 +55,29 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.*; -import javax.xml.transform.dom.*; -import javax.xml.transform.stream.*; - -import org.w3c.dom.*; -import org.xml.sax.*; -import java.io.*; -import java.util.*; -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.*; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.Hashtable; +import java.util.Enumeration; +import java.util.Vector; +import java.util.NoSuchElementException; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfoList; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils; import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java index 4635bea73..7fa657950 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java @@ -53,11 +53,17 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo; -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.SourceFile; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.SourceDir; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.LineNumberTable; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java index bd270faa8..4ff72749c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java @@ -53,9 +53,21 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ByteArrayInputStream; +import java.io.FilenameFilter; +import java.io.FileInputStream; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.zip.ZipFile; +import java.util.zip.ZipEntry; /** * Core of the bytecode analyzer. It loads classes from a given classpath. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java index 3510169be..c9ff2031b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfo.java @@ -53,12 +53,14 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*; + +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo; /** * field structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java index a89620f54..429699b2d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/FieldInfoList.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * field structure list diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java index 0469a3128..938fb4d63 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/InterfaceList.java @@ -53,9 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo; /** * list of interfaces implemented in a class. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java index 4bdf1b931..a7673b218 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java @@ -53,10 +53,15 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*; -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.*; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.Code; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.Exceptions; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfoList; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.LineNumberTable; /** * Method info structure. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java index 5afd256f1..5b63cc38e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfoList.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * A list of method_info structures. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java index 82a771b2f..092738762 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java @@ -54,7 +54,8 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; import java.util.Vector; /** @@ -64,31 +65,31 @@ import java.util.Vector; */ public class Utils { /** public access flag */ - public static final short ACC_PUBLIC = 1; + public final static short ACC_PUBLIC = 1; /** private access flag */ - public static final short ACC_PRIVATE = 2; + public final static short ACC_PRIVATE = 2; /** protected access flag */ - public static final short ACC_PROTECTED = 4; + public final static short ACC_PROTECTED = 4; /** static access flag */ - public static final short ACC_STATIC = 8; + public final static short ACC_STATIC = 8; /** final access flag */ - public static final short ACC_FINAL = 16; + public final static short ACC_FINAL = 16; /** super access flag */ - public static final short ACC_SUPER = 32; + public final static short ACC_SUPER = 32; /** synchronized access flag */ - public static final short ACC_SYNCHRONIZED = 32; + public final static short ACC_SYNCHRONIZED = 32; /** volatile access flag */ - public static final short ACC_VOLATILE = 64; + public final static short ACC_VOLATILE = 64; /** transient access flag */ - public static final short ACC_TRANSIENT = 128; + public final static short ACC_TRANSIENT = 128; /** native access flag */ - public static final short ACC_NATIVE = 256; + public final static short ACC_NATIVE = 256; /** interface access flag */ - public static final short ACC_INTERFACE = 512; + public final static short ACC_INTERFACE = 512; /** abstract access flag */ - public static final short ACC_ABSTRACT = 1024; + public final static short ACC_ABSTRACT = 1024; /** strict access flag */ - public static final short ACC_STRICT = 2048; + public final static short ACC_STRICT = 2048; /** private constructor */ private Utils(){ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java index 035a91b01..ebfddc987 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.*; -import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.*; +import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; +import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils; /** * Attribute info structure that provides base methods diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java index d9a4854b8..af270dee1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfoList.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * list of attributes diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java index b8e0a34c6..0e2488064 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Code.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * Code structure. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java index 0b60b74b7..db9b7adb6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/ConstantValue.java @@ -54,7 +54,8 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java index 55540b557..1d19461ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Deprecated.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; + import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * deprecated structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java index 7f1645e43..a0127f129 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Exceptions.java @@ -54,10 +54,10 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; + import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * exceptions structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java index 5a23667a4..9ab499323 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/InnerClasses.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; + import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * inner classes structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java index 0389de4b0..821cd35e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LineNumberTable.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * line number table structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java index 2b11b2229..2a9094bf2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/LocalVariableTable.java @@ -53,7 +53,8 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java index c80d80c65..8f1fd3f50 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceDir.java @@ -53,7 +53,8 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java index 31c44b18f..80991d73b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/SourceFile.java @@ -53,7 +53,8 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; +import java.io.IOException; +import java.io.DataInputStream; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java index 83c79ee79..7085de658 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Synthetic.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; + import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; -import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; + /** * synthetic structure diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java index 1e649f45c..146d5dd94 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/Unknown.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; -import java.io.*; + import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index b6327b119..899ee0e2d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -55,15 +55,27 @@ package org.apache.tools.ant.taskdefs.optional.sound; // ant includes -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildListener; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.BuildEvent; // imports for all the sound classes required // note: comes with jmf or jdk1.3 + // these can be obtained from http://java.sun.com/products/java-media/sound/ -import javax.sound.sampled.*; +import javax.sound.sampled.LineListener; +import javax.sound.sampled.Clip; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.UnsupportedAudioFileException; +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.LineEvent; +import javax.sound.sampled.Line; + +import java.io.File; +import java.io.IOException; -import java.io.*; -import java.util.*; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java index b185240a8..7e46d4a2b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java @@ -54,10 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.sound; -import org.apache.tools.ant.*; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.Project; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.Random; /** * This is an example of an AntTask that makes of use of the AntSoundPlayer. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index c483c2277..d6f7fc5cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -55,8 +55,10 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import java.io.File; -import org.apache.tools.ant.*; + +import org.apache.tools.ant.Task; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; @@ -193,56 +195,56 @@ public abstract class MSVSS extends Task { /** * Constant for the thing to execute */ - private static final String SS_EXE = "ss"; + private final static String SS_EXE = "ss"; /** */ - public static final String PROJECT_PREFIX = "$"; + public final static String PROJECT_PREFIX = "$"; /** * The 'Get' command */ - public static final String COMMAND_GET = "Get"; + public final static String COMMAND_GET = "Get"; /** * The 'Checkout' command */ - public static final String COMMAND_CHECKOUT = "Checkout"; + public final static String COMMAND_CHECKOUT = "Checkout"; /** * The 'Checkin' command */ - public static final String COMMAND_CHECKIN = "Checkin"; + public final static String COMMAND_CHECKIN = "Checkin"; /** * The 'Label' command */ - public static final String COMMAND_LABEL = "Label"; + public final static String COMMAND_LABEL = "Label"; /** * The 'History' command */ - public static final String COMMAND_HISTORY = "History"; + public final static String COMMAND_HISTORY = "History"; /** */ - public static final String FLAG_LOGIN = "-Y"; + public final static String FLAG_LOGIN = "-Y"; /** */ - public static final String FLAG_OVERRIDE_WORKING_DIR = "-GL"; + public final static String FLAG_OVERRIDE_WORKING_DIR = "-GL"; /** */ - public static final String FLAG_AUTORESPONSE_DEF = "-I-"; + public final static String FLAG_AUTORESPONSE_DEF = "-I-"; /** */ - public static final String FLAG_AUTORESPONSE_YES = "-I-Y"; + public final static String FLAG_AUTORESPONSE_YES = "-I-Y"; /** */ - public static final String FLAG_AUTORESPONSE_NO = "-I-N"; + public final static String FLAG_AUTORESPONSE_NO = "-I-N"; /** */ - public static final String FLAG_RECURSION = "-R"; + public final static String FLAG_RECURSION = "-R"; /** */ - public static final String FLAG_VERSION = "-V"; + public final static String FLAG_VERSION = "-V"; /** */ - public static final String FLAG_VERSION_DATE = "-Vd"; + public final static String FLAG_VERSION_DATE = "-Vd"; /** */ - public static final String FLAG_VERSION_LABEL = "-VL"; + public final static String FLAG_VERSION_LABEL = "-VL"; /** */ - public static final String FLAG_WRITABLE = "-W"; + public final static String FLAG_WRITABLE = "-W"; /** */ - public static final String VALUE_NO = "-N"; + public final static String VALUE_NO = "-N"; /** */ - public static final String VALUE_YES = "-Y"; + public final static String VALUE_YES = "-Y"; /** */ - public static final String FLAG_QUIET = "-O-"; + public final static String FLAG_QUIET = "-O-"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java index e605c8718..9f4b07025 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java index 9c81e4fba..9637e4895 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java index 81e7f5dc6..0c4db72cc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java index b34caa0f7..692412cf3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java @@ -54,12 +54,16 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.EnumeratedAttribute; import java.io.File; -import java.util.*; -import java.text.*; +import java.util.Date; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.text.ParseException; /** * Task to perform HISTORY commands to Microsoft Visual Source Safe. * @@ -82,11 +86,11 @@ public class MSVSSHISTORY extends MSVSS { private String m_Style = ""; private boolean m_Recursive = false; - public static final String VALUE_FROMDATE = "~d"; - public static final String VALUE_FROMLABEL = "~L"; + public final static String VALUE_FROMDATE = "~d"; + public final static String VALUE_FROMLABEL = "~L"; - public static final String FLAG_OUTPUT = "-O"; - public static final String FLAG_USER = "-U"; + public final static String FLAG_OUTPUT = "-O"; + public final static String FLAG_USER = "-U"; /** * Executes the task. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java index 7852ec87a..130e6a946 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; /** @@ -116,7 +116,7 @@ public class MSVSSLABEL extends MSVSS private String m_Version = null; private String m_Comment = "-"; - public static final String FLAG_LABEL = "-L"; + public final static String FLAG_LABEL = "-L"; /** * Executes the task. diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index ce68e333e..8c6dc8c1d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -54,10 +54,12 @@ package org.apache.tools.ant.taskdefs.rmic; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; -import org.apache.tools.ant.util.*; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Rmic; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.util.FileNameMapper; import java.io.File; import java.util.Random; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java index 4f3855475..7a249f606 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java @@ -56,10 +56,10 @@ package org.apache.tools.ant.taskdefs.rmic; 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.io.*; + import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java index fe694767d..d6e5d2319 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java @@ -56,7 +56,7 @@ package org.apache.tools.ant.taskdefs.rmic; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; + /** * Creates the necessary rmic adapter, given basic criteria. diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java index 9eeaa7e43..5ab10e890 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -59,7 +59,8 @@ import org.apache.tools.ant.Project; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java index cf118dde4..8e48ab7a3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java @@ -56,12 +56,12 @@ package org.apache.tools.ant.taskdefs.rmic; 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; /** diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index bbc3ddb8d..e4fe4f0f5 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -54,7 +54,9 @@ package org.apache.tools.ant.types; -import java.util.*; +import java.util.Properties; +import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java index 0a7f962a7..5eff47053 100644 --- a/src/main/org/apache/tools/ant/types/Description.java +++ b/src/main/org/apache/tools/ant/types/Description.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.Project; + /** * Description is used to provide a project-wide description element diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java index 5c9b77d4f..c07277ee4 100644 --- a/src/main/org/apache/tools/ant/types/FileList.java +++ b/src/main/org/apache/tools/ant/types/FileList.java @@ -60,7 +60,7 @@ import org.apache.tools.ant.Project; import java.io.File; import java.util.StringTokenizer; -import java.util.Enumeration; + import java.util.Stack; import java.util.Vector; diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java index efc3137d5..7269954a0 100644 --- a/src/main/org/apache/tools/ant/types/FilterSet.java +++ b/src/main/org/apache/tools/ant/types/FilterSet.java @@ -67,7 +67,7 @@ import java.util.Vector; // ant classes import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; + /** * A set of filters to be applied to something. @@ -171,10 +171,10 @@ public class FilterSet extends DataType { } /** The default token start string */ - public static final String DEFAULT_TOKEN_START = "@"; + public final static String DEFAULT_TOKEN_START = "@"; /** The default token end string */ - public static final String DEFAULT_TOKEN_END = "@"; + public final static String DEFAULT_TOKEN_END = "@"; private String startOfToken = DEFAULT_TOKEN_START; private String endOfToken = DEFAULT_TOKEN_END; diff --git a/src/main/org/apache/tools/ant/types/FilterSetCollection.java b/src/main/org/apache/tools/ant/types/FilterSetCollection.java index e521a26bc..7defa94c0 100644 --- a/src/main/org/apache/tools/ant/types/FilterSetCollection.java +++ b/src/main/org/apache/tools/ant/types/FilterSetCollection.java @@ -54,20 +54,20 @@ package org.apache.tools.ant.types; // java io classes -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; + + + // java util classes import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Properties; + + import java.util.Vector; // ant classes -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; + + + /** * A FilterSetCollection is a collection of filtersets each of which may have diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java index af107dd74..788ae9364 100644 --- a/src/main/org/apache/tools/ant/types/Mapper.java +++ b/src/main/org/apache/tools/ant/types/Mapper.java @@ -57,7 +57,7 @@ package org.apache.tools.ant.types; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.*; +import org.apache.tools.ant.util.FileNameMapper; import java.util.Properties; import java.util.Stack; diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index d8a842b79..ed0106b8b 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -60,13 +60,13 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.PathTokenizer; import java.io.File; -import java.io.IOException; + import java.util.Enumeration; -import java.util.StringTokenizer; + import java.util.Stack; import java.util.Vector; -import java.text.CharacterIterator; -import java.text.StringCharacterIterator; + + /** * This object represents a path as used by CLASSPATH or PATH diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java index 174757e6e..ff39e5a3f 100644 --- a/src/main/org/apache/tools/ant/types/PatternSet.java +++ b/src/main/org/apache/tools/ant/types/PatternSet.java @@ -58,7 +58,10 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.BuildException; -import java.io.*; +import java.io.File; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; import java.util.Enumeration; import java.util.Stack; import java.util.StringTokenizer; diff --git a/src/main/org/apache/tools/ant/types/RegularExpression.java b/src/main/org/apache/tools/ant/types/RegularExpression.java index 912f2c929..d38609ee7 100644 --- a/src/main/org/apache/tools/ant/types/RegularExpression.java +++ b/src/main/org/apache/tools/ant/types/RegularExpression.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.types; -import java.util.Hashtable; + import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -96,10 +96,10 @@ import org.apache.tools.ant.util.regexp.RegexpFactory; */ public class RegularExpression extends DataType { - public static final String DATA_TYPE_NAME = "regularexpression"; + public final static String DATA_TYPE_NAME = "regularexpression"; // The regular expression factory - private static final RegexpFactory factory = new RegexpFactory(); + private final static RegexpFactory factory = new RegexpFactory(); private Regexp regexp; diff --git a/src/main/org/apache/tools/ant/types/Substitution.java b/src/main/org/apache/tools/ant/types/Substitution.java index ebb817ac5..1e3bdcf25 100644 --- a/src/main/org/apache/tools/ant/types/Substitution.java +++ b/src/main/org/apache/tools/ant/types/Substitution.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.types; -import java.util.Hashtable; + import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -74,7 +74,7 @@ import org.apache.tools.ant.types.DataType; */ public class Substitution extends DataType { - public static final String DATA_TYPE_NAME = "substitition"; + public final static String DATA_TYPE_NAME = "substitition"; private String expression; diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java index 45d074ce5..785dc0b90 100644 --- a/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.types; import java.io.File; -import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java index 2b520e8c8..107348a75 100644 --- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java +++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java @@ -54,8 +54,14 @@ package org.apache.tools.ant.util; -import java.io.*; -import org.w3c.dom.*; +import java.io.IOException; +import java.io.Writer; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Attr; +import org.w3c.dom.NodeList; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * Writes a DOM tree to a given Writer. diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 2908bcd5a..ad5867f26 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -54,7 +54,14 @@ package org.apache.tools.ant.util; -import java.io.*; +import java.io.IOException; +import java.io.File; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.lang.reflect.Method; import java.util.StringTokenizer; import java.util.Stack; diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java index 8ec4f4d14..694ff624d 100644 --- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java @@ -58,7 +58,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.regexp.RegexpMatcher; import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; -import java.util.Enumeration; + import java.util.Vector; /** diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java index 866bdf6db..4b9249f7b 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java @@ -59,8 +59,8 @@ import org.apache.oro.text.regex.MatchResult; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.Perl5Compiler; import org.apache.oro.text.regex.Perl5Matcher; -import org.apache.oro.text.regex.Perl5Pattern; -import org.apache.oro.text.regex.Util; + + import java.util.Vector; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java index 6534fba4a..35908e26a 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java @@ -58,7 +58,7 @@ import org.apache.oro.text.regex.Perl5Substitution; import org.apache.oro.text.regex.Substitution; import org.apache.oro.text.regex.Util; -import java.util.Vector; + /*** * Regular expression implementation using the Jakarta Oro package diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java index c456713c2..6b70ab984 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -54,7 +54,8 @@ package org.apache.tools.ant.util.regexp; -import org.apache.regexp.*; +import org.apache.regexp.RE; +import org.apache.regexp.RESyntaxException; import org.apache.tools.ant.BuildException; import java.util.Vector; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java index ff872c425..5de2bcf81 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -55,7 +55,7 @@ package org.apache.tools.ant.util.regexp; import org.apache.tools.ant.BuildException; -import org.apache.regexp.*; +import org.apache.regexp.RE; import java.util.Vector; /*** diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java index 4f0893d24..5902b3027 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -55,10 +55,10 @@ package org.apache.tools.ant.util.regexp; import org.apache.tools.ant.BuildException; -import java.util.Vector; + import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; + /*** * Regular expression implementation using the JDK 1.4 regular expression package diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index 26585c108..9bcf27802 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -58,9 +58,15 @@ package org.apache.tools.mail; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintStream; +import java.io.BufferedOutputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.InetAddress; +import java.util.Vector; +import java.util.Hashtable; +import java.util.Enumeration; /** * A class to help send SMTP email. diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java index 1d9076771..a2a8f450c 100644 --- a/src/main/org/apache/tools/mail/SmtpResponseReader.java +++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java @@ -50,7 +50,10 @@ package org.apache.tools.mail; -import java.io.*; +import java.io.InputStream; +import java.io.IOException; +import java.io.BufferedReader; +import java.io.InputStreamReader; /** * A wrapper around the raw input from the SMTP server that assembles diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java index 5059b8f64..febee0921 100644 --- a/src/main/org/apache/tools/tar/TarBuffer.java +++ b/src/main/org/apache/tools/tar/TarBuffer.java @@ -59,7 +59,9 @@ package org.apache.tools.tar; -import java.io.*; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.IOException; /** * The TarBuffer class implements the tar archive concept @@ -77,8 +79,8 @@ import java.io.*; public class TarBuffer { - public static final int DEFAULT_RCDSIZE = (512); - public static final int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20); + public final static int DEFAULT_RCDSIZE = (512); + public final static int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20); private InputStream inStream; private OutputStream outStream; diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index 73b93210b..8ba2f29ff 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -59,8 +59,8 @@ package org.apache.tools.tar; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.Date; /** * This class represents an entry in a Tar archive. It consists diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java index 00ad9c31e..744551634 100644 --- a/src/main/org/apache/tools/tar/TarInputStream.java +++ b/src/main/org/apache/tools/tar/TarInputStream.java @@ -59,7 +59,10 @@ package org.apache.tools.tar; -import java.io.*; +import java.io.FilterInputStream; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; /** * The TarInputStream reads a UNIX tar archive as an InputStream. diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java index 29fba410b..271c52b90 100644 --- a/src/main/org/apache/tools/tar/TarOutputStream.java +++ b/src/main/org/apache/tools/tar/TarOutputStream.java @@ -59,7 +59,9 @@ package org.apache.tools.tar; -import java.io.*; +import java.io.FilterOutputStream; +import java.io.OutputStream; +import java.io.IOException; /** * The TarOutputStream writes a UNIX tar archive as an OutputStream. @@ -69,9 +71,9 @@ import java.io.*; * @author Timothy Gerard Endres time@ice.com */ public class TarOutputStream extends FilterOutputStream { - static public final int LONGFILE_ERROR = 0; - static public final int LONGFILE_TRUNCATE = 1; - static public final int LONGFILE_GNU = 2; + public final static int LONGFILE_ERROR = 0; + public final static int LONGFILE_TRUNCATE = 1; + public final static int LONGFILE_GNU = 2; protected boolean debug; protected int currSize; diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index 086235284..733fb43ac 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -54,7 +54,9 @@ package org.apache.tools.zip; -import java.io.*; +import java.io.OutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.Hashtable; import java.util.Vector; @@ -157,14 +159,14 @@ public class ZipOutputStream extends DeflaterOutputStream { * * @since 1.1 */ - private static final byte[] ZERO = {0, 0}; + private final static byte[] ZERO = {0, 0}; /** * Helper, a 0 as ZipLong. * * @since 1.1 */ - private static final byte[] LZERO = {0, 0, 0, 0}; + private final static byte[] LZERO = {0, 0, 0, 0}; /** * Holds the offsets of the LFH starts for each entry @@ -189,14 +191,14 @@ public class ZipOutputStream extends DeflaterOutputStream { * * @since 1.1 */ - public static final int DEFLATED = ZipEntry.DEFLATED; + public final static int DEFLATED = ZipEntry.DEFLATED; /** * Compression method for deflated entries. * * @since 1.1 */ - public static final int STORED = ZipEntry.STORED; + public final static int STORED = ZipEntry.STORED; /** * Creates a new ZIP OutputStream filtering the underlying stream. @@ -390,25 +392,25 @@ public class ZipOutputStream extends DeflaterOutputStream { * * @since 1.1 */ - protected static final ZipLong LFH_SIG = new ZipLong(0X04034B50L); + protected final static ZipLong LFH_SIG = new ZipLong(0X04034B50L); /** * data descriptor signature * * @since 1.1 */ - protected static final ZipLong DD_SIG = new ZipLong(0X08074B50L); + protected final static ZipLong DD_SIG = new ZipLong(0X08074B50L); /** * central file header signature * * @since 1.1 */ - protected static final ZipLong CFH_SIG = new ZipLong(0X02014B50L); + protected final static ZipLong CFH_SIG = new ZipLong(0X02014B50L); /** * end of central dir signature * * @since 1.1 */ - protected static final ZipLong EOCD_SIG = new ZipLong(0X06054B50L); + protected final static ZipLong EOCD_SIG = new ZipLong(0X06054B50L); /** * Writes the local file header entry @@ -619,7 +621,7 @@ public class ZipOutputStream extends DeflaterOutputStream { * * @since 1.1 */ - private static final ZipLong DOS_TIME_MIN = new ZipLong(0x00002100L); + private final static ZipLong DOS_TIME_MIN = new ZipLong(0x00002100L); /** * Convert a Date object to a DOS date/time field.