summaryrefslogtreecommitdiff
path: root/libjava/java/text/Collator.java
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-17 20:44:03 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-17 20:44:03 +0000
commit580b82bc48703ed0f56f3c2534b0a7294cabd7e6 (patch)
tree0ca710082c0fee778050b7a6372e10201f7c22aa /libjava/java/text/Collator.java
parent469ea67a3296430eb9039a155063191b9f62cc28 (diff)
downloadgcc-580b82bc48703ed0f56f3c2534b0a7294cabd7e6.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37525 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text/Collator.java')
-rw-r--r--libjava/java/text/Collator.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java
index 4280ea235c3..60da5312b4f 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))