ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [4/4] git commit: fix bogus imports
Date Sat, 12 Jul 2014 16:25:42 GMT
fix bogus imports


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/66c2551a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/66c2551a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/66c2551a

Branch: refs/heads/master
Commit: 66c2551a594f3e5498c623ca1ad5285c4ccaf11c
Parents: df33426
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sat Jul 12 18:25:16 2014 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sat Jul 12 18:25:16 2014 +0200

----------------------------------------------------------------------
 .../tools/ant/filters/util/JavaClassHelper.java       |  8 ++++----
 .../tools/ant/util/depend/bcel/AncestorAnalyzer.java  |  6 ++----
 .../tools/ant/util/depend/bcel/DependencyVisitor.java | 14 +++++++-------
 .../tools/ant/util/depend/bcel/FullAnalyzer.java      |  8 +++-----
 .../tools/ant/util/regexp/JakartaRegexpMatcher.java   |  6 ++----
 .../tools/ant/util/regexp/JakartaRegexpRegexp.java    |  4 +---
 6 files changed, 19 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java
----------------------------------------------------------------------
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 e01c2df..b0c67ce 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
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
----------------------------------------------------------------------
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 3a9fb3e..2bd2a6c 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
----------------------------------------------------------------------
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 38bb728..d31d453 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

http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
----------------------------------------------------------------------
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 555e9b3..f270fd4 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.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
----------------------------------------------------------------------
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 ab7674b..3e14415 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.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/66c2551a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
----------------------------------------------------------------------
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 50493a2..865f424 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
  */


Mime
View raw message