Title: [1345] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Refactor Type.getResolvedFullyQualifiedName(List<TypeVariable<D>>) to a static method
Revision
1345
Author
rfscholte
Date
2011-10-02 07:36:25 -0500 (Sun, 02 Oct 2011)

Log Message

Refactor Type.getResolvedFullyQualifiedName(List<TypeVariable<D>>) to a static method

Modified Paths

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java (1344 => 1345)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java	2011-10-02 12:26:53 UTC (rev 1344)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java	2011-10-02 12:36:25 UTC (rev 1345)
@@ -105,7 +105,7 @@
 
     public String getResolvedFullyQualifiedName() 
     {
-        return type.getResolvedFullyQualifiedName( getParentMethod().getTypeParameters() );
+        return Type.getResolvedFullyQualifiedName( type, getParentMethod().getTypeParameters() );
     }
     
 	/* (non-Javadoc)

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1344 => 1345)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-02 12:26:53 UTC (rev 1344)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-02 12:36:25 UTC (rev 1345)
@@ -539,7 +539,7 @@
             result.append( "<" );
             for ( Iterator<Type> iter = actualArgumentTypes.iterator(); iter.hasNext(); )
             {
-                result.append( iter.next().getResolvedFullyQualifiedName( typeParameters) );
+                result.append( getResolvedFullyQualifiedName( iter.next(), typeParameters) );
                 if ( iter.hasNext() )
                 {
                     result.append( "," );
@@ -554,10 +554,10 @@
         return result.toString();
     }
 
-    protected <D extends JavaGenericDeclaration> String getResolvedFullyQualifiedName( List<TypeVariable<D>> typeParameters )
+    protected static <D extends JavaGenericDeclaration> String getResolvedFullyQualifiedName( Type base, List<TypeVariable<D>> typeParameters )
     {
-        TypeVariable<D> variable = resolve( this, typeParameters );
-        return (variable == null ? getFullyQualifiedName() : variable.getBounds().get(0).getFullyQualifiedName() );
+        TypeVariable<D> variable = resolve( base, typeParameters );
+        return (variable == null ? base.getFullyQualifiedName() : variable.getBounds().get(0).getFullyQualifiedName() );
     }
 
     //Delegating methods


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to