From 613453f09301accfd7d4ca6e4824c3a2ffd62a1c Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Mon, 16 Apr 2012 17:52:42 +0000
Subject: [PATCH] ICU-9132 no Locale.ROOT in Java 5

X-SVN-Rev: 31712
---
 .../core/src/com/ibm/icu/text/MessagePattern.java      | 10 +++++-----
 .../icu/dev/test/format/MessagePatternUtilTest.java    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
index 80b0889a11c..767fc3baabc 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
@@ -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);
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java
index 6573dd29a23..f84a30c07b7 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java
@@ -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;
         }
-- 
2.40.0