[qdox-scm] [1368] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Add JavaType.getGenericCanonicalName()

Mon, 03 Oct 2011 11:55:22 -0700

Title: [1368] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Add JavaType.getGenericCanonicalName()

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1367 => 1368)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-10-03 18:31:13 UTC (rev 1367)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-10-03 18:55:18 UTC (rev 1368)
@@ -317,6 +317,11 @@
     {
         return getFullyQualifiedName().replace( '$', '.' );
     }
+    
+    public String getGenericCanonicalName()
+    {
+        return getCanonicalName();
+    }
 
     /*
      * (non-Javadoc)

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

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java	2011-10-03 18:31:13 UTC (rev 1367)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaParameter.java	2011-10-03 18:55:18 UTC (rev 1368)
@@ -95,11 +95,26 @@
         return type.getFullyQualifiedName();
     }
     
+    public String getCanonicalName()
+    {
+        return type.getCanonicalName();
+    }
+    
     public String getValue()
     {
         return type.getValue();
     }
     
+    public String getGenericCanonicalName()
+    {
+        return type.getGenericCanonicalName();
+    }
+    
+    public String getGenericFullyQualifiedName()
+    {
+        return type.getGenericFullyQualifiedName();
+    }
+    
     /* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaParameter#getResolvedValue()
      */
@@ -150,5 +165,15 @@
     public String toString() {
         return getResolvedValue() + " "+ name;
     }
+
+    public String getGenericValue()
+    {
+        return type.getGenericValue();
+    }
+
+    public String toGenericString()
+    {
+        return type.toGenericString();
+    }
 	
 }

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaParameter.java (1367 => 1368)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaParameter.java	2011-10-03 18:31:13 UTC (rev 1367)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaParameter.java	2011-10-03 18:55:18 UTC (rev 1368)
@@ -25,7 +25,7 @@
  * @author Robert Scholte
  *
  */
-public interface JavaParameter extends JavaAnnotatedElement
+public interface JavaParameter extends JavaAnnotatedElement, JavaType
 {
 
     /**
@@ -74,6 +74,8 @@
      * @return the FQN of the type, never <code>null</code>
      */
     String getFullyQualifiedName();
+    
+    String getCanonicalName();
 
     /**
      * @return the resolved value of the type

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java (1367 => 1368)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java	2011-10-03 18:31:13 UTC (rev 1367)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java	2011-10-03 18:55:18 UTC (rev 1368)
@@ -4,6 +4,8 @@
 {
     String getCanonicalName();
 
+    String getGenericCanonicalName();
+
     String getFullyQualifiedName();
 
     String getGenericFullyQualifiedName();

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

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-03 18:31:13 UTC (rev 1367)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-03 18:55:18 UTC (rev 1368)
@@ -519,6 +519,29 @@
         }
         return result.toString();
     }
+    
+    public String getGenericCanonicalName()
+    {
+        StringBuffer result = new StringBuffer( getCanonicalName() );
+        if ( !actualArgumentTypes.isEmpty() )
+        {
+            result.append( "<" );
+            for ( Iterator<JavaType> iter = actualArgumentTypes.iterator(); iter.hasNext(); )
+            {
+                result.append( iter.next().getCanonicalName() );
+                if ( iter.hasNext() )
+                {
+                    result.append( "," );
+                }
+            }
+            result.append( ">" );
+        }
+        for ( int i = 0; i < dimensions; i++ )
+        {
+            result.append( "[]" );
+        }
+        return result.toString();
+    }
 
     protected static <D extends JavaGenericDeclaration> String getResolvedGenericValue( JavaType base, List<TypeVariable<D>> typeParameters )
     {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to