FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/classpath/java/rmi/server/LoaderHandler.java
View file

@ -42,6 +42,7 @@ import java.net.URL;
/**
* @deprecated
* @since 1.1
*/
public interface LoaderHandler
{
@ -54,13 +55,13 @@ public interface LoaderHandler
/**
* @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;
/**

17
libjava/classpath/java/rmi/server/RMIClassLoader.java
View file

@ -51,6 +51,7 @@ import java.util.Iterator;
* 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
{
@ -62,13 +63,13 @@ public class RMIClassLoader
/**
* @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();
@ -77,8 +78,8 @@ public class RMIClassLoader
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();
@ -87,8 +88,8 @@ public class RMIClassLoader
return spi.loadClass(codebase, name, defaultLoader);
}
public static Class loadProxyClass (String codeBase, String[] interfaces,
ClassLoader defaultLoader)
public static Class<?> loadProxyClass (String codeBase, String[] interfaces,
ClassLoader defaultLoader)
throws MalformedURLException, ClassNotFoundException
{
RMIClassLoaderSpi spi = getProviderInstance();
@ -114,7 +115,7 @@ public class RMIClassLoader
* @throws MalformedURLException if the URL is not well formed
* @throws ClassNotFoundException if the requested class cannot be found
*/
public static Class loadClass(URL codeBase, String name)
public static Class<?> loadClass(URL codeBase, String name)
throws MalformedURLException, ClassNotFoundException
{
RMIClassLoaderSpi spi = getProviderInstance();
@ -151,7 +152,7 @@ public class RMIClassLoader
* @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)

10
libjava/classpath/java/rmi/server/RMIClassLoaderSpi.java
View file

@ -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);
}