From 65bf3316cf384588453604be6b4f0ed3751a8b0f Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Jan 2007 19:58:05 +0000
Subject: Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/java/lang/reflect/AnnotatedElement.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libjava/classpath/java/lang/reflect/AnnotatedElement.java')

diff --git a/libjava/classpath/java/lang/reflect/AnnotatedElement.java b/libjava/classpath/java/lang/reflect/AnnotatedElement.java
index 69a64a02827..8f2a8b6f5c8 100644
--- a/libjava/classpath/java/lang/reflect/AnnotatedElement.java
+++ b/libjava/classpath/java/lang/reflect/AnnotatedElement.java
@@ -74,8 +74,7 @@ public interface AnnotatedElement
    *         <code>null</code> if no such annotation exists.
    * @throws NullPointerException if the annotation class is <code>null</code>.
    */
-  /* FIXME[GENERICS]: <T extends Annotation> T getAnnotation(Class <T>) */
-  Annotation getAnnotation(Class annotationClass);
+  <T extends Annotation> T getAnnotation(Class<T> annotationClass);
 
   /**
    * Returns all annotations associated with the element.  If there are
@@ -111,7 +110,6 @@ public interface AnnotatedElement
    * @return true if an annotation exists for the specified type.
    * @since 1.5
    */
-  /* FIXME[GENERICS]: Signature is Class<? extends Annotation> */
-  boolean isAnnotationPresent(Class annotationClass);
+  boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
 
 }
-- 
cgit v1.2.3