organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 13:35:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-21397 Allow null to unset options in Java NumberRangeFormatter

Browse source
This commit is contained in:
Shane F. Carr 2021-03-09 01:33:30 -06:00
parent 09149bc795
commit 74eb9e621b
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterSettings.java
View file

@ -149,41 +149,37 @@ public abstract class NumberRangeFormatterSettings<T extends NumberRangeFormatte
// of a MacroProps object at each step.
// TODO: Remove the reference to the parent after the macros are resolved?
RangeMacroProps macros = new RangeMacroProps();
// Bitmap: 1 if seen; 0 if unseen
long seen = 0;
NumberRangeFormatterSettings<?> current = this;
while (current != null) {
long keyBitmask = (1L << current.key);
if (0 != (seen & keyBitmask)) {
current = current.parent;
continue;
}
seen |= keyBitmask;
switch (current.key) {
case KEY_MACROS:
// ignored for now
break;
case KEY_LOCALE:
if (macros.loc == null) {
macros.loc = (ULocale) current.value;
}
macros.loc = (ULocale) current.value;
break;
case KEY_FORMATTER_1:
if (macros.formatter1 == null) {
macros.formatter1 = (UnlocalizedNumberFormatter) current.value;
}
macros.formatter1 = (UnlocalizedNumberFormatter) current.value;
break;
case KEY_FORMATTER_2:
if (macros.formatter2 == null) {
macros.formatter2 = (UnlocalizedNumberFormatter) current.value;
}
macros.formatter2 = (UnlocalizedNumberFormatter) current.value;
break;
case KEY_SAME_FORMATTERS:
if (macros.sameFormatters == -1) {
macros.sameFormatters = (boolean) current.value ? 1 : 0;
}
macros.sameFormatters = (boolean) current.value ? 1 : 0;
break;
case KEY_COLLAPSE:
if (macros.collapse == null) {
macros.collapse = (RangeCollapse) current.value;
}
macros.collapse = (RangeCollapse) current.value;
break;
case KEY_IDENTITY_FALLBACK:
if (macros.identityFallback == null) {
macros.identityFallback = (RangeIdentityFallback) current.value;
}
macros.identityFallback = (RangeIdentityFallback) current.value;
break;
default:
throw new AssertionError("Unknown key: " + current.key);

20
icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java
View file

@ -664,6 +664,26 @@ public class NumberRangeFormatterTest extends TestFmwk {
"5,000–5,000,000");
}
@Test
public void test21397_UnsetNull() {
assertFormatRange(
"Unset identity fallback",
NumberRangeFormatter.with()
.identityFallback(RangeIdentityFallback.RANGE)
.identityFallback(null),
new ULocale("en-us"),
"1–5",
"~5",
"~5",
"0–3",
"~0",
"3–3,000",
"3,000–5,000",
"4,999–5,001",
"~5,000",
"5,000–5,000,000");
}
@Test
public void testPlurals() {
// Locale sl has interesting plural forms: