From 17efc1e84d1e59e2a49c485d9aaf9bfacddad440 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Fri, 8 Sep 2006 23:37:02 +0000 Subject: [PATCH] ICU-5375 Fix some compiler warnings. X-SVN-Rev: 20289 --- icu4j/src/com/ibm/icu/charset/CharsetICU.java | 2 +- icu4j/src/com/ibm/icu/charset/CharsetMBCS.java | 2 +- icu4j/src/com/ibm/icu/charset/CharsetUTF16.java | 2 +- icu4j/src/com/ibm/icu/charset/CharsetUTF16LE.java | 2 +- icu4j/src/com/ibm/icu/charset/CharsetUTF8.java | 2 +- icu4j/src/com/ibm/icu/charset/UConverterConstants.java | 7 +++---- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/icu4j/src/com/ibm/icu/charset/CharsetICU.java b/icu4j/src/com/ibm/icu/charset/CharsetICU.java index 9a67839283..c89985d7c7 100644 --- a/icu4j/src/com/ibm/icu/charset/CharsetICU.java +++ b/icu4j/src/com/ibm/icu/charset/CharsetICU.java @@ -22,7 +22,7 @@ import java.util.HashMap; import com.ibm.icu.lang.UCharacter; /** *

This API is used to convert codepage or character encoded data to and - * from UTF-16. You can open a converter with {@link forName() } and {@link forNameICU() }. With that + * from UTF-16. You can open a converter with {@link Charset#forName } and {@link #forNameICU }. With that * converter, you can get its properties, set options, convert your data.

* *

Since many software programs recogize different converter names for diff --git a/icu4j/src/com/ibm/icu/charset/CharsetMBCS.java b/icu4j/src/com/ibm/icu/charset/CharsetMBCS.java index d79be37c81..78ffba2189 100644 --- a/icu4j/src/com/ibm/icu/charset/CharsetMBCS.java +++ b/icu4j/src/com/ibm/icu/charset/CharsetMBCS.java @@ -2875,7 +2875,7 @@ class CharsetMBCS extends CharsetICU { if(range[0]<=cp && cp<=range[1]) { /* found the Unicode code point, output the four-byte sequence for it */ long linear; - byte bytes[] = new byte[4];; + byte bytes[] = new byte[4]; /* get the linear value of the first GB 18030 code in this range */ linear=range[2]-LINEAR_18030_BASE; diff --git a/icu4j/src/com/ibm/icu/charset/CharsetUTF16.java b/icu4j/src/com/ibm/icu/charset/CharsetUTF16.java index 6d428fd7e6..1deb9763c8 100644 --- a/icu4j/src/com/ibm/icu/charset/CharsetUTF16.java +++ b/icu4j/src/com/ibm/icu/charset/CharsetUTF16.java @@ -122,7 +122,7 @@ class CharsetUTF16 extends CharsetICU { --sourceArrayIndex; } toULength=2; - cr = CoderResult.malformedForLength(sourceArrayIndex);; + cr = CoderResult.malformedForLength(sourceArrayIndex); } } } while(length>0); diff --git a/icu4j/src/com/ibm/icu/charset/CharsetUTF16LE.java b/icu4j/src/com/ibm/icu/charset/CharsetUTF16LE.java index 3d22711df1..5ab4cec8f3 100644 --- a/icu4j/src/com/ibm/icu/charset/CharsetUTF16LE.java +++ b/icu4j/src/com/ibm/icu/charset/CharsetUTF16LE.java @@ -125,7 +125,7 @@ class CharsetUTF16LE extends CharsetICU { --sourceArrayIndex; } toULength=2; - cr = CoderResult.malformedForLength(sourceArrayIndex);; + cr = CoderResult.malformedForLength(sourceArrayIndex); } } } while(length>0); diff --git a/icu4j/src/com/ibm/icu/charset/CharsetUTF8.java b/icu4j/src/com/ibm/icu/charset/CharsetUTF8.java index 44115624e6..2f97af81eb 100644 --- a/icu4j/src/com/ibm/icu/charset/CharsetUTF8.java +++ b/icu4j/src/com/ibm/icu/charset/CharsetUTF8.java @@ -370,7 +370,7 @@ class CharsetUTF8 extends CharsetICU { /* this is an unmatched lead code unit (1st surrogate) */ /* callback(illegal) */ fromUChar32 = ch; - cr = CoderResult.malformedForLength(sourceArrayIndex);; + cr = CoderResult.malformedForLength(sourceArrayIndex); break; } } diff --git a/icu4j/src/com/ibm/icu/charset/UConverterConstants.java b/icu4j/src/com/ibm/icu/charset/UConverterConstants.java index 46d226c1d2..38272e76d7 100644 --- a/icu4j/src/com/ibm/icu/charset/UConverterConstants.java +++ b/icu4j/src/com/ibm/icu/charset/UConverterConstants.java @@ -45,7 +45,7 @@ interface UConverterConstants { //begin ucnv.h /** * Character that separates converter names from options and options from each other. - * @see open + * @see CharsetICU#forNameICU(String) * @draft ICU 3.6 */ static final byte OPTION_SEP_CHAR = ','; @@ -97,7 +97,7 @@ interface UConverterConstants { * private constructor to prevent construction * */ - private UConverterResetChoice(){}; + private UConverterResetChoice(){} static final int RESET_BOTH = 0; static final int RESET_TO_UNICODE = RESET_BOTH + 1; static final int RESET_FROM_UNICODE = RESET_TO_UNICODE + 1; @@ -106,7 +106,6 @@ interface UConverterConstants { // begin utf16.h /** * The maximum number of 16-bit code units per Unicode code point (U+0000..U+10ffff). - * @return 2 * @draft ICU 2.4 */ static final int U16_MAX_LENGTH = 2; @@ -137,7 +136,7 @@ interface UConverterConstants { * private constructor to prevent construction * */ - private UConverterCallbackReason(){}; + private UConverterCallbackReason(){} static final int UNASSIGNED = 0; /**< The code point is unassigned. The error code U_INVALID_CHAR_FOUND will be set. */