- Revision
- 1346
- Author
- rfscholte
- Date
- 2011-10-02 07:42:12 -0500 (Sun, 02 Oct 2011)
Log Message
Refactor Type.getResolvedValue(List<TypeVariable<D>>) to a static method
Modified Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java (1345 => 1346)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java 2011-10-02 12:36:25 UTC (rev 1345) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java 2011-10-02 12:42:12 UTC (rev 1346) @@ -63,7 +63,7 @@ result.append( "(" ); for ( Iterator<JavaParameter> paramIter = getParameters().iterator(); paramIter.hasNext();) { - String typeValue = paramIter.next().getType().getResolvedValue( getTypeParameters() ); + String typeValue = Type.getResolvedValue( paramIter.next().getType(), getTypeParameters() ); result.append( typeValue ); if ( paramIter.hasNext() ) {
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java (1345 => 1346)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:36:25 UTC (rev 1345) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:42:12 UTC (rev 1346) @@ -100,7 +100,7 @@ * @see com.thoughtworks.qdox.model.JavaParameter#getResolvedValue() */ public String getResolvedValue() { - return type.getResolvedValue( getParentMethod().getTypeParameters() ); + return Type.getResolvedValue( type, getParentMethod().getTypeParameters() ); } public String getResolvedFullyQualifiedName()
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1345 => 1346)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:36:25 UTC (rev 1345) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:42:12 UTC (rev 1346) @@ -168,7 +168,7 @@ protected <D extends JavaGenericDeclaration> String getGenericValue( List<TypeVariable<D>> typeVariableList ) { - StringBuffer result = new StringBuffer( getResolvedValue( typeVariableList ) ); + StringBuffer result = new StringBuffer( getResolvedValue( this, typeVariableList ) ); for ( Iterator<Type> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) { result.append( iter.next().resolve( this, typeVariableList ) ); @@ -180,12 +180,12 @@ return result.toString(); } - protected <D extends JavaGenericDeclaration> String getResolvedValue( List<TypeVariable<D>> typeParameters ) + protected static <D extends JavaGenericDeclaration> String getResolvedValue( Type base, List<TypeVariable<D>> typeParameters ) { - String result = getValue(); + String result = base.getValue(); for ( TypeVariable<?> typeParameter : typeParameters ) { - if ( typeParameter.getName().equals( getValue() ) ) + if ( typeParameter.getName().equals( base.getValue() ) ) { result = typeParameter.getBounds().get( 0 ).getValue(); break;
To unsubscribe from this list please visit:
