Merged gcj-eclipse branch to trunk.

[pf3gnuchains/gcc-fork.git] / libjava / classpath / java / lang / reflect / AccessibleObject.java

diff --git a/libjava/classpath/java/lang/reflect/AccessibleObject.java b/libjava/classpath/java/lang/reflect/AccessibleObject.java
index 8f09eac..fd46a53 100644 (file)
--- a/libjava/classpath/java/lang/reflect/AccessibleObject.java
+++ b/libjava/classpath/java/lang/reflect/AccessibleObject.java
@@ -160,8 +160,7 @@ public class AccessibleObject
     this.flag = flag;
   }
 
     this.flag = flag;
   }
 

-  /* FIXME[GENERICS]: <T extends Annotation> T getAnnotation(Class <T>) */
-  public Annotation getAnnotation(Class annotationClass)
+  public <T extends Annotation> T getAnnotation(Class<T> annotationClass)

   {
     throw new AssertionError("Subclass must override this method");
   }
   {
     throw new AssertionError("Subclass must override this method");
   }


@@ -176,8 +175,7 @@ public class AccessibleObject
     throw new AssertionError("Subclass must override this method");
   }
 
     throw new AssertionError("Subclass must override this method");
   }
 

-  /* FIXME[GENERICS]: Signature is Class<? extends Annotation> */
-  public boolean isAnnotationPresent(Class annotationClass)
+  public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)

   {
     return getAnnotation(annotationClass) != null;
   }
   {
     return getAnnotation(annotationClass) != null;
   }