aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/nio
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2007-02-01 21:36:01 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-02-01 21:36:01 +0000
commit4d2446d99e1b97108188fcc3de70eaffcc46bc9f (patch)
tree57fd94d4413c128908a347a3f33787de9c0a3880 /libjava/java/nio
parent0a32f469ac256a842ac1f721c37dab7ad2cf5e21 (diff)
downloadgcc-4d2446d99e1b97108188fcc3de70eaffcc46bc9f.zip
gcc-4d2446d99e1b97108188fcc3de70eaffcc46bc9f.tar.gz
gcc-4d2446d99e1b97108188fcc3de70eaffcc46bc9f.tar.bz2
LogManager.java (loggers): Genericized.
* 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>. From-SVN: r121473
Diffstat (limited to 'libjava/java/nio')
-rw-r--r--libjava/java/nio/charset/spi/CharsetProvider.java4
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 e15153f..d56723c 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.