diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-01 21:36:01 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-01 21:36:01 +0000 |
commit | aab175428401b9ab51e99f673fc648479e228197 (patch) | |
tree | 57fd94d4413c128908a347a3f33787de9c0a3880 /libjava/java/nio | |
parent | 501270975a91bb86caf11a27390868612ca897d3 (diff) | |
download | ppe42-gcc-aab175428401b9ab51e99f673fc648479e228197.tar.gz ppe42-gcc-aab175428401b9ab51e99f673fc648479e228197.zip |
* java/util/logging/LogManager.java (loggers): Genericized.
(addLogger): Merged.
(findAncestor): Likewise.
(getLogger): Likewise.
(getLoggerNames): Genericized.
(reset): Merged.
(getLevelProperty): Likewise.
* java/lang/reflect/Method.java (getDeclaringClass): Genericized.
* java/lang/reflect/Constructor.java (getParameterTypes):
Genericized.
(getExceptionTypes): Likewise.
(newInstance): Likewise.
* java/lang/reflect/Array.java (newInstance): Genericized.
* java/lang/Object.java (getClass): Genericized.
* java/nio/charset/spi/CharsetProvider.java (charsets):
Genericized.
* java/text/Collator.java: Implement Comparable<Object>.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121473 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/nio')
-rw-r--r-- | libjava/java/nio/charset/spi/CharsetProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/nio/charset/spi/CharsetProvider.java b/libjava/java/nio/charset/spi/CharsetProvider.java index e15153fe9e6..d56723c3f43 100644 --- a/libjava/java/nio/charset/spi/CharsetProvider.java +++ b/libjava/java/nio/charset/spi/CharsetProvider.java @@ -1,5 +1,5 @@ /* CharsetProvider.java -- charset service provider interface - Copyright (C) 2002, 2006 Free Software Foundation + Copyright (C) 2002, 2006, 2007 Free Software Foundation This file is part of GNU Classpath. @@ -83,7 +83,7 @@ public abstract class CharsetProvider * @return the iterator * @see Charset#availableCharsets() */ - public abstract Iterator charsets(); + public abstract Iterator<Charset> charsets(); /** * Returns the named charset, by canonical name or alias. |