You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/03/03 03:54:20 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/importscrubber ClassParserWrapper.java TreeMapListener.java
jvanzyl 02/03/02 18:54:20
Modified: src/java/org/apache/maven/importscrubber
ClassParserWrapper.java TreeMapListener.java
Log:
Allow the ClassParserWrapper to take an InputStream so that classes inside
JAR files can be examined.
Add property to get the tree map collected by the TreeMapListener.
Revision Changes Path
1.5 +11 -4 jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/ClassParserWrapper.java
Index: ClassParserWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/ClassParserWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassParserWrapper.java 2 Mar 2002 17:57:00 -0000 1.4
+++ ClassParserWrapper.java 3 Mar 2002 02:54:20 -0000 1.5
@@ -58,6 +58,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -257,10 +258,16 @@
}
}
- public static void parse(File file, IReferenceFoundListener aListener) throws IOException, FileNotFoundException
+ public static void parse(File file, IReferenceFoundListener aListener)
+ throws IOException, FileNotFoundException
{
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
- ClassParser parser = new ClassParser(bis, "hello");
+ parse(new BufferedInputStream(new FileInputStream(file)), aListener);
+ }
+
+ public static void parse(InputStream is, IReferenceFoundListener aListener)
+ throws IOException
+ {
+ ClassParser parser = new ClassParser(is, "hello");
JavaClass clazz = parser.parse();
ConstantPool pool = clazz.getConstantPool();
@@ -272,7 +279,7 @@
excluded.add(new Integer(((ConstantString) pool.getConstant(i)).getStringIndex()));
}
}
- bis.close();
+ is.close();
ClassRefVisitor visitor = new ClassRefVisitor(pool, aListener, excluded);
DescendingVisitor vehicle = new DescendingVisitor(clazz, visitor);
vehicle.visit();
1.2 +5 -0 jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/TreeMapListener.java
Index: TreeMapListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/TreeMapListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TreeMapListener.java 2 Mar 2002 19:24:10 -0000 1.1
+++ TreeMapListener.java 3 Mar 2002 02:54:20 -0000 1.2
@@ -65,6 +65,11 @@
{
classReferences.put(className, className);
}
+
+ public TreeMap getTreeMap()
+ {
+ return classReferences;
+ }
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>