- Revision
- 1312
- Author
- rfscholte
- Date
- 2011-09-06 16:43:49 -0500 (Tue, 06 Sep 2011)
Log Message
Refactor getExceptions() for JavaMethod and JavaConstructor from Type to JavaClass
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -239,7 +239,7 @@ } // exceptions - List<Type> exceptions = new LinkedList<Type>(); + List<JavaClass> exceptions = new LinkedList<JavaClass>(); for (TypeDef type : def.getExceptions()) { exceptions.add(createType(type, 0)); } @@ -288,7 +288,7 @@ } // exceptions - List<Type> exceptions = new LinkedList<Type>(); + List<JavaClass> exceptions = new LinkedList<JavaClass>(); for (TypeDef type : def.getExceptions()) { exceptions.add(createType(type, 0)); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -15,7 +15,7 @@ { private List<JavaParameter> parameters = Collections.emptyList(); - private List<Type> exceptions = Collections.emptyList(); + private List<JavaClass> exceptions = Collections.emptyList(); private boolean varArgs; private String sourceCode; @@ -34,7 +34,7 @@ return null; } - public List<Type> getExceptions() + public List<JavaClass> getExceptions() { return exceptions; } @@ -55,7 +55,7 @@ this.varArgs = javaParameters.get( javaParameters.size() -1 ).isVarArgs(); } - public void setExceptions( List<Type> exceptions ) + public void setExceptions( List<JavaClass> exceptions ) { this.exceptions = exceptions; }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -74,7 +74,7 @@ if ( getExceptions().size() > 0 ) { result.append( " throws " ); - for ( Iterator<Type> excIter = getExceptions().iterator(); excIter.hasNext(); ) + for ( Iterator<JavaClass> excIter = getExceptions().iterator(); excIter.hasNext(); ) { result.append( excIter.next().getValue() ); if ( excIter.hasNext() )
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -130,7 +130,7 @@ result.append(')'); if (isDeclaration && !getExceptions().isEmpty() ) { result.append(" throws "); - for(Iterator<Type> excIter = getExceptions().iterator();excIter.hasNext();) { + for(Iterator<JavaClass> excIter = getExceptions().iterator();excIter.hasNext();) { result.append(excIter.next().getValue()); if(excIter.hasNext()) { result.append(", "); @@ -363,7 +363,7 @@ if ( getExceptions().size() > 0 ) { result.append( " throws " ); - for ( Iterator<Type> excIter = getExceptions().iterator(); excIter.hasNext(); ) + for ( Iterator<JavaClass> excIter = getExceptions().iterator(); excIter.hasNext(); ) { result.append( excIter.next().getFullyQualifiedName() ); if ( excIter.hasNext() )
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -60,7 +60,7 @@ * * @return a list of Exceptions, never <code>null</code> */ - List<Type> getExceptions(); + List<JavaClass> getExceptions(); /** * Equivalent of {@link java.lang.reflect.Constructor#isVarArgs()}
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -35,7 +35,7 @@ JavaParameter getParameterByName( String name ); - List<Type> getExceptions(); + List<JavaClass> getExceptions(); /** * Equivalent of {@link java.lang.reflect.Method#isVarArgs()}
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -111,7 +111,7 @@ return originalMethod.getDeclarationSignature( withModifiers ); } - public List<Type> getExceptions() + public List<JavaClass> getExceptions() { return originalMethod.getExceptions(); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java (1311 => 1312)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -214,7 +214,7 @@ if ( constructor.getExceptions().size() > 0 ) { buffer.write( " throws " ); - for ( Iterator<Type> excIter = constructor.getExceptions().iterator(); excIter.hasNext(); ) + for ( Iterator<JavaClass> excIter = constructor.getExceptions().iterator(); excIter.hasNext(); ) { buffer.write( excIter.next().getValue() ); if ( excIter.hasNext() ) @@ -269,7 +269,7 @@ if ( method.getExceptions().size() > 0 ) { buffer.write( " throws " ); - for ( Iterator<Type> excIter = method.getExceptions().iterator(); excIter.hasNext(); ) + for ( Iterator<JavaClass> excIter = method.getExceptions().iterator(); excIter.hasNext(); ) { buffer.write( excIter.next().getValue() ); if ( excIter.hasNext() )
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java (1311 => 1312)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -41,7 +41,7 @@ return new Type( fullname, dimensions ); } - public void setExceptions( DefaultJavaMethod method, List<Type> exceptions ) + public void setExceptions( DefaultJavaMethod method, List<JavaClass> exceptions ) { method.setExceptions( exceptions ); }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1311 => 1312)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-09-04 20:59:08 UTC (rev 1311) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-09-06 21:43:49 UTC (rev 1312) @@ -22,7 +22,7 @@ public abstract M newJavaMethod(Type returns, String name); //setters - public abstract void setExceptions(M method, List<Type> exceptions); + public abstract void setExceptions(M method, List<JavaClass> exceptions); public abstract void setComment(M method, String comment); public abstract void setName(M method, String name); public abstract void setModifiers(M method, List<String> modifiers); @@ -63,7 +63,7 @@ setName(mth, "blah"); setModifiers(mth, Arrays.asList(new String[]{"protected", "final"})); setReturns(mth, newType("void")); - setExceptions(mth, Arrays.asList( new Type[] { + setExceptions(mth, Arrays.asList( new JavaClass[] { newType("FishException"), newType("FruitException"), } )); @@ -113,21 +113,21 @@ public void testGetCodeBlockOneException() throws Exception { setName(mth, "blah"); setReturns(mth, newType("void")); - setExceptions(mth, Collections.singletonList( newType("RuntimeException") )); + setExceptions( mth, Arrays.asList( new JavaClass[] { newType( "RuntimeException" ) } ) ); assertEquals("void blah() throws RuntimeException;\n", mth.getCodeBlock()); } public void testGetCodeBlockTwoException() throws Exception { setName(mth, "blah"); setReturns(mth, newType("void")); - setExceptions(mth, Arrays.asList( new Type[]{newType("RuntimeException"), newType("java.lang.SheepException")})); + setExceptions(mth, Arrays.asList( new JavaClass[]{newType("RuntimeException"), newType("java.lang.SheepException")})); assertEquals("void blah() throws RuntimeException, java.lang.SheepException;\n", mth.getCodeBlock()); } public void testGetCodeBlockThreeException() throws Exception { setName(mth, "blah"); setReturns(mth, newType("void")); - setExceptions(mth, Arrays.asList( new Type[]{newType("RuntimeException"), newType("java.lang.SheepException"), newType("CowException")})); + setExceptions(mth, Arrays.asList( new JavaClass[]{newType("RuntimeException"), newType("java.lang.SheepException"), newType("CowException")})); assertEquals("void blah() throws RuntimeException, java.lang.SheepException, CowException;\n", mth.getCodeBlock()); }
To unsubscribe from this list please visit:
