- Revision
- 1078
- Author
- rfscholte
- Date
- 2011-02-26 05:03:16 -0600 (Sat, 26 Feb 2011)
Log Message
Prepare usage JavaConstructor class
Modified Paths
- trunk/qdox/src/java/com/thoughtworks/qdox/io/DefaultModelWriter.java
- trunk/qdox/src/java/com/thoughtworks/qdox/io/ModelWriter.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java
- trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java
Added Paths
Diff
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/io/DefaultModelWriter.java (1077 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/io/DefaultModelWriter.java 2011-02-24 21:51:03 UTC (rev 1077) +++ trunk/qdox/src/java/com/thoughtworks/qdox/io/DefaultModelWriter.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -28,6 +28,7 @@ import com.thoughtworks.qdox.model.JavaAnnotatedElement; import com.thoughtworks.qdox.model.JavaAnnotation; 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; @@ -158,6 +159,40 @@ return this; } + public ModelWriter writeConstructor( JavaConstructor constructor ) + { + commentHeader( constructor ); + writeAllModifiers( constructor.getModifiers() ); + + buffer.write( constructor.getName() ); + buffer.write( '(' ); + for(ListIterator<JavaParameter> iter = constructor.getParameters().listIterator(); iter.hasNext();) { + writeParameter( iter.next() ); + if(iter.hasNext()) { + buffer.write( ", " ); + } + } + buffer.write( ')' ); + + if (constructor.getExceptions().size() > 0) { + buffer.write(" throws "); + for (Iterator<Type> excIter = constructor.getExceptions().iterator();excIter.hasNext();) { + buffer.write(excIter.next().getValue()); + if(excIter.hasNext()) { + buffer.write(", "); + } + } + } + + buffer.write( " {" ); + buffer.newline(); + buffer.write( constructor.getSourceCode() ); + buffer.write( "}" ); + buffer.newline(); + + return this; + } + public ModelWriter writeMethod( JavaMethod method ) { commentHeader( method );
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/io/ModelWriter.java (1077 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/io/ModelWriter.java 2011-02-24 21:51:03 UTC (rev 1077) +++ trunk/qdox/src/java/com/thoughtworks/qdox/io/ModelWriter.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -21,6 +21,7 @@ import com.thoughtworks.qdox.model.JavaAnnotation; 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; @@ -43,4 +44,6 @@ public ModelWriter writeParameter( JavaParameter parameter ); + public ModelWriter writeConstructor( JavaConstructor defaultJavaConstructor ); + } \ No newline at end of file
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java (1077 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-02-24 21:51:03 UTC (rev 1077) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -18,6 +18,7 @@ private List<JavaParameter> parameters = new LinkedList<JavaParameter>(); protected List<Type> exceptions = Collections.emptyList(); protected boolean varArgs; + protected String sourceCode; public List<JavaParameter> getParameters() { @@ -137,4 +138,14 @@ return result; } + public String getSourceCode() + { + return sourceCode; + } + + public void setSourceCode( String sourceCode ) + { + this.sourceCode = sourceCode; + } + } \ No newline at end of file
Added: trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java (0 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java (rev 0) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -0,0 +1,17 @@ +package com.thoughtworks.qdox.model; + +public class DefaultJavaConstructor + extends AbstractBaseMethod implements JavaConstructor +{ + + public int compareTo( Object o ) + { + // TODO Auto-generated method stub + return 0; + } + + public String getCodeBlock() + { + return getModelWriter().writeConstructor( this ).toString(); + } +} Property changes on: trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1077 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-02-24 21:51:03 UTC (rev 1077) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -30,7 +30,6 @@ private Type returns = Type.VOID; private boolean constructor; - private String sourceCode; /** * The default constructor */ @@ -282,18 +281,7 @@ return getDeclarationSignature(false).compareTo(((JavaMethod)o).getDeclarationSignature(false)); } - /* (non-Javadoc) - * @see com.thoughtworks.qdox.model.JavaMethod#getSourceCode() - */ - public String getSourceCode(){ - return sourceCode; - } - - public void setSourceCode(String sourceCode){ - this.sourceCode = sourceCode; - } - - public String toString() { + public String toString() { StringBuffer result = new StringBuffer(); if(isPrivate()) { result.append("private ");
Added: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaConstructor.java (0 => 1078)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaConstructor.java (rev 0) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaConstructor.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -0,0 +1,17 @@ +package com.thoughtworks.qdox.model; + +import java.util.List; + +public interface JavaConstructor + extends JavaAnnotatedElement, JavaGenericDeclaration, JavaMember +{ + + public List<JavaParameter> getParameters(); + + public JavaParameter getParameterByName( String name ); + + public List<Type> getExceptions(); + + public String getSourceCode(); + +} Property changes on: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaConstructor.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java (1077 => 1078)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-02-24 21:51:03 UTC (rev 1077) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-02-26 11:03:16 UTC (rev 1078) @@ -106,6 +106,6 @@ public void setSourceCode( JavaMethod method, String code ) { - ((DefaultJavaMethod) method).setSourceCode( code ); + ((AbstractBaseMethod) method).setSourceCode( code ); } }
To unsubscribe from this list please visit:
