f2173758085110964523dcc11a7a8bc1c44d23c5 |
|
24-Aug-2009 |
Jesse Wilson <jessewilson@google.com> |
Update java.text to Harmony r802921. Notable changes: - Replaced some StringBuffers with StringBuilders - Harmony moved to ICU, we stayed with ResourceBundles - Harmony now uses ICU's Bidi, we continue to use BidiWrapper - Fixed DateFormat.readResolve() - Fixed DecimalFormat serialization for setMaximumIntegerDigits - Fixed currency to support "XXX" for null - Support for null in MessageFormat.format() - Rearranged methods in SimpleDateFormat. Body is the same. - Fixed tests for Bidi.getRunLimit(). These are new failures. commit 112ab830475bc1a1fab9c7a16589b5525892e6a0 Merge: 39b03a1 62c2b2e Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 24 14:03:31 2009 -0700 Merge dalvik and Harmony for java.text Conflicts: libcore/text/.classpath libcore/text/META-INF/MANIFEST.MF libcore/text/build.xml libcore/text/make/exclude.common libcore/text/make/run-test.xml libcore/text/src/main/java/java/text/Annotation.java libcore/text/src/main/java/java/text/AttributedCharacterIterator.java libcore/text/src/main/java/java/text/AttributedString.java libcore/text/src/main/java/java/text/Bidi.java libcore/text/src/main/java/java/text/BreakIterator.java libcore/text/src/main/java/java/text/CharacterIterator.java libcore/text/src/main/java/java/text/ChoiceFormat.java libcore/text/src/main/java/java/text/CollationElementIterator.java libcore/text/src/main/java/java/text/CollationKey.java libcore/text/src/main/java/java/text/Collator.java libcore/text/src/main/java/java/text/DateFormat.java libcore/text/src/main/java/java/text/DateFormatSymbols.java libcore/text/src/main/java/java/text/DecimalFormat.java libcore/text/src/main/java/java/text/DecimalFormatSymbols.java libcore/text/src/main/java/java/text/FieldPosition.java libcore/text/src/main/java/java/text/Format.java libcore/text/src/main/java/java/text/MessageFormat.java libcore/text/src/main/java/java/text/NumberFormat.java libcore/text/src/main/java/java/text/ParseException.java libcore/text/src/main/java/java/text/ParsePosition.java libcore/text/src/main/java/java/text/RuleBasedCollator.java libcore/text/src/main/java/java/text/SimpleDateFormat.java libcore/text/src/main/java/java/text/StringCharacterIterator.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java commit 39b03a1b2b150d468cc15d8ff8a92a07c9098a5c Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:36 2009 -0700 text_dalvik commit 62c2b2e932da51858998820fe2558631999c1241 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:23 2009 -0700 text_802921 commit 2da8bc3457b9db827d96652e2bf159b7d5040ad1 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:08 2009 -0700 text_527399
|