- Revision
- 1347
- Author
- rfscholte
- Date
- 2011-10-02 07:46:27 -0500 (Sun, 02 Oct 2011)
Log Message
Refactor Type.getResolvedGenericFullyQualifiedName(List<TypeVariable<D>>) to a static method
Modified Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java (1346 => 1347)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:42:12 UTC (rev 1346) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java 2011-10-02 12:46:27 UTC (rev 1347) @@ -118,7 +118,7 @@ public String getResolvedGenericFullyQualifiedName() { - return type.getResolvedGenericFullyQualifiedName( getParentMethod().getTypeParameters() ); + return Type.getResolvedGenericFullyQualifiedName( type, getParentMethod().getTypeParameters() ); } @Override
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1346 => 1347)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:42:12 UTC (rev 1346) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 12:46:27 UTC (rev 1347) @@ -529,15 +529,15 @@ return result.toString(); } - protected <D extends JavaGenericDeclaration> String getResolvedGenericFullyQualifiedName( List<TypeVariable<D>> typeParameters ) + protected static <D extends JavaGenericDeclaration> String getResolvedGenericFullyQualifiedName( Type base, List<TypeVariable<D>> typeParameters ) { StringBuffer result = new StringBuffer(); - TypeVariable<D> variable = resolve( this, typeParameters ); - result.append( variable == null ? getFullyQualifiedName() : variable.getBounds().get(0).getFullyQualifiedName() ); - if ( !actualArgumentTypes.isEmpty() ) + TypeVariable<D> variable = resolve( base, typeParameters ); + result.append( variable == null ? base.getFullyQualifiedName() : variable.getBounds().get(0).getFullyQualifiedName() ); + 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( getResolvedFullyQualifiedName( iter.next(), typeParameters) ); if ( iter.hasNext() ) @@ -547,7 +547,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:
