[qdox-scm] [1371] trunk/qdox/src/test/java/com/thoughtworks/qdox: Use JavaAnnotation interface in model interfaces instead of Annotation class

Mon, 03 Oct 2011 12:51:55 -0700

Title: [1371] trunk/qdox/src/test/java/com/thoughtworks/qdox: Use JavaAnnotation interface in model interfaces instead of Annotation class

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1370 => 1371)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -37,6 +37,7 @@
 import com.thoughtworks.qdox.model.DefaultJavaSource;
 import com.thoughtworks.qdox.model.DocletTag;
 import com.thoughtworks.qdox.model.DocletTagFactory;
+import com.thoughtworks.qdox.model.JavaAnnotation;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaConstructor;
 import com.thoughtworks.qdox.model.JavaGenericDeclaration;
@@ -371,7 +372,7 @@
         if( !currentAnnoDefs.isEmpty() ) {
         	DefaultAnnotationTransformer transformer = new DefaultAnnotationTransformer(entity);
 
-            List<Annotation> annotations = new LinkedList<Annotation>();
+            List<JavaAnnotation> annotations = new LinkedList<JavaAnnotation>();
             for( AnnoDef annoDef :  currentAnnoDefs) {
                 annotations.add( transformer.transform( annoDef ) );
             }

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java (1370 => 1371)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -26,7 +26,7 @@
 
 public abstract class AbstractBaseJavaEntity extends AbstractJavaModel implements Serializable {
 
-	private List<Annotation> annotations = Collections.emptyList();
+	private List<JavaAnnotation> annotations = Collections.emptyList();
 	private String comment;
 	private List<DocletTag> tags = Collections.emptyList();
 
@@ -35,12 +35,12 @@
         super();
     }
 
-    public List<Annotation> getAnnotations()
+    public List<JavaAnnotation> getAnnotations()
     {
         return annotations;
     }
 
-    public void setAnnotations( List<Annotation> annotations )
+    public void setAnnotations( List<JavaAnnotation> annotations )
     {
         this.annotations = annotations;
     }

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotatedElement.java (1370 => 1371)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotatedElement.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotatedElement.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -44,7 +44,7 @@
 	 * 
 	 * @return a list of Annotations, never <code>null</code>
 	 */
-    List<Annotation> getAnnotations();
+    List<JavaAnnotation> getAnnotations();
     
     // JavaDoc specific methods

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java (1370 => 1371)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -33,5 +33,9 @@
 	Map<String, AnnotationValue> getPropertyMap();
 
 	AnnotationValue getProperty(String name);
+	
+	Map<String, Object> getNamedParameterMap();
+	
+	Object getNamedParameter(String key);
 
 }
\ No newline at end of file

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java (1370 => 1371)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -82,7 +82,7 @@
         return originalMethod.equals( obj );
     }
 
-    public List<Annotation> getAnnotations()
+    public List<JavaAnnotation> getAnnotations()
     {
         return originalMethod.getAnnotations();
     }

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

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -640,7 +640,7 @@
      * (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaAnnotatedElement#getAnnotations()
      */
-    public List<Annotation> getAnnotations()
+    public List<JavaAnnotation> getAnnotations()
     {
         return resolveRealClass().getAnnotations();
     }

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

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -57,7 +57,7 @@
         builder.addSource( new StringReader( source ) );
         JavaClass clazz = builder.getClassByName( "Foo" );
         assertEquals( "Annotations", 1, clazz.getAnnotations().size() );
-        Annotation annotation = clazz.getAnnotations().get(0);
+        JavaAnnotation annotation = clazz.getAnnotations().get(0);
         assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() );
         assertEquals( "Properties", 8, annotation.getNamedParameterMap().size() );

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1370 => 1371)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-10-03 19:41:43 UTC (rev 1370)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-10-03 19:51:52 UTC (rev 1371)
@@ -26,6 +26,7 @@
 import com.thoughtworks.qdox.model.Annotation;
 import com.thoughtworks.qdox.model.BeanProperty;
 import com.thoughtworks.qdox.model.DocletTag;
+import com.thoughtworks.qdox.model.JavaAnnotation;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaConstructor;
 import com.thoughtworks.qdox.model.JavaField;
@@ -1339,7 +1340,7 @@
         builder.addSource(new StringReader( source ));
         JavaClass classByName = builder.getClassByName("Instruction");
         JavaField fieldByName = classByName.getFieldByName("testfield");
-        List<Annotation> annotations = fieldByName.getAnnotations();
+        List<JavaAnnotation> annotations = fieldByName.getAnnotations();
         
         // Now we do have the annotation "JoinColumn" in annotations[0]
         Map propertyMap = annotations.get(0).getNamedParameterMap();

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to