From 6c75d439b95ceed4086398fe6d386858893850cd Mon Sep 17 00:00:00 2001
From: Norbert Lindenberg <norbert@svn.icu-project.org>
Date: Fri, 24 Sep 2010 22:35:43 +0000
Subject: [PATCH] ICU-7772 Use UCharacterDirection instead of
 ECharacterDirection per Markus's review comments.

X-SVN-Rev: 28695
---
 .../classes/core/src/com/ibm/icu/lang/UCharacter.java    | 1 +
 icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
index f5016be3f6d..df81e79dbd2 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
@@ -5760,6 +5760,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
      * or out-of-bounds characters.
      *
      * {@icunote} The return value must be tested using the constants defined in {@link
+     * UCharacterDirection} and its interface {@link
      * UCharacterEnums.ECharacterDirection} since the values are different from the ones
      * defined by <code>java.lang.Character</code>.
      * @param cp the code point to check
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java b/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
index d233b8b57c3..0c3372ade90 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
@@ -34,7 +34,6 @@ import java.util.Arrays;
 import com.ibm.icu.impl.UBiDiProps;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UCharacterDirection;
-import com.ibm.icu.lang.UCharacterEnums;
 
 /**
  *
@@ -568,6 +567,7 @@ public class Bidi {
      *    that the source string is missing or empty, or contains neither 
      *    left-to-right nor right-to-left characters. 
      * @draft ICU 4.6
+     * @provisional This API might change or be removed in a future release.
      */
     public static final byte NEUTRAL = 3;
 
@@ -4884,6 +4884,7 @@ public class Bidi {
      * @see #RTL
      * @see #NEUTRAL
      * @draft ICU 4.6
+     * @provisional This API might change or be removed in a future release.
      */
     public static byte getBaseDirection(CharSequence paragraph) {
         if (paragraph == null || paragraph.length() == 0) {
@@ -4898,10 +4899,10 @@ public class Bidi {
             // U16_NEXT(paragraph, i, length, c) for C++
             c = UCharacter.codePointAt(paragraph, i);
             direction = UCharacter.getDirectionality(c);
-            if (direction == UCharacterEnums.ECharacterDirection.DIRECTIONALITY_LEFT_TO_RIGHT) {
+            if (direction == UCharacterDirection.LEFT_TO_RIGHT) {
                 return LTR;
-            } else if (direction == UCharacterEnums.ECharacterDirection.DIRECTIONALITY_RIGHT_TO_LEFT
-                || direction == UCharacterEnums.ECharacterDirection.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC) {
+            } else if (direction == UCharacterDirection.RIGHT_TO_LEFT
+                || direction == UCharacterDirection.RIGHT_TO_LEFT_ARABIC) {
                 return RTL;
             }