I'm checking this in on the generics branch.
This genericizes a few method signatures, as pointed out by japi.
Tom
2006-03-13 Tom Tromey <[EMAIL PROTECTED]>
* javax/swing/text/html/StyleSheet.java (removeAttributes):
Genericized.
* javax/swing/plaf/synth/SynthLookAndFeel.java (load): Genericized.
* java/rmi/server/RMIClassLoader.java (loadProxyClass): Genericized.
Index: java/rmi/server/RMIClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoader.java,v
retrieving revision 1.10.2.7
diff -u -r1.10.2.7 RMIClassLoader.java
--- java/rmi/server/RMIClassLoader.java 5 Mar 2006 11:38:13 -0000 1.10.2.7
+++ java/rmi/server/RMIClassLoader.java 14 Mar 2006 02:33:25 -0000
@@ -88,8 +88,8 @@
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();
Index: javax/swing/plaf/synth/SynthLookAndFeel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java,v
retrieving revision 1.1.4.1
diff -u -r1.1.4.1 SynthLookAndFeel.java
--- javax/swing/plaf/synth/SynthLookAndFeel.java 2 Mar 2006 09:34:03
-0000 1.1.4.1
+++ javax/swing/plaf/synth/SynthLookAndFeel.java 14 Mar 2006 02:33:26
-0000
@@ -207,9 +207,7 @@
* @throws IllegalArgumentException if one of the parameters is
* <code>null</code>
*/
- // FIXME: The signature in the JDK has a Class<?> here. Should be fixed as
- // soon as we switch to the generics branch.
- public void load(InputStream in, Class resourceBase)
+ public void load(InputStream in, Class<?> resourceBase)
throws ParseException, IllegalArgumentException
{
// FIXME: Implement this correctly.
Index: javax/swing/text/html/StyleSheet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/StyleSheet.java,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 StyleSheet.java
--- javax/swing/text/html/StyleSheet.java 10 Jan 2006 15:59:43 -0000
1.5.2.1
+++ javax/swing/text/html/StyleSheet.java 14 Mar 2006 02:33:26 -0000
@@ -414,10 +414,10 @@
* @param names - the attribute names
* @return the update attribute set
*/
- public AttributeSet removeAttributes(AttributeSet old, Enumeration names)
+ public AttributeSet removeAttributes(AttributeSet old, Enumeration<?> names)
{
// FIXME: Not implemented.
- return super.removeAttributes(old, names);
+ return super.removeAttributes(old, names);
}
/**
