ICU-10688 Remove redundant break type logic from BreakIterators. Merge to trunk.

X-SVN-Rev: 40967

diff --cc icu4c/source/common/dictbe.cpp
Simple merge

diff --cc icu4c/source/common/rbbi.cpp
Simple merge

diff --cc icu4c/source/common/rbbi_cache.cpp
index 0b9049eeb0a11deb9159974bce6d7d5e9de30f7c,fa2288631d9ac7f70b4b17196ed20cadd1163f92..44c66fbea363eb9e04350f8c072372c33875e14c
--- 1/icu4c/source/common/rbbi_cache.cpp
--- 2/icu4c/source/common/rbbi_cache.cpp
+++ b/icu4c/source/common/rbbi_cache.cpp
@@@ -165,7 -168,7 +165,7 @@@ void RuleBasedBreakIterator::Dictionary
          // Ask the language object if there are any breaks. It will add them to the cache and
          // leave the text pointer on the other side of its range, ready to search for the next one.
          if (lbe != NULL) {
-             foundBreakCount += lbe->findBreaks(text, rangeStart, rangeEnd, fBI->fBreakType, fBreaks);
 -            foundBreakCount += lbe->findBreaks(text, rangeStart, rangeEnd, *fBreaks);
++            foundBreakCount += lbe->findBreaks(text, rangeStart, rangeEnd, fBreaks);
          }
  
          // Reload the loop variables for the next go-round

diff --cc icu4c/source/common/unicode/brkiter.h
Simple merge

diff --cc icu4c/source/common/unicode/rbbi.h
index 165fabc7b5795c68db25eeedf7979ae2d3d3b12f,e8bfc9a9c0952ca8b33e3ddef69be9fd5c7e0450..414d638968b24b3e5cf8a5cdf3bcd491af7bb550
--- 1/icu4c/source/common/unicode/rbbi.h
--- 2/icu4c/source/common/unicode/rbbi.h
+++ b/icu4c/source/common/unicode/rbbi.h
@@@ -117,39 -149,6 +117,32 @@@ private
       */
      UnhandledEngine     *fUnhandledBreakEngine;
  
-     /**
-      *
-      * The type of the break iterator, or -1 if it has not been set.
-      * @internal
-      */
-     int32_t             fBreakType;
- 
 +    /**
 +     * Counter for the number of characters encountered with the "dictionary"
 +     *   flag set.
 +     * @internal
 +     */
 +    uint32_t            fDictionaryCharCount;
 +
 +    /**
 +     *   A character iterator that refers to the same text as the UText, above.
 +     *   Only included for compatibility with old API, which was based on CharacterIterators.
 +     *   Value may be adopted from outside, or one of fSCharIter or fDCharIter, below.
 +     */
 +    CharacterIterator  *fCharIter;
 +
 +    /**
 +     *   When the input text is provided by a UnicodeString, this will point to
 +     *    a characterIterator that wraps that data.  Needed only for the
 +     *    implementation of getText(), a backwards compatibility issue.
 +     */
 +    StringCharacterIterator fSCharIter;
 +
 +    /**
 +      * True when iteration has run off the end, and iterator functions should return UBRK_DONE.
 +      */
 +    UBool           fDone;
 +
      //=======================================================================
      // constructors
      //=======================================================================

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/CjkBreakEngine.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/DictionaryBreakEngine.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
Simple merge