Code clean up:

 - removed useless/duplicate imports
 - added explicit imports rather than *
 - changed specifiers order to be conform to JLS.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269827 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 23 deletions

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index 7d6c0d09f..c72465bc1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -54,15 +54,20 @@
 
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.util.Hashtable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.URL;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.AttributeList;
 
-import org.apache.tools.ant.*;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
 
 /**
  * Inner class used by EjbJar to facilitate the parsing of deployment
@@ -73,12 +78,12 @@ import org.apache.tools.ant.*;
  * list can then be accessed through the getFiles() method.
  */
 public class DescriptorHandler extends org.xml.sax.HandlerBase {
-    static private final int STATE_LOOKING_EJBJAR = 1;
-    static private final int STATE_IN_EJBJAR = 2;
-    static private final int STATE_IN_BEANS = 3;
-    static private final int STATE_IN_SESSION = 4;
-    static private final int STATE_IN_ENTITY = 5;
-    static private final int STATE_IN_MESSAGE = 6;
+    private final static int STATE_LOOKING_EJBJAR = 1;
+    private final static int STATE_IN_EJBJAR = 2;
+    private final static int STATE_IN_BEANS = 3;
+    private final static int STATE_IN_SESSION = 4;
+    private final static int STATE_IN_ENTITY = 5;
+    private final static int STATE_IN_MESSAGE = 6;
 
     private Task owningTask;
 
@@ -88,19 +93,19 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase {
      * Bunch of constants used for storing entries in a hashtable, and for
      * constructing the filenames of various parts of the ejb jar.
      */
-    private static final String EJB_REF               = "ejb-ref";
-    private static final String HOME_INTERFACE        = "home";
-    private static final String REMOTE_INTERFACE      = "remote";
-    private static final String LOCAL_HOME_INTERFACE  = "local-home";
-    private static final String LOCAL_INTERFACE       = "local";
-    private static final String BEAN_CLASS            = "ejb-class";
-    private static final String PK_CLASS              = "prim-key-class";
-    private static final String EJB_NAME              = "ejb-name";
-    private static final String EJB_JAR               = "ejb-jar";
-    private static final String ENTERPRISE_BEANS      = "enterprise-beans";
-    private static final String ENTITY_BEAN           = "entity";
-    private static final String SESSION_BEAN          = "session";
-    private static final String MESSAGE_BEAN          = "message-driven";
+    private final static String EJB_REF               = "ejb-ref";
+    private final static String HOME_INTERFACE        = "home";
+    private final static String REMOTE_INTERFACE      = "remote";
+    private final static String LOCAL_HOME_INTERFACE  = "local-home";
+    private final static String LOCAL_INTERFACE       = "local";
+    private final static String BEAN_CLASS            = "ejb-class";
+    private final static String PK_CLASS              = "prim-key-class";
+    private final static String EJB_NAME              = "ejb-name";
+    private final static String EJB_JAR               = "ejb-jar";
+    private final static String ENTERPRISE_BEANS      = "enterprise-beans";
+    private final static String ENTITY_BEAN           = "entity";
+    private final static String SESSION_BEAN          = "session";
+    private final static String MESSAGE_BEAN          = "message-driven";
 
     /**
      * The state of the parsing