From 66c2551a594f3e5498c623ca1ad5285c4ccaf11c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 12 Jul 2014 18:25:16 +0200 Subject: [PATCH] fix bogus imports --- .../tools/ant/filters/util/JavaClassHelper.java | 8 ++++---- .../ant/util/depend/bcel/AncestorAnalyzer.java | 6 ++---- .../ant/util/depend/bcel/DependencyVisitor.java | 14 +++++++------- .../tools/ant/util/depend/bcel/FullAnalyzer.java | 8 +++----- .../ant/util/regexp/JakartaRegexpMatcher.java | 6 ++---- .../tools/ant/util/regexp/JakartaRegexpRegexp.java | 4 +--- 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java index e01c2df8a..b0c67ce2d 100644 --- a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java +++ b/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 /** diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java index 3a9fb3e5c..2bd2a6cf6 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java index 38bb72867..d31d45349 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java index 555e9b328..f270fd48e 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java +++ b/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. * 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 ab7674b69..3e14415d7 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/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. * 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 50493a249..865f424a1 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/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 */