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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/java/rmi/server/RMIClassLoaderSpi.java b/java/rmi/server/RMIClassLoaderSpi.java
index 372d81879..ec2c204f1 100644
--- a/java/rmi/server/RMIClassLoaderSpi.java
+++ b/java/rmi/server/RMIClassLoaderSpi.java
@@ -49,16 +49,16 @@ public abstract class RMIClassLoaderSpi
   {
   }
 
-  public abstract Class loadClass (String codeBase, String name,
-                                   ClassLoader defaultLoader)
+  public abstract Class<?> loadClass (String codeBase, String name,
+                                      ClassLoader defaultLoader)
     throws MalformedURLException, ClassNotFoundException;
 
-  public abstract Class loadProxyClass (String codeBase, String[] interfaces,
-                                        ClassLoader defaultLoader)
+  public abstract Class<?> loadProxyClass (String codeBase, String[] interfaces,
+                                           ClassLoader defaultLoader)
     throws MalformedURLException, ClassNotFoundException;
 
   public abstract ClassLoader getClassLoader (String codebase)
     throws MalformedURLException;
 
-  public abstract String getClassAnnotation (Class cl);
+  public abstract String getClassAnnotation (Class<?> cl);
 }