AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7149 Clean up the argument replacement, since it could have a bad hit if an argument contained {0}

Browse Source 
X-SVN-Rev: 31525
This commit is contained in:
Mark Davis 2012-02-27 22:20:15 +00:00
parent fe4bb98547
commit 917fd32488
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4j/main/classes/core/src/com/ibm/icu/util/ListFormat.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2012-2012, Google, International Business Machines Corporation and *
* Copyright (C) 2012-2012, Google, International Business Machines Corporation and
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -131,8 +131,14 @@ final public class ListFormat implements Transform<Collection<String>, String> {
}
private String format2(String pattern, Object a, Object b) {
// TODO: make slightly faster by using single pass.
return pattern.replace("{0}", a.toString()).replace("{1}", b.toString());
int i0 = pattern.indexOf("{0}");
int i1 = pattern.indexOf("{1}");
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);
}
/**

6
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ListFormatTest.java
View File

@ -1,16 +1,12 @@
/*
*******************************************************************************
* Copyright (C) 2012-2012, Google, International Business Machines Corporation and *
* Copyright (C) 2012-2012, Google, International Business Machines Corporation and
* others. All Rights Reserved. *
*******************************************************************************
*/
package com.ibm.icu.dev.test.util;
import java.util.Arrays;
import java.util.Collection;
import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.text.Transform;
import com.ibm.icu.util.ListFormat;
import com.ibm.icu.util.ULocale;