diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-28 23:50:09 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-28 23:50:09 +0000 |
| commit | fa061b7189bfcd21a02ccac393da26ed92f4b21b (patch) | |
| tree | fe6495a24ff49d8088f8e8769b483db47a255cc6 /java | |
| parent | c0daa0df39fcb3be58fba09bb936f515368b085e (diff) | |
| download | classpath-fa061b7189bfcd21a02ccac393da26ed92f4b21b.tar.gz | |
2008-02-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/EmptyEnumeration.java:
Add generic type parameter.
* java/lang/ClassLoader.java:
Use EmptyEnumeration with type parameter.
* java/util/zip/ZipFile.java:
Likewise.
* javax/swing/text/html/StyleSheet.java,
* javax/swing/text/html/ViewAttributeSet.java:
Add generics.
* javax/swing/tree/DefaultMutableTreeNode.java:
Use EmptyEnumeration with type parameter.
Diffstat (limited to 'java')
| -rw-r--r-- | java/lang/ClassLoader.java | 2 | ||||
| -rw-r--r-- | java/util/zip/ZipFile.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/lang/ClassLoader.java b/java/lang/ClassLoader.java index 3d7c32cc9..591406ac4 100644 --- a/java/lang/ClassLoader.java +++ b/java/lang/ClassLoader.java @@ -659,7 +659,7 @@ public abstract class ClassLoader */ protected Enumeration<URL> findResources(String name) throws IOException { - return (Enumeration<URL>) EmptyEnumeration.getInstance(); + return new EmptyEnumeration<URL>(); } /** diff --git a/java/util/zip/ZipFile.java b/java/util/zip/ZipFile.java index 3b34bd1f5..7cf7007ed 100644 --- a/java/util/zip/ZipFile.java +++ b/java/util/zip/ZipFile.java @@ -340,7 +340,7 @@ public class ZipFile implements ZipConstants } catch (IOException ioe) { - return EmptyEnumeration.getInstance(); + return new EmptyEnumeration<ZipEntry>(); } } |