- Revision
- 1334
- Author
- rfscholte
- Date
- 2011-09-21 15:43:48 -0500 (Wed, 21 Sep 2011)
Log Message
Let AbstractClassLibrary use Collections, since we can't always guarantee the order
Modified Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java (1333 => 1334)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java 2011-09-21 20:27:08 UTC (rev 1333) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java 2011-09-21 20:43:48 UTC (rev 1334) @@ -20,6 +20,7 @@ */ import java.net.URL; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -130,7 +131,7 @@ */ protected abstract JavaClass resolveJavaClass( String name ); - public List<JavaSource> getJavaSources() + public Collection<JavaSource> getJavaSources() { return context.getSources(); } @@ -141,7 +142,7 @@ * @param filter * @return JavaSources matching the filter */ - protected final List<JavaSource> getJavaSources( ClassLibraryFilter filter) { + protected final Collection<JavaSource> getJavaSources( ClassLibraryFilter filter) { List<JavaSource> result = new LinkedList<JavaSource>(); if(filter.accept(this)) { result.addAll( context.getSources() ); @@ -171,7 +172,7 @@ * * @return all JavaClasses of this ClassLibrary */ - public List<JavaClass> getJavaClasses() + public Collection<JavaClass> getJavaClasses() { return context.getClasses(); } @@ -182,7 +183,7 @@ * @param filter * @return JavaClasses matching the filter */ - protected final List<JavaClass> getJavaClasses( ClassLibraryFilter filter) { + protected final Collection<JavaClass> getJavaClasses( ClassLibraryFilter filter) { List<JavaClass> result = new LinkedList<JavaClass>(); if(filter.accept(this)) { result.addAll( context.getClasses() ); @@ -212,7 +213,7 @@ * * @return all JavaPackages of this ClassLibrary */ - public List<JavaPackage> getJavaPackages() + public Collection<JavaPackage> getJavaPackages() { return context.getPackages(); } @@ -237,7 +238,7 @@ protected abstract JavaPackage resolveJavaPackage(String name); - protected final List<JavaPackage> getJavaPackages( ClassLibraryFilter filter) { + protected final Collection<JavaPackage> getJavaPackages( ClassLibraryFilter filter) { List<JavaPackage> result = new LinkedList<JavaPackage>(); if( filter.accept( this ) ) { result.addAll( context.getPackages() );
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java (1333 => 1334)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java 2011-09-21 20:27:08 UTC (rev 1333) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java 2011-09-21 20:43:48 UTC (rev 1334) @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -312,11 +313,11 @@ * Get all classes, including those from parent SourceLibraries */ @Override - public List<JavaClass> getJavaClasses() + public Collection<JavaClass> getJavaClasses() { List<JavaClass> result = new LinkedList<JavaClass>(); List<JavaClass> unusedClasses = context.getClasses(); - List<JavaClass> usedClasses = getJavaClasses( new ClassLibraryFilter() + Collection<JavaClass> usedClasses = getJavaClasses( new ClassLibraryFilter() { public boolean accept( AbstractClassLibrary classLibrary ) { @@ -332,11 +333,11 @@ * Get all packages, including those from parent SourceLibraries */ @Override - public List<JavaPackage> getJavaPackages() + public Collection<JavaPackage> getJavaPackages() { List<JavaPackage> result = new LinkedList<JavaPackage>(); List<JavaPackage> unusedPackages = context.getPackages(); - List<JavaPackage> usedPackages = getJavaPackages( new ClassLibraryFilter() + Collection<JavaPackage> usedPackages = getJavaPackages( new ClassLibraryFilter() { public boolean accept( AbstractClassLibrary classLibrary ) { @@ -352,11 +353,11 @@ * Get all sources, including those from parent SourceLibraries */ @Override - public List<JavaSource> getJavaSources() + public Collection<JavaSource> getJavaSources() { List<JavaSource> result = new LinkedList<JavaSource>(); List<JavaSource> unusedSources = context.getSources(); - List<JavaSource> usedSources = getJavaSources( new ClassLibraryFilter() + Collection<JavaSource> usedSources = getJavaSources( new ClassLibraryFilter() { public boolean accept( AbstractClassLibrary classLibrary ) {
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java (1333 => 1334)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java 2011-09-21 20:27:08 UTC (rev 1333) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java 2011-09-21 20:43:48 UTC (rev 1334) @@ -1,6 +1,7 @@ package com.thoughtworks.qdox.library; -import java.util.List; +import java.util.Collection; +import java.util.Iterator; import junit.framework.TestCase; @@ -103,24 +104,25 @@ parentClassLibrary.getJavaClass( "ParentClass" ); filledChildClassLibrary.getJavaClass( "ChildClass" ); - List<JavaClass> parentClasses = parentClassLibrary.getJavaClasses( new AbstractClassLibrary.ClassLibraryFilter(){ + Collection<JavaClass> parentClasses = parentClassLibrary.getJavaClasses( new AbstractClassLibrary.ClassLibraryFilter(){ public boolean accept(AbstractClassLibrary classLibrary) { return true; }; } ); assertEquals(1, parentClasses.size()); - assertEquals( "ParentClass", parentClasses.get(0).getFullyQualifiedName() ); + assertEquals( "ParentClass", parentClasses.iterator().next().getFullyQualifiedName() ); - List<JavaClass> filledClasses = filledChildClassLibrary.getJavaClasses(new AbstractClassLibrary.ClassLibraryFilter(){ + Collection<JavaClass> filledClasses = filledChildClassLibrary.getJavaClasses(new AbstractClassLibrary.ClassLibraryFilter(){ public boolean accept(AbstractClassLibrary classLibrary) { return true; }; } ); assertEquals(2, filledClasses.size() ); - assertEquals( "ChildClass", filledClasses.get(0).getFullyQualifiedName() ); - assertEquals( "ParentClass", filledClasses.get(1).getFullyQualifiedName() ); + Iterator<JavaClass> iter = filledClasses.iterator(); + assertEquals( "ChildClass", iter.next().getFullyQualifiedName() ); + assertEquals( "ParentClass", iter.next().getFullyQualifiedName() ); - List<JavaClass> emptyClasses = emptyChildClassLibrary.getJavaClasses(new AbstractClassLibrary.ClassLibraryFilter(){ + Collection<JavaClass> emptyClasses = emptyChildClassLibrary.getJavaClasses(new AbstractClassLibrary.ClassLibraryFilter(){ public boolean accept(AbstractClassLibrary classLibrary) { return true; }; } ); assertEquals(1, emptyClasses.size() ); - assertEquals( "ParentClass", emptyClasses.get(0).getFullyQualifiedName() ); + assertEquals( "ParentClass", emptyClasses.iterator().next().getFullyQualifiedName() ); }
To unsubscribe from this list please visit:
