From 31a4dfe3e443431361c6c896f0b4afc1ce084a24 Mon Sep 17 00:00:00 2001
From: Shane Carr <shane@unicode.org>
Date: Thu, 8 Feb 2018 08:56:01 +0000
Subject: [PATCH] ICU-13574 Fixing compile errors introduced by last merge from
 trunk.

X-SVN-Rev: 40871
---
 .../impl/number/parse/NumberParserImpl.java   | 33 ++-----------------
 .../icu/dev/test/number/NumberParserTest.java |  7 ++--
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
index ea3a853fc44..6fd6050442f 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
@@ -31,30 +31,6 @@ import com.ibm.icu.util.ULocale;
  */
 public class NumberParserImpl {
 
-    @Deprecated
-    public static NumberParserImpl removeMeWhenMerged(ULocale locale, String pattern, int parseFlags) {
-        NumberParserImpl parser = new NumberParserImpl(parseFlags);
-        DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(locale);
-        IgnorablesMatcher ignorables = IgnorablesMatcher.DEFAULT;
-
-        MatcherFactory factory = new MatcherFactory();
-        factory.currency = Currency.getInstance("USD");
-        factory.symbols = symbols;
-        factory.ignorables = ignorables;
-        factory.locale = locale;
-
-        ParsedPatternInfo patternInfo = PatternStringParser.parseToPatternInfo(pattern);
-        AffixMatcher.newGenerate(patternInfo, parser, factory, ignorables, parseFlags);
-
-        Grouper grouper = Grouper.forStrategy(GroupingStrategy.AUTO).withLocaleData(locale, patternInfo);
-        parser.addMatcher(DecimalMatcher.getInstance(symbols, grouper, parseFlags));
-        parser.addMatcher(CurrencyTrieMatcher.getInstance(locale));
-        parser.addMatcher(NanMatcher.getInstance(symbols, parseFlags));
-
-        parser.freeze();
-        return parser;
-    }
-
     // TODO: Find a better place for this enum.
     /** Controls the set of rules for parsing a string. */
     public static enum ParseMode {
@@ -300,16 +276,11 @@ public class NumberParserImpl {
      *
      * @param parseFlags
      *            Settings for constructing the parser.
-     * @param computeLeads
-     *            If true, compute "lead chars" UnicodeSets for the matchers. This reduces parsing
-     *            runtime but increases construction runtime. If the parser is going to be used only once
-     *            or twice, set this to false; if it is going to be used hundreds of times, set it to
-     *            true.
      */
     public NumberParserImpl(int parseFlags) {
         matchers = new ArrayList<NumberParseMatcher>();
         if (0 != (parseFlags & ParsingUtils.PARSE_FLAG_OPTIMIZE)) {
-            leadCodePointses = new ArrayList<UnicodeSet>();
+            leads = new ArrayList<UnicodeSet>();
         } else {
             leads = null;
         }
@@ -344,7 +315,7 @@ public class NumberParserImpl {
             leadCodePoints = leadCodePoints.cloneAsThawed().closeOver(UnicodeSet.ADD_CASE_MAPPINGS)
                     .freeze();
         }
-        this.leadCodePointses.add(leadCodePoints);
+        this.leads.add(leadCodePoints);
     }
 
     public void setComparator(Comparator<ParsedNumber> comparator) {
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 726b4313b03..8c57dd6e1d9 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
@@ -238,15 +238,16 @@ public class NumberParserTest {
             int expectedCaseSensitiveChars = (Integer) cas[2];
             int expectedCaseFoldingChars = (Integer) cas[3];
 
-            NumberParserImpl caseSensitiveParser = NumberParserImpl
-                    .removeMeWhenMerged(ULocale.ENGLISH, patternString, ParsingUtils.PARSE_FLAG_OPTIMIZE);
+            NumberParserImpl caseSensitiveParser = NumberParserImpl.createSimpleParser(ULocale.ENGLISH,
+                    patternString,
+                    ParsingUtils.PARSE_FLAG_OPTIMIZE);
             ParsedNumber result = new ParsedNumber();
             caseSensitiveParser.parse(inputString, true, result);
             assertEquals("Case-Sensitive: " + inputString + " on " + patternString,
                     expectedCaseSensitiveChars,
                     result.charEnd);
 
-            NumberParserImpl caseFoldingParser = NumberParserImpl.removeMeWhenMerged(ULocale.ENGLISH,
+            NumberParserImpl caseFoldingParser = NumberParserImpl.createSimpleParser(ULocale.ENGLISH,
                     patternString,
                     ParsingUtils.PARSE_FLAG_IGNORE_CASE | ParsingUtils.PARSE_FLAG_OPTIMIZE);
             result = new ParsedNumber();
-- 
2.40.0