- Revision
- 1152
- Author
- rfscholte
- Date
- 2011-04-06 15:45:29 -0500 (Wed, 06 Apr 2011)
Log Message
JavaConstructor usage activated in ModelBuilder
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1151 => 1152)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-04-06 20:32:21 UTC (rev 1151) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-04-06 20:45:29 UTC (rev 1152) @@ -202,41 +202,25 @@ lastComment = null; } - public void addConstructor(MethodDef def) { - beginConstructor(); - endConstructor(def); - } - - - public void beginConstructor() { -// currentConstructor = new DefaultJavaConstructor(); - currentMethod = new DefaultJavaMethod(); - currentMethod.setConstructor( true ); + currentConstructor = new DefaultJavaConstructor(); -// currentConstructor.setParentClass( classStack.getFirst() ); - currentMethod.setParentClass( classStack.getFirst() ); -// classStack.getFirst().addConstructor( currentConstructor ); - classStack.getFirst().addMethod( currentMethod ); -// -// currentConstructor.setModelWriterFactory( modelWriterFactory ); - currentMethod.setModelWriterFactory( modelWriterFactory ); -// -// addJavaDoc( currentConstructor ); - addJavaDoc( currentMethod ); -// setAnnotations( currentConstructor ); - setAnnotations( currentMethod ); + currentConstructor.setParentClass( classStack.getFirst() ); + classStack.getFirst().addConstructor( currentConstructor ); + + currentConstructor.setModelWriterFactory( modelWriterFactory ); + + addJavaDoc( currentConstructor ); + setAnnotations( currentConstructor ); } public void endConstructor( MethodDef def ) { -// currentConstructor.setLineNumber(def.lineNumber); - currentMethod.setLineNumber( def.lineNumber ); + currentConstructor.setLineNumber(def.lineNumber); // basic details -// currentConstructor.setName(def.name); - currentMethod.setName( def.name ); + currentConstructor.setName(def.name); // typeParameters if (def.typeParams != null) { @@ -244,33 +228,26 @@ for(TypeVariableDef typeVariableDef : def.typeParams) { typeParams.add(createTypeVariable(typeVariableDef)); } -// currentConstructor.setTypeParameters(typeParams); - currentMethod.setTypeParameters( typeParams ); + currentConstructor.setTypeParameters(typeParams); } // exceptions - { - List<Type> exceptions = new LinkedList<Type>(); - for (TypeDef type : def.exceptions) { - exceptions.add(createType(type, 0)); - } -// currentConstructor.setExceptions(exceptions); - currentMethod.setExceptions( exceptions ); + List<Type> exceptions = new LinkedList<Type>(); + for (TypeDef type : def.exceptions) { + exceptions.add(createType(type, 0)); } + currentConstructor.setExceptions(exceptions); // modifiers -// currentConstructor.setModifiers( new LinkedList<String>( def.modifiers ) ); - currentMethod.setModifiers(new LinkedList<String>(def.modifiers) ); + currentConstructor.setModifiers( new LinkedList<String>( def.modifiers ) ); if( !parameterList.isEmpty() ) { -// currentConstructor.setParameters( new ArrayList<JavaParameter>( parameterList ) ); - currentMethod.setParameters( new ArrayList<JavaParameter>( parameterList ) ); + currentConstructor.setParameters( new ArrayList<JavaParameter>( parameterList ) ); parameterList.clear(); } -// currentConstructor.setSourceCode(def.body); - currentMethod.setSourceCode( def.body ); + currentConstructor.setSourceCode(def.body); } public void beginMethod() {
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java (1151 => 1152)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java 2011-04-06 20:32:21 UTC (rev 1151) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java 2011-04-06 20:45:29 UTC (rev 1152) @@ -1,6 +1,9 @@ package com.thoughtworks.qdox; -import static org.mockito.Mockito.*; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.File; import java.io.FileWriter; @@ -21,6 +24,7 @@ import com.thoughtworks.qdox.model.ClassLibrary; import com.thoughtworks.qdox.model.DocletTag; import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.JavaConstructor; import com.thoughtworks.qdox.model.JavaField; import com.thoughtworks.qdox.model.JavaMethod; import com.thoughtworks.qdox.model.JavaPackage; @@ -452,11 +456,11 @@ assertEquals(1, propertyClass.getBeanProperties().size()); // test ctor, methods and fields - List<JavaMethod> methods = propertyClass.getMethods(); - assertEquals(8, methods.size()); + assertEquals(6, propertyClass.getMethods().size()); + assertEquals(2, propertyClass.getConstructors().size()); - JavaMethod ctor = propertyClass.getMethodBySignature("PropertyClass", null); - JavaMethod ctor2 = propertyClass.getMethodBySignature("PropertyClass", Collections.singletonList(propertyClass.asType())); + JavaConstructor ctor = propertyClass.getConstructor( null ); + JavaConstructor ctor2 = propertyClass.getConstructor(Collections.singletonList(propertyClass.asType())); JavaMethod getFoo = propertyClass.getMethodBySignature("getFoo", null); JavaMethod isBar = propertyClass.getMethodBySignature("isBar", null); JavaMethod get = propertyClass.getMethodBySignature("get", null); @@ -479,8 +483,6 @@ assertNotNull(privateMethod); assertNull(shouldntBeInherited); - assertTrue(ctor.isConstructor()); - assertTrue(ctor2.isConstructor()); assertFalse(getFoo.isConstructor()); assertFalse(isBar.isConstructor()); assertFalse(get.isConstructor());
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1151 => 1152)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-04-06 20:32:21 UTC (rev 1151) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-04-06 20:45:29 UTC (rev 1152) @@ -1,6 +1,9 @@ package com.thoughtworks.qdox; -import static org.mockito.Mockito.*; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.File; import java.io.FileWriter; @@ -22,6 +25,7 @@ import com.thoughtworks.qdox.model.BeanProperty; import com.thoughtworks.qdox.model.DocletTag; import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.JavaConstructor; import com.thoughtworks.qdox.model.JavaField; import com.thoughtworks.qdox.model.JavaMethod; import com.thoughtworks.qdox.model.JavaPackage; @@ -453,11 +457,11 @@ assertEquals(1, propertyClass.getBeanProperties().size()); // test ctor, methods and fields - List<JavaMethod> methods = propertyClass.getMethods(); - assertEquals(8, methods.size()); + assertEquals(6, propertyClass.getMethods().size()); + assertEquals(2, propertyClass.getConstructors().size()); - JavaMethod ctor = propertyClass.getMethodBySignature("PropertyClass", null); - JavaMethod ctor2 = propertyClass.getMethodBySignature("PropertyClass", Collections.singletonList(propertyClass.asType())); + JavaConstructor ctor = propertyClass.getConstructor(null); + JavaConstructor ctor2 = propertyClass.getConstructor(Collections.singletonList(propertyClass.asType())); JavaMethod getFoo = propertyClass.getMethodBySignature("getFoo", null); JavaMethod isBar = propertyClass.getMethodBySignature("isBar", null); JavaMethod get = propertyClass.getMethodBySignature("get", null); @@ -480,8 +484,6 @@ assertNotNull(privateMethod); assertNull(shouldntBeInherited); - assertTrue(ctor.isConstructor()); - assertTrue(ctor2.isConstructor()); assertFalse(getFoo.isConstructor()); assertFalse(isBar.isConstructor()); assertFalse(get.isConstructor());
To unsubscribe from this list please visit:
