diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java index 0ff0b3454d..eedc041384 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2014-2015, International Business Machines Corporation and + * Copyright (C) 2014-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -285,8 +285,8 @@ public class KeyTypeData { try { typeMapResByKey = typeMapRes.get(legacyKeyId); } catch (MissingResourceException e) { - // type map for each key must exist - assert false; + // type map for each key must exist except private use + assert legacyKeyId.equals("x0"); } if (typeMapResByKey != null) { UResourceBundleIterator typeMapResByKeyItr = typeMapResByKey.getIterator(); diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java index 19629282a0..57fe6455f2 100644 --- a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java +++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2015, International Business Machines Corporation and * + * Copyright (C) 1996-2016, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -1922,6 +1922,9 @@ public abstract class Transliterator implements StringTransform { for (row = 0; row < maxRows; row++) { colBund = transIDs.get(row); String ID = colBund.getKey(); + if (ID.indexOf("-t-") >= 0) { + continue; + } UResourceBundle res = colBund.get(0); String type = res.getKey(); if (type.equals("file") || type.equals("internal")) { diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 03855aeb03..baf60d74d7 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29e5ad7a851810d39052e021b830dae7513d06bc4e60c899fa72f8b44d1c46a5 -size 11626253 +oid sha256:6328fcbe98e84bc436458c5af5c75c93debfd9adc41b4392e7f216908f61cf5a +size 11754025 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 63437a73a6..4a8464ca09 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a63ecd049b84fbcf8d63374846e6bbd0f34b0d7c8c738e08c6deea67c625305 +oid sha256:2a85eb6a3131e1eb712165170e8ee250825d0d39591b736d6036ad07fa49dd11 size 90259 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index f88a4fc65d..81658171e7 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad356f5c06cafd7253938133039fc2fee278913c9ba70968715b9e15b1243a01 -size 811321 +oid sha256:78a2ab108f57cb0f809e187ce3eca1e58690117c68271e3221dfe3a9477e7502 +size 811414 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 86fe91c7de..4d15634910 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2001-2015, International Business Machines Corporation and + * Copyright (C) 2001-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -4146,7 +4146,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new MonthPatternItem( "root@calendar=chinese", -3, "ren-chen-4-2", "ren-chen-4bis-2", "ren-chen-5-2" ), new MonthPatternItem( "root@calendar=chinese", -4, "ren-chen M04 2", "ren-chen M04bis 2", "ren-chen M05 2" ), new MonthPatternItem( "en@calendar=gregorian", -3, "2012-4-22", "2012-5-22", "2012-6-20" ), - new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "Month4 2, 2012(ren-chen)", "Month4bis 2, 2012(ren-chen)", "Month5 2, 2012(ren-chen)" ), + new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "Fourth Month 2, 2012(ren-chen)", "Fourth Monthbis 2, 2012(ren-chen)", "Fifth Month 2, 2012(ren-chen)" ), new MonthPatternItem( "en@calendar=chinese", DateFormat.SHORT, "4/2/2012", "4bis/2/2012", "5/2/2012" ), new MonthPatternItem( "zh@calendar=chinese", DateFormat.LONG, "2012\u58EC\u8FB0\u5E74\u56DB\u6708\u521D\u4E8C", "2012\u58EC\u8FB0\u5E74\u95F0\u56DB\u6708\u521D\u4E8C", @@ -4164,7 +4164,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new MonthPatternItem( "zh_Hant@calendar=chinese", DateFormat.SHORT, "2012/4/2", "2012/\u958F4/2", "2012/5/2" ), new MonthPatternItem( "fr@calendar=chinese", DateFormat.LONG, "2 s\u00ECyu\u00E8 ren-chen", "2 s\u00ECyu\u00E8bis ren-chen", "2 w\u01D4yu\u00E8 ren-chen" ), new MonthPatternItem( "fr@calendar=chinese", DateFormat.SHORT, "2/4/29", "2/4bis/29", "2/5/29" ), - new MonthPatternItem( "en@calendar=dangi", DateFormat.LONG, "Month3bis 2, 2012(ren-chen)", "Month4 2, 2012(ren-chen)", "Month5 1, 2012(ren-chen)" ), + new MonthPatternItem( "en@calendar=dangi", DateFormat.LONG, "Third Monthbis 2, 2012(ren-chen)", "Fourth Month 2, 2012(ren-chen)", "Fifth Month 1, 2012(ren-chen)" ), new MonthPatternItem( "en@calendar=dangi", DateFormat.SHORT, "3bis/2/2012", "4/2/2012", "5/1/2012" ), new MonthPatternItem( "en@calendar=dangi", -2, "78x29-3bis-2", "78x29-4-2", "78x29-5-1" ), new MonthPatternItem( "ko@calendar=dangi", DateFormat.LONG, "\uC784\uC9C4\uB144 \uC7243\uC6D4 2\uC77C", diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 566fd7af79..77ad3efec8 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java @@ -1,4 +1,4 @@ -/** Copyright (C) 2007-2015, International Business Machines Corporation and Others. All Rights Reserved. **/ +/** Copyright (C) 2007-2016, International Business Machines Corporation and Others. All Rights Reserved. **/ /* NOTE: this file is AUTOMATICALLY GENERATED by gentest. * See: {ICU4C}/source/data/icu4j-readme.txt for more information. @@ -7,7 +7,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="56.0.1"; + public static final String ICU4C_VERSION="57.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java index 7deb6b4d5b..69fcf0add5 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2011-2012, International Business Machines + * Copyright (c) 2011-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: John Emmons @@ -281,7 +281,7 @@ public class RegionTest extends TestFmwk { { "SN" , "686", "011", "TERRITORY", "002" }, { "SO" , "706", "014", "TERRITORY", "002" }, { "SR" , "740", "005", "TERRITORY", "019" }, - { "SS" , "728", "015", "TERRITORY", "002" }, + { "SS" , "728", "014", "TERRITORY", "002" }, { "ST" , "678", "017", "TERRITORY", "002" }, { "SU" , "810", null , "DEPRECATED" , null}, { "SV" , "222", "013", "TERRITORY", "019" },