- Revision
- 1348
- Author
- rfscholte
- Date
- 2011-10-02 07:48:39 -0500 (Sun, 02 Oct 2011)
Log Message
Refactor Type.getResolvedGenericValue(List<TypeVariable<D>>) to a static method
Modified Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java (1347 => 1348)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:46:27 UTC (rev 1347) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:48:39 UTC (rev 1348) @@ -113,7 +113,7 @@ */ public String getResolvedGenericValue() { - return type.getResolvedGenericValue( getParentMethod().getTypeParameters() ); + return Type.getResolvedGenericValue( type, getParentMethod().getTypeParameters() ); } public String getResolvedGenericFullyQualifiedName()
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1347 => 1348)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:46:27 UTC (rev 1347) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:48:39 UTC (rev 1348) @@ -504,15 +504,15 @@ return result.toString(); } - public <D extends JavaGenericDeclaration> String getResolvedGenericValue( List<TypeVariable<D>> typeParameters ) + public static <D extends JavaGenericDeclaration> String getResolvedGenericValue( Type base, List<TypeVariable<D>> typeParameters ) { StringBuffer result = new StringBuffer(); - TypeVariable<?> variable = resolve( this, typeParameters ); - result.append( variable == null ? getValue() : variable.getBounds().get(0).getValue() ); - if ( !actualArgumentTypes.isEmpty() ) + TypeVariable<?> variable = resolve( base, typeParameters ); + result.append( variable == null ? base.getValue() : variable.getBounds().get(0).getValue() ); + if ( !base.getActualTypeArguments().isEmpty() ) { result.append( "<" ); - for ( Iterator<Type> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) + for ( Iterator<Type> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) { result.append( iter.next().getGenericValue(typeParameters) ); if ( iter.hasNext() ) @@ -522,7 +522,7 @@ } result.append( ">" ); } - for ( int i = 0; i < dimensions; i++ ) + for ( int i = 0; i < base.getDimensions(); i++ ) { result.append( "[]" ); }
To unsubscribe from this list please visit:
