Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get ExtendedMessageFormat working on JDK 1.3, sort of 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@634874 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Matthew Jason Benson 2008-03-08 00:30:04 +00:00
parent c4e8add680
commit c1bd325d94
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java
View File

@ -192,8 +192,10 @@ public class ExtendedMessageFormat extends MessageFormat {
toPattern = insertFormats(super.toPattern(), foundDescriptions); toPattern = insertFormats(super.toPattern(), foundDescriptions);
if (containsElements(foundFormats)) { if (containsElements(foundFormats)) {
Format[] origFormats = getFormats(); Format[] origFormats = getFormats();
for (int i = 0; i < origFormats.length; i++) { //only loop over what we know we have, as MessageFormat on Java 1.3 seems to provide an extra format element:
Format f = (Format) foundFormats.get(i); int i = 0;
for (Iterator it = foundFormats.iterator(); it.hasNext(); i++) {
Format f = (Format) it.next();
if (f != null) { if (f != null) {
origFormats[i] = f; origFormats[i] = f;
} }

19
src/test/org/apache/commons/lang/text/ExtendedMessageFormatTest.java
View File

@ -27,6 +27,8 @@ import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.SystemUtils;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
@ -83,7 +85,7 @@ public class ExtendedMessageFormatTest extends TestCase {
public void testExtendedFormats() { public void testExtendedFormats() {
String pattern = "Lower: {0,lower} Upper: {1,upper}"; String pattern = "Lower: {0,lower} Upper: {1,upper}";
ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry); ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry);
assertEquals("TOPATTERN", pattern, emf.toPattern()); assertPatternsEqual("TOPATTERN", pattern, emf.toPattern());
assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"foo", "bar"})); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"foo", "bar"}));
assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"Foo", "Bar"})); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"Foo", "Bar"}));
assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"FOO", "BAR"})); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"FOO", "BAR"}));
@ -120,7 +122,7 @@ public class ExtendedMessageFormatTest extends TestCase {
expected.append(df.format(args[1])); expected.append(df.format(args[1]));
expected.append(" Salary: "); expected.append(" Salary: ");
expected.append(nf.format(args[2])); expected.append(nf.format(args[2]));
assertEquals(pattern, emf.toPattern()); assertPatternsEqual(null, pattern, emf.toPattern());
assertEquals("" + testLocales[i], expected.toString(), emf.format(args)); assertEquals("" + testLocales[i], expected.toString(), emf.format(args));
} }
} }
@ -133,7 +135,7 @@ public class ExtendedMessageFormatTest extends TestCase {
// public void testExtendedWithChoiceFormat() { // public void testExtendedWithChoiceFormat() {
// String pattern = "Choice: {0,choice,1.0#{1,lower}|2.0#{1,upper}}"; // String pattern = "Choice: {0,choice,1.0#{1,lower}|2.0#{1,upper}}";
// ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry); // ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry);
// assertEquals(pattern, emf.toPattern()); // assertPatterns(null, pattern, emf.toPattern());
// try { // try {
// assertEquals("one", emf.format(new Object[] {new Integer(1), "ONE"})); // assertEquals("one", emf.format(new Object[] {new Integer(1), "ONE"}));
// assertEquals("TWO", emf.format(new Object[] {new Integer(2), "two"})); // assertEquals("TWO", emf.format(new Object[] {new Integer(2), "two"}));
@ -165,7 +167,7 @@ public class ExtendedMessageFormatTest extends TestCase {
// cf = NumberFormat.getCurrencyInstance(testLocales[i]); // cf = NumberFormat.getCurrencyInstance(testLocales[i]);
// emf = new ExtendedMessageFormat(pattern, testLocales[i], registry); // emf = new ExtendedMessageFormat(pattern, testLocales[i], registry);
// } // }
// assertEquals(pattern, emf.toPattern()); // assertPatterns(null, pattern, emf.toPattern());
// try { // try {
// String lowExpected = lowArgs[0] + " low " + nf.format(lowArgs[2]); // String lowExpected = lowArgs[0] + " low " + nf.format(lowArgs[2]);
// String highExpected = highArgs[0] + " HIGH " + cf.format(highArgs[2]); // String highExpected = highArgs[0] + " HIGH " + cf.format(highArgs[2]);
@ -261,7 +263,14 @@ public class ExtendedMessageFormatTest extends TestCase {
emf = new ExtendedMessageFormat(pattern, locale); emf = new ExtendedMessageFormat(pattern, locale);
} }
assertEquals("format " + buffer.toString(), mf.format(args), emf.format(args)); assertEquals("format " + buffer.toString(), mf.format(args), emf.format(args));
assertEquals("toPattern " + buffer.toString(), mf.toPattern(), emf.toPattern()); assertPatternsEqual("toPattern " + buffer.toString(), mf.toPattern(), emf.toPattern());
}
//can't trust what MessageFormat does with toPattern() pre 1.4:
private void assertPatternsEqual(String message, String expected, String actual) {
if (SystemUtils.isJavaVersionAtLeast(1.4f)) {
assertEquals(message, expected, actual);
}
} }
// ------------------------ Test Formats ------------------------ // ------------------------ Test Formats ------------------------