am 10ebc7d0: Merge "Implement (but @hide) java.text.Normalizer from Java 6."

Merge commit '10ebc7d0b84dcb98e1a7eeac96ef06acdfc8d184' into dalvik-dev

* commit '10ebc7d0b84dcb98e1a7eeac96ef06acdfc8d184':
  Implement (but @hide) java.text.Normalizer from Java 6.

4 files changed, 98 insertions, 0 deletions

diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java b/icu/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
new file mode 100644
index 0000000..f14b6c1
--- /dev/null
+++ b/icu/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.ibm.icu4jni.text;
+
+import java.text.Normalizer.Form;
+
+public final class NativeNormalizer {
+    public static boolean isNormalized(CharSequence src, Form form) {
+        return isNormalizedImpl(src.toString(), toUNormalizationMode(form));
+    }
+
+    public static String normalize(CharSequence src, Form form) {
+        return normalizeImpl(src.toString(), toUNormalizationMode(form));
+    }
+
+    private static int toUNormalizationMode(Form form) {
+        // Translates Java enum constants to ICU int constants.
+        // See UNormalizationMode in "unicode/unorm.h". Stable API since ICU 2.0.
+        switch (form) {
+        case NFC: return 4;
+        case NFD: return 2;
+        case NFKC: return 5;
+        case NFKD: return 3;
+        }
+        throw new AssertionError("unknown Normalizer.Form " + form);
+    }
+
+    private static native String normalizeImpl(String src, int form);
+
+    private static native boolean isNormalizedImpl(String src, int form);
+
+    private NativeNormalizer() {}
+}
diff --git a/icu/src/main/native/NativeNormalizer.cpp b/icu/src/main/native/NativeNormalizer.cpp
new file mode 100644
index 0000000..b09b26e
--- /dev/null
+++ b/icu/src/main/native/NativeNormalizer.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ErrorCode.h"
+#include "JNIHelp.h"
+#include "ScopedJavaUnicodeString.h"
+#include "unicode/normlzr.h"
+
+static jstring normalizeImpl(JNIEnv* env, jclass, jstring s, jint intMode) {
+    ScopedJavaUnicodeString src(env, s);
+    UNormalizationMode mode = static_cast<UNormalizationMode>(intMode);
+    UErrorCode errorCode = U_ZERO_ERROR;
+    UnicodeString dst;
+    Normalizer::normalize(src.unicodeString(), mode, 0, dst, errorCode);
+    icu4jni_error(env, errorCode);
+    return dst.isBogus() ? NULL : env->NewString(dst.getBuffer(), dst.length());
+}
+
+static jboolean isNormalizedImpl(JNIEnv* env, jclass, jstring s, jint intMode) {
+    ScopedJavaUnicodeString src(env, s);
+    UNormalizationMode mode = static_cast<UNormalizationMode>(intMode);
+    UErrorCode errorCode = U_ZERO_ERROR;
+    UBool result = Normalizer::isNormalized(src.unicodeString(), mode, errorCode);
+    icu4jni_error(env, errorCode);
+    return result;
+}
+
+static JNINativeMethod gMethods[] = {
+    /* name, signature, funcPtr */
+    {"normalizeImpl", "(Ljava/lang/String;I)Ljava/lang/String;", (void*) normalizeImpl},
+    {"isNormalizedImpl", "(Ljava/lang/String;I)Z", (void*) isNormalizedImpl},
+};
+extern "C" int register_com_ibm_icu4jni_text_NativeNormalizer(JNIEnv* env) {
+    return jniRegisterNativeMethods(env,
+            "com/ibm/icu4jni/text/NativeNormalizer", gMethods, NELEM(gMethods));
+}
diff --git a/icu/src/main/native/ScopedJavaUnicodeString.h b/icu/src/main/native/ScopedJavaUnicodeString.h
index 3486aac..44952b4 100644
--- a/icu/src/main/native/ScopedJavaUnicodeString.h
+++ b/icu/src/main/native/ScopedJavaUnicodeString.h
@@ -18,6 +18,7 @@
 #define SCOPED_JAVA_UNICODE_STRING_H_included
 
 #include "JNIHelp.h"
+#include "unicode/unistr.h"
 
 // A smart pointer that provides access to an ICU UnicodeString given a JNI
 // jstring. We give ICU a direct pointer to the characters on the Java heap.
diff --git a/icu/src/main/native/sub.mk b/icu/src/main/native/sub.mk
index 3c13ea0..b101531 100644
--- a/icu/src/main/native/sub.mk
+++ b/icu/src/main/native/sub.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \
 	NativeCollation.cpp \
 	NativeConverter.cpp \
 	NativeDecimalFormat.cpp \
+	NativeNormalizer.cpp \
 	NativeRegEx.cpp \
 	Resources.cpp \
 	UCharacter.cpp