fix bogus imports

src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java

@@ -20,10 +20,10 @@ package org.apache.tools.ant.filters.util;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.sun.org.apache.bcel.internal.classfile.ClassParser;
-import com.sun.org.apache.bcel.internal.classfile.ConstantValue;
-import com.sun.org.apache.bcel.internal.classfile.Field;
-import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.ConstantValue;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
 
 // CheckStyle:HideUtilityClassConstructorCheck OFF - bc
 /**

src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java

@@ -21,13 +21,11 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
-
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.JavaClass;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.depend.AbstractAnalyzer;
 
-import com.sun.org.apache.bcel.internal.classfile.ClassParser;
-import com.sun.org.apache.bcel.internal.classfile.JavaClass;
-
 /**
  * A dependency analyzer which returns superclass and superinterface
  * dependencies.

src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java

@@ -21,13 +21,13 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
 
-import com.sun.org.apache.bcel.internal.classfile.ConstantClass;
-import com.sun.org.apache.bcel.internal.classfile.ConstantNameAndType;
-import com.sun.org.apache.bcel.internal.classfile.ConstantPool;
-import com.sun.org.apache.bcel.internal.classfile.EmptyVisitor;
-import com.sun.org.apache.bcel.internal.classfile.Field;
-import com.sun.org.apache.bcel.internal.classfile.JavaClass;
-import com.sun.org.apache.bcel.internal.classfile.Method;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.EmptyVisitor;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
 
 /**
  * A BCEL visitor implementation to collect class dependency information

src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java

@@ -21,14 +21,12 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
-
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.DescendingVisitor;
+import org.apache.bcel.classfile.JavaClass;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.depend.AbstractAnalyzer;
 
-import com.sun.org.apache.bcel.internal.classfile.ClassParser;
-import com.sun.org.apache.bcel.internal.classfile.DescendingVisitor;
-import com.sun.org.apache.bcel.internal.classfile.JavaClass;
-
 /**
  * An analyzer capable fo traversing all class - class relationships.
  *

src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java

@@ -19,12 +19,10 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
-
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
 import org.apache.tools.ant.BuildException;
 
-import com.sun.org.apache.regexp.internal.RE;
-import com.sun.org.apache.regexp.internal.RESyntaxException;
-
 /**
  * Implementation of RegexpMatcher for Jakarta-Regexp.
  *

src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java

@@ -18,11 +18,9 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
-
+import org.apache.regexp.RE;
 import org.apache.tools.ant.BuildException;
 
-import com.sun.org.apache.regexp.internal.RE;
-
 /***
  * Regular expression implementation using the Jakarta Regexp package
  */