- Revision
- 1326
- Author
- rfscholte
- Date
- 2011-09-10 16:14:10 -0500 (Sat, 10 Sep 2011)
Log Message
Update FAQ-entry "Can I have full control over the classloader?" which exposed a flow in the code. Fixed that too.
Modified Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java (1325 => 1326)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java 2011-09-10 20:57:20 UTC (rev 1325) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java 2011-09-10 21:14:10 UTC (rev 1326) @@ -72,6 +72,7 @@ public JavaProjectBuilder() { this.classLibraryBuilder = new SortedClassLibraryBuilder(); + classLibraryBuilder.appendDefaultClassLoaders(); } /**
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SortedClassLibraryBuilder.java (1325 => 1326)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SortedClassLibraryBuilder.java 2011-09-10 20:57:20 UTC (rev 1325) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SortedClassLibraryBuilder.java 2011-09-10 21:14:10 UTC (rev 1326) @@ -48,7 +48,6 @@ { classNameLibrary = new ClassNameLibrary(); classLoaderLibrary = new ClassLoaderLibrary( classNameLibrary ); - classLoaderLibrary.addDefaultLoader(); sourceFolderLibrary = new SourceFolderLibrary( classLoaderLibrary ); sourceLibrary = new SourceLibrary( sourceFolderLibrary ); }
Modified: trunk/qdox/src/site/fml/faq.fml (1325 => 1326)
--- trunk/qdox/src/site/fml/faq.fml 2011-09-10 20:57:20 UTC (rev 1325) +++ trunk/qdox/src/site/fml/faq.fml 2011-09-10 21:14:10 UTC (rev 1326) @@ -28,16 +28,16 @@ <question>Can I have full control over the classloader?</question> <answer> <p> - I some cases QDox is used to generate classes for another project with it's own dependencies. This could result in class-collission. + I some cases QDox is used to generate classes for another project with it's own dependencies. This could result in class-collision. By default the JavadocBuilder will contain the classloader(s) of the current project, but by defining your own classLibrary you can have the required control. <source> /* new ClassLibrary() will give you an empty classLoader * Big chance you want at least the system classloader. - */ - ClassLibrary classLibrary = new ClassLibrary( ClassLoader.getSystemClassLoader() ); - JavaDocBuilder builder = new JavaDocBuilder(classLibrary); - + */ + ClassLibraryBuilder libraryBuilder = new SortedClassLibraryBuilder(); //or OrderedClassLibraryBuilder() + libraryBuilder.addClassLoader( ClassLoader.getSystemClassLoader() ); + JavaProjectBuilder builder = new JavaProjectBuilder( libraryBuilder ); </source> </p> </answer>
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaSourceTest.java (1325 => 1326)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaSourceTest.java 2011-09-10 20:57:20 UTC (rev 1325) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaSourceTest.java 2011-09-10 21:14:10 UTC (rev 1326) @@ -36,7 +36,7 @@ protected void setUp() throws Exception { super.setUp(); - source = newJavaSource(new SortedClassLibraryBuilder().getClassLibrary()); + source = newJavaSource(new SortedClassLibraryBuilder().appendDefaultClassLoaders().getClassLibrary()); } public void testToStringOneClass() throws Exception {
To unsubscribe from this list please visit:
