ICU-9132 no Locale.ROOT in Java 5

X-SVN-Rev: 31712
This commit is contained in:
Markus Scherer 2012-04-16 17:52:42 +00:00
parent 6d6ac358a1
commit 613453f093
2 changed files with 6 additions and 6 deletions
icu4j/main
classes/core/src/com/ibm/icu/text
tests/core/src/com/ibm/icu/dev/test/format

View File

@ -1213,13 +1213,13 @@ public final class MessagePattern implements Cloneable, Freezable<MessagePattern
if(eos==inMessageFormatPattern(nestingLevel)) {
throw new IllegalArgumentException(
"Bad "+
argType.toString().toLowerCase(Locale.ROOT)+
argType.toString().toLowerCase(Locale.ENGLISH)+
" pattern syntax: "+prefix(start));
}
if(!hasOther) {
throw new IllegalArgumentException(
"Missing 'other' keyword in "+
argType.toString().toLowerCase(Locale.ROOT)+
argType.toString().toLowerCase(Locale.ENGLISH)+
" pattern in \""+prefix()+"\"");
}
return index;
@ -1232,7 +1232,7 @@ public final class MessagePattern implements Cloneable, Freezable<MessagePattern
if(length==1) {
throw new IllegalArgumentException(
"Bad "+
argType.toString().toLowerCase(Locale.ROOT)+
argType.toString().toLowerCase(Locale.ENGLISH)+
" pattern syntax: "+prefix(start));
}
if(length>Part.MAX_LENGTH) {
@ -1247,7 +1247,7 @@ public final class MessagePattern implements Cloneable, Freezable<MessagePattern
if(length==0) {
throw new IllegalArgumentException(
"Bad "+
argType.toString().toLowerCase(Locale.ROOT)+
argType.toString().toLowerCase(Locale.ENGLISH)+
" pattern syntax: "+prefix(start));
}
// Note: The ':' in "offset:" is just beyond the skipIdentifier() range.
@ -1292,7 +1292,7 @@ public final class MessagePattern implements Cloneable, Freezable<MessagePattern
if(index==msg.length() || msg.charAt(index)!='{') {
throw new IllegalArgumentException(
"No message fragment after "+
argType.toString().toLowerCase(Locale.ROOT)+
argType.toString().toLowerCase(Locale.ENGLISH)+
" selector: "+prefix(selectorIndex));
}
index=parseMessage(index, 1, nestingLevel+1, argType);

View File

@ -184,7 +184,7 @@ public final class MessagePatternUtilTest extends com.ibm.icu.dev.test.TestFmwk
private class ExpectComplexArgNode extends ExpectArgNode {
private ExpectComplexArgNode(ExpectMessageNode parent,
Object name, MessagePattern.ArgType argType) {
super(name, argType.toString().toLowerCase(Locale.ROOT));
super(name, argType.toString().toLowerCase(Locale.ENGLISH));
this.argType = argType;
this.parent = parent;
}