2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)

2 files changed, 3 insertions, 6 deletions

diff --git a/java/lang/instrument/ClassDefinition.java b/java/lang/instrument/ClassDefinition.java
index 841597c31..f2fbf9296 100644
--- a/java/lang/instrument/ClassDefinition.java
+++ b/java/lang/instrument/ClassDefinition.java
@@ -60,8 +60,7 @@ public final class ClassDefinition
    * @param theClassFile the new class file
    * @throws NullPointerException if one of the argument is null
    */
-  /* FIXME[GENERICS]: Signature should be (Class<?>, byte[]) */
-  public ClassDefinition(Class theClass, byte[] theClassFile)
+  public ClassDefinition(Class<?> theClass, byte[] theClassFile)
   {
     if (theClass == null || theClassFile == null)
       throw new NullPointerException();
@@ -72,8 +71,7 @@ public final class ClassDefinition
   /**
    * @return the Class
    */
-  /* FIXME[GENERICS]: Should return Class<?> */
-  public Class getDefinitionClass()
+  public Class<?> getDefinitionClass()
   {
     return theClass;
   }
diff --git a/java/lang/instrument/ClassFileTransformer.java b/java/lang/instrument/ClassFileTransformer.java
index 68638d719..01b2f8aaa 100644
--- a/java/lang/instrument/ClassFileTransformer.java
+++ b/java/lang/instrument/ClassFileTransformer.java
@@ -75,10 +75,9 @@ public interface ClassFileTransformer
    * @see Instrumentation#redefineClasses(java.lang.instrument.ClassDefinition[])
    *
    */
-  /* FIXME[GENERICS]: Class should be Class<?> */
   byte[] transform(ClassLoader loader,
                  String className,
-                 Class classBeingRedefined,
+                 Class<?> classBeingRedefined,
                  ProtectionDomain protectionDomain,
                  byte[] classfileBuffer)
                  throws IllegalClassFormatException;