[cp-patches] [generics] Patch: FYI: fix annotation inheritance

[Tom Tromey]

I'm checking this in on the generics branch.

This fixes PR 28203, which is a bug in annotation inheritance.

Even though getAnnotations is on the trunk I did not fix this bug
there, as the Inherited annotation itself does not appear.

Tom

Index: ChangeLog
from  Tom Tromey  <[EMAIL PROTECTED]>

        PR classpath/28203:
        * java/lang/Class.java (getAnnotations): Rewrote.

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.22.2.25
diff -u -r1.22.2.25 Class.java
--- java/lang/Class.java 1 May 2006 21:45:48 -0000 1.22.2.25
+++ java/lang/Class.java 29 Nov 2006 23:06:57 -0000
@@ -44,6 +44,7 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
+import java.lang.annotation.Inherited;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -62,6 +63,7 @@
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 
@@ -1505,15 +1507,22 @@
    */
   public Annotation[] getAnnotations()
   {
-    HashSet<Annotation> set = new HashSet<Annotation>();
-    set.addAll(Arrays.asList(getDeclaredAnnotations()));
-    Class[] interfaces = getInterfaces();
-    for (int i = 0; i < interfaces.length; i++)
-      set.addAll(Arrays.asList(interfaces[i].getAnnotations()));
-    Class<? super T> superClass = getSuperclass();
-    if (superClass != null)
-      set.addAll(Arrays.asList(superClass.getAnnotations()));
-    return set.toArray(new Annotation[set.size()]);
+    HashMap<Class, Annotation> map = new HashMap<Class, Annotation>();
+    for (Annotation a : getDeclaredAnnotations())
+      map.put((Class) a.annotationType(), a);
+    for (Class<? super T> s = getSuperclass();
+        s != null;
+        s = s.getSuperclass())
+      {
+       for (Annotation a : s.getDeclaredAnnotations())
+         {
+           Class k = (Class) a.annotationType();
+           if (! map.containsKey(k) && k.isAnnotationPresent(Inherited.class))
+             map.put(k, a);
+         }
+      }
+    Collection<Annotation> v = map.values();
+    return v.toArray(new Annotation[v.size()]);
   }
 
   /**