diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-14 02:36:40 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-03-14 02:36:40 +0000 |
| commit | 0162ecd7165c417c6fe6f7a53b9025c68fc448a6 (patch) | |
| tree | 13394c9a6d5fdea08aa2f4487b37673d774d831e | |
| parent | b634b1e1d3b131f1b29e3bc4c3389dbcc92e05f0 (diff) | |
| download | classpath-0162ecd7165c417c6fe6f7a53b9025c68fc448a6.tar.gz | |
* javax/swing/text/html/StyleSheet.java (removeAttributes):
Genericized.
* javax/swing/plaf/synth/SynthLookAndFeel.java (load): Genericized.
* java/rmi/server/RMIClassLoader.java (loadProxyClass): Genericized.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | java/rmi/server/RMIClassLoader.java | 4 | ||||
| -rw-r--r-- | javax/swing/plaf/synth/SynthLookAndFeel.java | 4 | ||||
| -rw-r--r-- | javax/swing/text/html/StyleSheet.java | 4 |
4 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2006-03-13 Tom Tromey <tromey@redhat.com> + + * javax/swing/text/html/StyleSheet.java (removeAttributes): + Genericized. + * javax/swing/plaf/synth/SynthLookAndFeel.java (load): Genericized. + * java/rmi/server/RMIClassLoader.java (loadProxyClass): Genericized. + 2006-03-08 Michael Koch <konqueror@gmx.de> * java/net/Proxy.java (NO_PROXY): Made final. diff --git a/java/rmi/server/RMIClassLoader.java b/java/rmi/server/RMIClassLoader.java index 1998f1fcf..7b69d2f2c 100644 --- a/java/rmi/server/RMIClassLoader.java +++ b/java/rmi/server/RMIClassLoader.java @@ -88,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(); diff --git a/javax/swing/plaf/synth/SynthLookAndFeel.java b/javax/swing/plaf/synth/SynthLookAndFeel.java index 8d0596d41..bf5bf5b64 100644 --- a/javax/swing/plaf/synth/SynthLookAndFeel.java +++ b/javax/swing/plaf/synth/SynthLookAndFeel.java @@ -207,9 +207,7 @@ public class SynthLookAndFeel * @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. diff --git a/javax/swing/text/html/StyleSheet.java b/javax/swing/text/html/StyleSheet.java index 2466a2808..f1e8f7da6 100644 --- a/javax/swing/text/html/StyleSheet.java +++ b/javax/swing/text/html/StyleSheet.java @@ -414,10 +414,10 @@ public class StyleSheet extends StyleContext * @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); } /** |