ticket:13073 Exposing PluralRules as a setter on the number format property bag.

ticket:13073 Exposing PluralRules as a setter on the number format property bag.

[mark_macchiato.com, 2017-05-17 03:34:44]

Thanks, code looks good!

{phone}

On May 16, 2017 19:24, <sffc@google.com> wrote:

> Reviewers: andy.heninger, mark_macchiato.com,
>
> Description:
> ticket:13073 Exposing PluralRules as a setter on the number format
> property bag.
>
> Please review this at https://codereview.appspot.com/320590043/
>
> Affected files (+65, -3 lines):
>   M     icu4j/main/classes/core/src/com/ibm/icu/impl/number/Endpoint.java
>   M     icu4j/main/classes/core/src/com/ibm/icu/impl/number/Propert
> ies.java
>   M     icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/Nu
> mberFormatTest.java
>   M     icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/Pr
> opertiesTest.java
>
>
> Index: icu4j/main/classes/core/src/com/ibm/icu/impl/number/Endpoint.java
> ===================================================================
> --- icu4j/main/classes/core/src/com/ibm/icu/impl/number/Endpoint.java
>  (revision 40121)
> +++ icu4j/main/classes/core/src/com/ibm/icu/impl/number/Endpoint.java
>  (working copy)
> @@ -45,6 +45,14 @@
>    //    return format;
>    //  }
>
> +  public static interface IProperties {
> +    static PluralRules DEFAULT_PLURAL_RULES = null;
> +
> +    public PluralRules getPluralRules();
> +
> +    public IProperties setPluralRules(PluralRules pluralRules);
> +  }
> +
>    public static Format fromBTA(Properties properties) {
>      return fromBTA(properties, getSymbols());
>    }
> @@ -102,8 +110,8 @@
>        if (CompactDecimalFormat.useCompactDecimalFormat(properties)) {
>          format.addBeforeFormat(CompactDecimalFormat.getInstance(symbols,
> properties));
>        } else if (ScientificFormat.useScientificNotation(properties)) {
> -          // TODO: Should the currency rounder or scientific rounder be
> used in this case?
> -          // For now, default to using the scientific rounder.
> +        // TODO: Should the currency rounder or scientific rounder be
> used in this case?
> +        // For now, default to using the scientific rounder.
>         
format.addBeforeFormat(PositiveNegativeAffixFormat.getInstance(symbols,
> properties));
>          format.addBeforeFormat(ScientificFormat.getInstance(symbols,
> properties));
>        } else {
> @@ -270,6 +278,10 @@
>        };
>
>    private static PluralRules getPluralRules(ULocale uLocale, Properties
> properties) {
> +    if (properties.getPluralRules() != null) {
> +      return properties.getPluralRules();
> +    }
> +
>      // Backwards compatibility: CurrencyPluralInfo wraps its own copy of
> PluralRules
>      if (properties.getCurrencyPluralInfo() != null) {
>        return properties.getCurrencyPluralInfo().getPluralRules();
> Index: icu4j/main/classes/core/src/com/ibm/icu/impl/number/Properties.java
> ===================================================================
> --- icu4j/main/classes/core/src/com/ibm/icu/impl/number/Properties.java
> (revision 40121)
> +++ icu4j/main/classes/core/src/com/ibm/icu/impl/number/Properties.java
> (working copy)
> @@ -34,6 +34,7 @@
>  import com.ibm.icu.text.CurrencyPluralInfo;
>  import com.ibm.icu.text.DecimalFormat.SignificantDigitsMode;
>  import com.ibm.icu.text.MeasureFormat.FormatWidth;
> +import com.ibm.icu.text.PluralRules;
>  import com.ibm.icu.util.Currency;
>  import com.ibm.icu.util.Currency.CurrencyUsage;
>  import com.ibm.icu.util.MeasureUnit;
> @@ -53,7 +54,8 @@
>          Parse.IProperties,
>          IncrementRounder.IProperties,
>          MagnitudeRounder.IProperties,
> -        SignificantDigitsRounder.IProperties {
> +        SignificantDigitsRounder.IProperties,
> +        Endpoint.IProperties {
>
>    private static final Properties DEFAULT = new Properties();
>
> @@ -110,6 +112,7 @@
>    private transient ParseMode parseMode;
>    private transient boolean parseNoExponent;
>    private transient boolean parseToBigDecimal;
> +  private transient PluralRules pluralRules;
>    private transient String positivePrefix;
>    private transient String positivePrefixPattern;
>    private transient String positiveSuffix;
> @@ -170,6 +173,7 @@
>      parseMode = DEFAULT_PARSE_MODE;
>      parseNoExponent = DEFAULT_PARSE_NO_EXPONENT;
>      parseToBigDecimal = DEFAULT_PARSE_TO_BIG_DECIMAL;
> +    pluralRules = DEFAULT_PLURAL_RULES;
>      positivePrefix = DEFAULT_POSITIVE_PREFIX;
>      positivePrefixPattern = DEFAULT_POSITIVE_PREFIX_PATTERN;
>      positiveSuffix = DEFAULT_POSITIVE_SUFFIX;
> @@ -219,6 +223,7 @@
>      parseMode = other.parseMode;
>      parseNoExponent = other.parseNoExponent;
>      parseToBigDecimal = other.parseToBigDecimal;
> +    pluralRules = other.pluralRules;
>      positivePrefix = other.positivePrefix;
>      positivePrefixPattern = other.positivePrefixPattern;
>      positiveSuffix = other.positiveSuffix;
> @@ -269,6 +274,7 @@
>      eq = eq && _equalsHelper(parseMode, other.parseMode);
>      eq = eq && _equalsHelper(parseNoExponent, other.parseNoExponent);
>      eq = eq && _equalsHelper(parseToBigDecimal, other.parseToBigDecimal);
> +    eq = eq && _equalsHelper(pluralRules, other.pluralRules);
>      eq = eq && _equalsHelper(positivePrefix, other.positivePrefix);
>      eq = eq && _equalsHelper(positivePrefixPattern,
> other.positivePrefixPattern);
>      eq = eq && _equalsHelper(positiveSuffix, other.positiveSuffix);
> @@ -333,6 +339,7 @@
>      hashCode ^= _hashCodeHelper(parseMode);
>      hashCode ^= _hashCodeHelper(parseNoExponent);
>      hashCode ^= _hashCodeHelper(parseToBigDecimal);
> +    hashCode ^= _hashCodeHelper(pluralRules);
>      hashCode ^= _hashCodeHelper(positivePrefix);
>      hashCode ^= _hashCodeHelper(positivePrefixPattern);
>      hashCode ^= _hashCodeHelper(positiveSuffix);
> @@ -576,6 +583,11 @@
>    }
>
>    @Override
> +  public PluralRules getPluralRules() {
> +    return pluralRules;
> +  }
> +
> +  @Override
>    public String getPositivePrefix() {
>      return positivePrefix;
>    }
> @@ -673,6 +685,7 @@
>
>    @Override
>    public Properties setCompactCustomData(Map<String, Map<String,
> String>> compactCustomData) {
> +      // TODO: compactCustomData is not immutable.
>      this.compactCustomData = compactCustomData;
>      return this;
>    }
> @@ -894,6 +907,12 @@
>    }
>
>    @Override
> +  public Properties setPluralRules(PluralRules pluralRules) {
> +    this.pluralRules = pluralRules;
> +    return this;
> +  }
> +
> +  @Override
>    public Properties setPositivePrefix(String positivePrefix) {
>      this.positivePrefix = positivePrefix;
>      return this;
> Index: icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/Number
> FormatTest.java
> ===================================================================
> ---
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
> (revision 40121)
> +++
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
> (working copy)
> @@ -41,10 +41,13 @@
>  import com.ibm.icu.impl.LocaleUtility;
>  import com.ibm.icu.impl.data.ResourceReader;
>  import com.ibm.icu.impl.data.TokenIterator;
> +import com.ibm.icu.impl.number.Properties;
>  import com.ibm.icu.math.BigDecimal;
>  import com.ibm.icu.math.MathContext;
>  import com.ibm.icu.text.CompactDecimalFormat;
> +import com.ibm.icu.text.CurrencyPluralInfo;
>  import com.ibm.icu.text.DecimalFormat;
> +import com.ibm.icu.text.DecimalFormat.PropertySetter;
>  import com.ibm.icu.text.DecimalFormat.SignificantDigitsMode;
>  import com.ibm.icu.text.DecimalFormatSymbols;
>  import com.ibm.icu.text.DisplayContext;
> @@ -53,6 +56,7 @@
>  import com.ibm.icu.text.NumberFormat.NumberFormatFactory;
>  import com.ibm.icu.text.NumberFormat.SimpleNumberFormatFactory;
>  import com.ibm.icu.text.NumberingSystem;
> +import com.ibm.icu.text.PluralRules;
>  import com.ibm.icu.text.RuleBasedNumberFormat;
>  import com.ibm.icu.util.Currency;
>  import com.ibm.icu.util.Currency.CurrencyUsage;
> @@ -5545,4 +5549,25 @@
>              }
>          }
>      }
> +
> +    @Test
> +    public void TestCurrencyPluralInfoAndCustomPluralRules() throws
> ParseException {
> +        DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstan
> ce(ULocale.ENGLISH);
> +        final PluralRules rules = PluralRules.parseDescription("one: n
> is 1; few: n in 2..4");
> +        CurrencyPluralInfo info = CurrencyPluralInfo.getInstance
> (ULocale.ENGLISH);
> +        info.setCurrencyPluralPattern("one", "0 qwerty");
> +        info.setCurrencyPluralPattern("few", "0 dvorak");
> +        DecimalFormat df = new DecimalFormat("#", symbols, info,
> NumberFormat.CURRENCYSTYLE);
> +        df.setCurrency(Currency.getInstance("USD"));
> +        df.setProperties(new PropertySetter(){
> +            @Override
> +            public void set(Properties props) {
> +                props.setPluralRules(rules);
> +            }
> +        });
> +
> +        assertEquals("Plural one", "1.00 qwerty", df.format(1));
> +        assertEquals("Plural few", "3.00 dvorak", df.format(3));
> +        assertEquals("Plural other", "5.80 US dollars", df.format(5.8));
> +    }
>  }
> Index: icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/Proper
> tiesTest.java
> ===================================================================
> --- icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/PropertiesTest.java
>  (revision 40121)
> +++ icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/PropertiesTest.java
>  (working copy)
> @@ -39,6 +39,7 @@
>  import com.ibm.icu.text.CurrencyPluralInfo;
>  import com.ibm.icu.text.DecimalFormat.SignificantDigitsMode;
>  import com.ibm.icu.text.MeasureFormat.FormatWidth;
> +import com.ibm.icu.text.PluralRules;
>  import com.ibm.icu.util.Currency;
>  import com.ibm.icu.util.Currency.CurrencyUsage;
>  import com.ibm.icu.util.MeasureUnit;
> @@ -295,6 +296,11 @@
>        ParseMode[] values = ParseMode.values();
>        return values[seed % values.length];
>
> +    } else if (type == PluralRules.class) {
> +      if (seed == 0) return null;
> +      ULocale[] locales = PluralRules.getAvailableULocales();
> +      return PluralRules.forLocale(locales[seed % locales.length]);
> +
>      } else if (type == RoundingMode.class) {
>        if (seed == 0) return null;
>        RoundingMode[] values = RoundingMode.values();
>
>
>

[andy.heninger, 2017-05-18 21:54:15]

LGRM

[sffc, 2017-05-18 21:57:29]

On 2017/05/18 21:54:15, andy.heninger wrote:
> LGRM

Committed as r40122.