aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/text
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/text
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/text')
-rw-r--r--libjava/java/text/Collator.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java
index c1ba87e9..aa64316 100644
--- a/libjava/java/text/Collator.java
+++ b/libjava/java/text/Collator.java
@@ -1,5 +1,5 @@
/* Collator.java -- Perform locale dependent String comparisons.
- Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -68,11 +68,7 @@ import java.util.ResourceBundle;
* @author Aaron M. Renn (arenn@urbanophile.com)
* @date March 18, 1999
*/
-/* Written using "Java Class Libraries", 2nd edition, plus online
- * API docs for JDK 1.2 from http://www.javasoft.com.
- * Status: Mostly complete, but parts stubbed out. Look for FIXME.
- */
-public abstract class Collator implements Comparator, Cloneable
+public abstract class Collator implements Comparator<Object>, Cloneable
{
/**
* This constant is a strength value which indicates that only primary
@@ -292,7 +288,7 @@ public abstract class Collator implements Comparator, Cloneable
* specified locale. If no <code>Collator</code> exists for the desired
* locale, a <code>Collator</code> for the default locale will be returned.
*
- * @param loc The desired localed to load a <code>Collator</code> for.
+ * @param loc The desired locale to load a <code>Collator</code> for.
*
* @return A <code>Collator</code> for the requested locale
*/