You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2004/09/18 22:30:59 UTC
cvs commit: jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect ClassFinder.java
sebb 2004/09/18 13:30:59
Modified: src/jorphan/org/apache/jorphan/reflect Tag: rel-2_0
ClassFinder.java
Log:
Bug30917 - ignore duplicated classes
Revision Changes Path
No revision
No revision
1.9.2.1 +16 -15 jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Index: ClassFinder.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- ClassFinder.java 11 Feb 2004 23:57:23 -0000 1.9
+++ ClassFinder.java 18 Sep 2004 20:30:59 -0000 1.9.2.1
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import java.util.TreeSet;
import java.util.zip.ZipFile;
import org.apache.jorphan.logging.LoggingManager;
@@ -107,7 +108,7 @@
throws IOException, ClassNotFoundException
{
List listPaths = null;
- ArrayList listClasses = null;
+ Set listClasses = null;
List listSuperClasses = null;
strPathsOrJars = addJarsInPath(strPathsOrJars);
if (log.isDebugEnabled())
@@ -126,7 +127,7 @@
log.debug("listPaths : " + tIter.next());
}
}
- listClasses = new ArrayList();
+ listClasses = new TreeSet();
listSuperClasses = new ArrayList();
for (int i = 0; i < superClasses.length; i++)
{
@@ -142,9 +143,9 @@
log.debug("listClasses : " + tIter.next());
}
}
- List subClassList =
+ Set subClassList =
findAllSubclasses(listSuperClasses, listClasses, innerClasses);
- return subClassList;
+ return new ArrayList(subClassList);
}
private static List getClasspathMatches(String[] strPathsOrJars)
@@ -369,16 +370,16 @@
* the search
*@return ArrayList of the subclasses
*/
- private static ArrayList findAllSubclasses(
+ private static Set findAllSubclasses(
List listSuperClasses,
- List listAllClasses,
+ Set listAllClasses,
boolean innerClasses)
{
Iterator iterClasses = null;
- ArrayList listSubClasses = null;
+ Set listSubClasses = null;
String strClassName = null;
Class tempClass = null;
- listSubClasses = new ArrayList();
+ listSubClasses = new TreeSet();
iterClasses = listSuperClasses.iterator();
while (iterClasses.hasNext())
{
@@ -445,8 +446,8 @@
*/
private static void findAllSubclassesOneClass(
Class theClass,
- List listAllClasses,
- List listSubClasses,
+ Set listAllClasses,
+ Set listSubClasses,
boolean innerClasses)
{
Iterator iterClasses = null;
@@ -507,7 +508,7 @@
return strClassName;
}
- private static void findClassesInOnePath(String strPath, List listClasses)
+ private static void findClassesInOnePath(String strPath, Set listClasses)
throws IOException
{
File file = null;
@@ -534,7 +535,7 @@
}
}
- private static void findClassesInPaths(List listPaths, List listClasses)
+ private static void findClassesInPaths(List listPaths, Set listClasses)
throws IOException
{
Iterator iterPaths = listPaths.iterator();
@@ -547,7 +548,7 @@
private static void findClassesInPathsDir(
String strPathElement,
File dir,
- List listClasses)
+ Set listClasses)
throws IOException
{
File file = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org