diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-11-17 20:44:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-11-17 20:44:03 +0000 |
| commit | 4cdfd292e374089da707399dd3a06ae18f19a094 (patch) | |
| tree | 0ca710082c0fee778050b7a6372e10201f7c22aa /libjava/java/text | |
| parent | 6414587c8b13a4a0a45788f411c9fe5fd87466ce (diff) | |
| download | gcc-4cdfd292e374089da707399dd3a06ae18f19a094.zip gcc-4cdfd292e374089da707399dd3a06ae18f19a094.tar.gz gcc-4cdfd292e374089da707399dd3a06ae18f19a094.tar.bz2 | |
CollationKey.java: Implement Comparable.
* java/text/CollationKey.java: Implement Comparable.
(compareTo(Object)): New method.
* java/text/Collator.java (compare(Object,Object)): New method.
Implement Comparator.
* java/util/zip/InflaterInputStream.java (available): New method.
(close): New method.
(read, available, skip, fill): Throw exception if stream closed.
* java/util/zip/ZipInputStream.java (read, skip, readFully, fill,
getNextEntry): Throw exception if closed.
From-SVN: r37525
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/CollationKey.java | 9 | ||||
| -rw-r--r-- | libjava/java/text/Collator.java | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libjava/java/text/CollationKey.java b/libjava/java/text/CollationKey.java index 725b66a..966c64d 100644 --- a/libjava/java/text/CollationKey.java +++ b/libjava/java/text/CollationKey.java @@ -1,6 +1,6 @@ // CollationKey.java - Sort key for locale-sensitive String. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -19,7 +19,7 @@ package java.text; * Status: Believed complete and correct. */ -public final class CollationKey +public final class CollationKey implements Comparable { public int compareTo (CollationKey target) { @@ -34,6 +34,11 @@ public final class CollationKey return key.length - target.key.length; } + public int compareTo (Object o) + { + return compareTo ((CollationKey) o); + } + public boolean equals (Object obj) { if (! (obj instanceof CollationKey)) diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index 4280ea2..60da531 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -13,6 +13,7 @@ package java.text; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; +import java.util.Comparator; /** * @author Tom Tromey <tromey@cygnus.com> @@ -23,7 +24,7 @@ import java.util.ResourceBundle; * Status: Mostly complete, but parts stubbed out. Look for FIXME. */ -public abstract class Collator implements Cloneable +public abstract class Collator implements Comparator, Cloneable { public static final int NO_DECOMPOSITION = 0; public static final int CANONICAL_DECOMPOSITION = 1; @@ -42,6 +43,11 @@ public abstract class Collator implements Cloneable public abstract int compare (String source, String target); + public int compare (Object o1, Object o2) + { + return compare ((String) o1, (String) o2); + } + public boolean equals (Object obj) { if (! (obj instanceof Collator)) |