organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-9524 Making Java ListFormatter behave correctly with any order of parameters

Browse source 
X-SVN-Rev: 32303
This commit is contained in:
Umesh Nair 2012-08-30 20:35:58 +00:00
parent f6ff5f1b9a
commit 4c5fe60f3e
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java
View file

@ -147,9 +147,11 @@ final public class ListFormatter {
if (i0 < 0 || i1 < 0) {
throw new IllegalArgumentException("Missing {0} or {1} in pattern " + pattern);
}
return i0 < i1
? pattern.substring(0, i0) + a + pattern.substring(i0+3, i1) + b + pattern.substring(i1+3)
: pattern.substring(0, i1) + a + pattern.substring(i1+3, i0) + b + pattern.substring(i0+3);
if (i0 < i1) {
return pattern.substring(0, i0) + a + pattern.substring(i0+3, i1) + b + pattern.substring(i1+3);
} else {
return pattern.substring(0, i1) + b + pattern.substring(i1+3, i0) + a + pattern.substring(i0+3);
}
}
/** JUST FOR DEVELOPMENT */

14
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ListFormatterTest.java
View file

@ -63,6 +63,20 @@ public class ListFormatterTest extends TestFmwk {
checkData(ListFormatter.getInstance(ULocale.JAPANESE), JapaneseTestData);
}
String[] outOfOrderTestData = {
"",
"A",
"B after A",
"C in the last after B after the first A",
"D in the last after C after B after the first A",
"E in the last after D after C after B after the first A"
};
public void TestPatternOutOfOrder() {
ListFormatter formatter = new ListFormatter("{1} after {0}", "{1} after the first {0}", "{1} after {0}",
"{1} in the last after {0}");
checkData(formatter, outOfOrderTestData);
}
String[] RootTestData = {
"",
"A",