ICU-13574 Merging trunk to branch

X-SVN-Rev: 41004

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/AffixMatcher.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/InfinityMatcher.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParseMatcher.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
index e66d65342a51a7434391f82703bdad356da858e9,451044c670a4c5dc97071261c291f18d84ea12b9..01678fa75baea7b90e6f30043eb3bca6ad076187
--- 1/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
--- 2/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
@@@ -5,8 -5,10 +5,9 @@@ package com.ibm.icu.impl.number.parse
  import java.text.ParsePosition;
  import java.util.ArrayList;
  import java.util.Collection;
 -import java.util.Comparator;
  import java.util.List;
  
+ import com.ibm.icu.impl.StringSegment;
  import com.ibm.icu.impl.number.AffixPatternProvider;
  import com.ibm.icu.impl.number.CustomSymbolCurrency;
  import com.ibm.icu.impl.number.DecimalFormatProperties;

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/ParsedNumber.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/ScientificMatcher.java
index ebdd93c9abc6b924365222b320d720b1061159dc,a6656542baaa65d5c72485cf0caef2cdbf3f1aa0..a297a50006ea9ce93080a3cea9a688cc80fca2d0
--- 1/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/ScientificMatcher.java
--- 2/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/ScientificMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/ScientificMatcher.java
@@@ -48,11 -47,11 +49,11 @@@ public class ScientificMatcher implemen
              }
  
              // Allow a sign, and then try to match digits.
 -            boolean minusSign = false;
 +            int exponentSign = 1;
-             if (segment.matches(UnicodeSetStaticCache.get(UnicodeSetStaticCache.Key.MINUS_SIGN))) {
+             if (segment.startsWith(UnicodeSetStaticCache.get(UnicodeSetStaticCache.Key.MINUS_SIGN))) {
 -                minusSign = true;
 +                exponentSign = -1;
                  segment.adjustOffsetByCodePoint();
-             } else if (segment.matches(UnicodeSetStaticCache.get(UnicodeSetStaticCache.Key.PLUS_SIGN))) {
+             } else if (segment.startsWith(UnicodeSetStaticCache.get(UnicodeSetStaticCache.Key.PLUS_SIGN))) {
                  segment.adjustOffsetByCodePoint();
              }
  

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/SymbolMatcher.java
Simple merge

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

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java
index c1e5eaf84224dc181b8648118b29627cfbb87f13,04b3d7c5abc97e1d0e6da0367d9a426f7d38f53a..cd6915c2eb1f2b807714eb312e4982a9b915a686
--- 1/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberParserTest.java
--- 2/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
@@@ -7,11 -8,8 +7,12 @@@ import static org.junit.Assert.assertTr
  
  import org.junit.Test;
  
+ import com.ibm.icu.impl.StringSegment;
 +import com.ibm.icu.impl.number.CustomSymbolCurrency;
  import com.ibm.icu.impl.number.DecimalFormatProperties;
 +import com.ibm.icu.impl.number.parse.AffixPatternMatcher;
 +import com.ibm.icu.impl.number.parse.AffixTokenMatcherFactory;
 +import com.ibm.icu.impl.number.parse.AnyMatcher;
  import com.ibm.icu.impl.number.parse.IgnorablesMatcher;
  import com.ibm.icu.impl.number.parse.MinusSignMatcher;
  import com.ibm.icu.impl.number.parse.NumberParserImpl;