summaryrefslogtreecommitdiffstats
path: root/icu/src/main/java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-01-21 18:32:19 -0800
committerElliott Hughes <enh@google.com>2010-01-21 20:33:19 -0800
commit4722f161d49b5c483aa7aec0daad7bfee18578bb (patch)
tree882bc7ee56958862e191e65ed92d076a8ce41c32 /icu/src/main/java
parentb56d4f145a425910db1f6201edc593b61127ca83 (diff)
downloadlibcore-4722f161d49b5c483aa7aec0daad7bfee18578bb.zip
libcore-4722f161d49b5c483aa7aec0daad7bfee18578bb.tar.gz
libcore-4722f161d49b5c483aa7aec0daad7bfee18578bb.tar.bz2
Minor tidy-up of some of the ICU interface.
Dead code, a class that shouldn't be instantiated, work that's probably better done all on the native side, and some slightly improved error reporting.
Diffstat (limited to 'icu/src/main/java')
-rw-r--r--icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java7
-rw-r--r--icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java20
-rw-r--r--icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java16
3 files changed, 4 insertions, 39 deletions
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java b/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
index 2bfb050..9af63ee 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
+++ b/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
@@ -330,13 +330,6 @@ final class NativeConverter{
public static final native boolean canDecode(long converterHandle,byte[] bytes);
/**
- * Gets the number of converters installed in the current installation of ICU
- * @return int number of converters installed
- * @internal ICU 2.4
- */
- public static final native int countAvailable();
-
- /**
* Gets the canonical names of available converters
* @return Object[] names as an object array
* @internal ICU 2.4
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java b/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
index 25249c7..e318e47 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
+++ b/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
@@ -15,26 +15,12 @@
*/
package com.ibm.icu4jni.text;
-
-final class NativeBreakIterator
-{
- public NativeBreakIterator() {
-
- }
- static String[] getAvailableLocalesImpl() {
- int count = getAvailableLocalesCountImpl();
- String[] result = new String[count];
-
- for(int i = 0; i < count; i++) {
- result[i] = getAvailableLocalesImpl(i);
- }
- return result;
+final class NativeBreakIterator {
+ private NativeBreakIterator() {
}
- private static native String getAvailableLocalesImpl(int i);
-
- private static native int getAvailableLocalesCountImpl();
+ static native String[] getAvailableLocalesImpl();
static native int getCharacterInstanceImpl(String locale);
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java b/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
index 2242b69..7d474ef 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
+++ b/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
@@ -245,19 +245,5 @@ final class NativeCollation
*/
static native void setOffset(int address, int offset);
- // BEGIN android-added
- static String[] getAvailableLocalesImpl() {
- int count = getAvailableLocalesCountImpl();
- String[] result = new String[count];
-
- for(int i = 0; i < count; i++) {
- result[i] = getAvailableLocalesImpl(i);
- }
- return result;
- }
-
- private static native String getAvailableLocalesImpl(int i);
-
- private static native int getAvailableLocalesCountImpl();
- // END android-added
+ static native String[] getAvailableLocalesImpl();
}