From cd7d48b2be30e0c6b1ae5355f6ee7e24af6190a0 Mon Sep 17 00:00:00 2001 From: Winnie Yick Date: Wed, 30 Aug 2006 22:12:03 +0000 Subject: [PATCH] ICU-5018 add methods for jdk 5.0 compatibility X-SVN-Rev: 20200 --- icu4j/src/com/ibm/icu/impl/CharsetMBCS.java | 10 ++++++++++ icu4j/src/com/ibm/icu/impl/CharsetUTF16.java | 10 ++++++++++ icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java | 10 ++++++++++ icu4j/src/com/ibm/icu/impl/CharsetUTF32.java | 10 ++++++++++ icu4j/src/com/ibm/icu/impl/CharsetUTF32LE.java | 10 ++++++++++ icu4j/src/com/ibm/icu/impl/CharsetUTF8.java | 10 ++++++++++ 6 files changed, 60 insertions(+) diff --git a/icu4j/src/com/ibm/icu/impl/CharsetMBCS.java b/icu4j/src/com/ibm/icu/impl/CharsetMBCS.java index a710478a5f9..6060846f283 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetMBCS.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetMBCS.java @@ -16,6 +16,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -3564,5 +3565,14 @@ public class CharsetMBCS extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderMBCS(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } } diff --git a/icu4j/src/com/ibm/icu/impl/CharsetUTF16.java b/icu4j/src/com/ibm/icu/impl/CharsetUTF16.java index 45fad5bb5ec..b0c9633c9a8 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetUTF16.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetUTF16.java @@ -12,6 +12,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -443,4 +444,13 @@ public class CharsetUTF16 extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderUTF16(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } } diff --git a/icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java b/icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java index f372592e936..5566d305688 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetUTF16LE.java @@ -12,6 +12,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -446,4 +447,13 @@ public class CharsetUTF16LE extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderUTF16LE(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } } diff --git a/icu4j/src/com/ibm/icu/impl/CharsetUTF32.java b/icu4j/src/com/ibm/icu/impl/CharsetUTF32.java index 48727d999f9..00e1b7bbecf 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetUTF32.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetUTF32.java @@ -12,6 +12,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -315,4 +316,13 @@ public class CharsetUTF32 extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderUTF32(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } } diff --git a/icu4j/src/com/ibm/icu/impl/CharsetUTF32LE.java b/icu4j/src/com/ibm/icu/impl/CharsetUTF32LE.java index eac8634b6d9..688c7a581cd 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetUTF32LE.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetUTF32LE.java @@ -12,6 +12,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -315,4 +316,13 @@ public class CharsetUTF32LE extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderUTF32LE(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } } diff --git a/icu4j/src/com/ibm/icu/impl/CharsetUTF8.java b/icu4j/src/com/ibm/icu/impl/CharsetUTF8.java index 241b4bd249d..e757e48b854 100644 --- a/icu4j/src/com/ibm/icu/impl/CharsetUTF8.java +++ b/icu4j/src/com/ibm/icu/impl/CharsetUTF8.java @@ -13,6 +13,7 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.IntBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; @@ -505,4 +506,13 @@ public class CharsetUTF8 extends CharsetICU { public CharsetEncoder newEncoder() { return new CharsetEncoderUTF8(this); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + public int compareTo(Object o) { + if(o instanceof Charset){ + return super.compareTo((Charset)o); + } + return -1; + } }