From: Shane Carr <shane@unicode.org>
Date: Wed, 28 Feb 2018 05:52:41 +0000 (+0000)
Subject: ICU-13574 Fixing build errors after merge.
X-Git-Tag: release-62-rc~200^2~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f133914b97bc5d2a6ba5d6a19354a6266047c0fb;p=icu

ICU-13574 Fixing build errors after merge.

X-SVN-Rev: 41007
---

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java
index 138abe82392..5a1f6bd62c7 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java
@@ -106,6 +106,13 @@ public class StringSegment implements CharSequence {
         return lead;
     }
 
+    /**
+     * Returns the code point at the given index relative to the current offset.
+     */
+    public int codePointAt(int index) {
+        return str.codePointAt(start + index);
+    }
+
     /**
      * Returns true if the first code point of this StringSegment equals the given code point.
      *
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyCustomMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyCustomMatcher.java
index 3df201889b3..d008a0686cf 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyCustomMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyCustomMatcher.java
@@ -2,6 +2,7 @@
 // License & terms of use: http://www.unicode.org/copyright.html#License
 package com.ibm.icu.impl.number.parse;
 
+import com.ibm.icu.impl.StringSegment;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Currency;
 import com.ibm.icu.util.ULocale;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyNamesMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyNamesMatcher.java
index 9fdef225045..0fcadbb9cbc 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyNamesMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/CurrencyNamesMatcher.java
@@ -4,6 +4,7 @@ package com.ibm.icu.impl.number.parse;
 
 import java.util.Iterator;
 
+import com.ibm.icu.impl.StringSegment;
 import com.ibm.icu.impl.TextTrieMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Currency;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java
index cd6915c2eb1..a522a289974 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java
@@ -249,7 +249,7 @@ public class NumberParserTest {
             String input = (String) cas[0];
             String expectedCurrencyCode = (String) cas[1];
 
-            StringSegment segment = new StringSegment(input, 0);
+            StringSegment segment = new StringSegment(input, true);
             ParsedNumber result = new ParsedNumber();
             matcher.match(segment, result);
             assertEquals("Parsing " + input, expectedCurrencyCode, result.currencyCode);
@@ -289,7 +289,7 @@ public class NumberParserTest {
             assertEquals(affixPattern + " " + exactMatch, expectedMatcherLength, matcher.length());
 
             // Check that the matcher works on a sample string
-            StringSegment segment = new StringSegment(sampleParseableString, 0);
+            StringSegment segment = new StringSegment(sampleParseableString, true);
             ParsedNumber result = new ParsedNumber();
             matcher.match(segment, result);
             assertEquals(affixPattern + " " + exactMatch,