I'm checking this in on the generics branch. This genericizes java.rmi.server.
Tom 2005-11-25 Tom Tromey <[EMAIL PROTECTED]> * java/rmi/server/RMIClassLoaderSpi.java (loadClass): Genericized. (loadProxyClass): Likewise. (getClassAnnotation): Likewise. * java/rmi/server/RMIClassLoader.java (loadClass): Genericized. (getClassAnnotation): Likewise. * java/rmi/server/LoaderHandler.java (loadClass): Genericized. Index: java/rmi/server/LoaderHandler.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/rmi/server/LoaderHandler.java,v retrieving revision 1.5.2.3 diff -u -r1.5.2.3 LoaderHandler.java --- java/rmi/server/LoaderHandler.java 2 Nov 2005 00:43:36 -0000 1.5.2.3 +++ java/rmi/server/LoaderHandler.java 25 Nov 2005 22:48:30 -0000 @@ -42,6 +42,7 @@ /** * @deprecated + * @since 1.1 */ public interface LoaderHandler { @@ -54,13 +55,13 @@ /** * @deprecated */ - Class loadClass(String name) + Class<?> loadClass(String name) throws MalformedURLException, ClassNotFoundException; /** * @deprecated */ - Class loadClass(URL codebase, String name) + Class<?> loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException; /** Index: java/rmi/server/RMIClassLoader.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoader.java,v retrieving revision 1.10.2.4 diff -u -r1.10.2.4 RMIClassLoader.java --- java/rmi/server/RMIClassLoader.java 2 Nov 2005 00:43:36 -0000 1.10.2.4 +++ java/rmi/server/RMIClassLoader.java 25 Nov 2005 22:48:30 -0000 @@ -48,6 +48,7 @@ * network-based class loading in RMI. These methods are called by RMI's * internal marshal streams to implement the dynamic class loading of types for * RMI parameters and return values. + * @since 1.1 */ public class RMIClassLoader { @@ -59,13 +60,13 @@ /** * @deprecated */ - public static Class loadClass(String name) + public static Class<?> loadClass(String name) throws MalformedURLException, ClassNotFoundException { return loadClass("", name); } - public static Class loadClass(String codebase, String name) + public static Class<?> loadClass(String codebase, String name) throws MalformedURLException, ClassNotFoundException { RMIClassLoaderSpi spi = getProviderInstance(); @@ -74,8 +75,8 @@ return spi.loadClass(codebase, name, null); } - public static Class loadClass(String codebase, String name, - ClassLoader defaultLoader) + public static Class<?> loadClass(String codebase, String name, + ClassLoader defaultLoader) throws MalformedURLException, ClassNotFoundException { RMIClassLoaderSpi spi = getProviderInstance(); @@ -138,7 +139,7 @@ * @return a space seperated list of URLs where the class-definition * of cl may be found */ - public static String getClassAnnotation(Class cl) + public static String getClassAnnotation(Class<?> cl) { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) Index: java/rmi/server/RMIClassLoaderSpi.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoaderSpi.java,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 RMIClassLoaderSpi.java --- java/rmi/server/RMIClassLoaderSpi.java 2 Aug 2005 20:12:24 -0000 1.1.2.2 +++ java/rmi/server/RMIClassLoaderSpi.java 25 Nov 2005 22:48:30 -0000 @@ -49,16 +49,16 @@ { } - 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); } _______________________________________________ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches