[qdox-scm] [1337] trunk/qdox/src/test/java/com/thoughtworks/qdox: Annotation.getType() is a JavaClass instead of a Type

[rfscholte]

Title: [1337] trunk/qdox/src/test/java/com/thoughtworks/qdox: Annotation.getType() is a JavaClass instead of a Type

Revision

1337

Author

rfscholte

Date

2011-09-22 15:51:51 -0500 (Thu, 22 Sep 2011)

Log Message

Annotation.getType() is a JavaClass instead of a Type

Modified Paths

• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java
• trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java
• trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java (1336 => 1337)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java	2011-09-22 18:48:26 UTC (rev 1336)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java	2011-09-22 20:51:51 UTC (rev 1337)
@@ -34,7 +34,7 @@
  */
 public class Annotation implements AnnotationValue, Serializable, JavaAnnotation
 {
-    private final Type type;
+    private final JavaClass type;
     private final int lineNumber;
 
     /**
@@ -52,7 +52,7 @@
 
     private AbstractJavaModel context;
 
-    public Annotation(Type type,
+    public Annotation(JavaClass type,
             AbstractJavaModel context,
             Map<String, Object> namedParameters,
             int lineNumber)
@@ -84,7 +84,7 @@
     /* (non-Javadoc)
 	 * @see com.thoughtworks.qdox.model.JavaAnnotation#getType()
 	 */
-    public Type getType() {
+    public JavaClass getType() {
     	return type;
     }
 

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java (1336 => 1337)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java	2011-09-22 18:48:26 UTC (rev 1336)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java	2011-09-22 20:51:51 UTC (rev 1337)
@@ -58,7 +58,6 @@
         JavaClass clazz = builder.getClassByName( "Foo" );
         assertEquals( "Annotations", 1, clazz.getAnnotations().size() );
         Annotation annotation = clazz.getAnnotations().get(0);
-        assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() );
         assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() );
         assertEquals( "Properties", 8, annotation.getNamedParameterMap().size() );
 

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java (1336 => 1337)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java	2011-09-22 18:48:26 UTC (rev 1336)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java	2011-09-22 20:51:51 UTC (rev 1337)
@@ -197,7 +197,6 @@
     	JavaClass clazz = builder.getClassByName("Foo");
     	JavaMethod mth = clazz.getMethods().get(0);
     	assertEquals("Foo", clazz.getName());
-        assertEquals("X", mth.getAnnotations().get(0).getType().getJavaClass().getName());
     	assertEquals("X", mth.getAnnotations().get(0).getType().getName());
     }
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email