--- old/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java 2015-06-23 13:27:52.116393610 -0700 +++ new/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java 2015-06-23 13:27:51.764387916 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,37 +26,41 @@ /* * COPYRIGHT AND PERMISSION NOTICE * - * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under - * the Terms of Use in http://www.unicode.org/copyright.html. + * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved. + * Distributed under the Terms of Use in + * http://www.unicode.org/copyright.html. * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of the Unicode data files and any associated documentation (the "Data - * Files") or Unicode software and any associated documentation (the - * "Software") to deal in the Data Files or Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, and/or sell copies of the Data Files or Software, and - * to permit persons to whom the Data Files or Software are furnished to do so, - * provided that (a) the above copyright notice(s) and this permission notice - * appear with all copies of the Data Files or Software, (b) both the above - * copyright notice(s) and this permission notice appear in associated - * documentation, and (c) there is clear notice in each modified Data File or - * in the Software as well as in the documentation associated with the Data - * File(s) or Software that the data or software has been modified. + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of the Unicode data files and any associated documentation + * (the "Data Files") or Unicode software and any associated documentation + * (the "Software") to deal in the Data Files or Software + * without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, and/or sell copies of + * the Data Files or Software, and to permit persons to whom the Data Files + * or Software are furnished to do so, provided that + * (a) this copyright and permission notice appear with all copies + * of the Data Files or Software, + * (b) this copyright and permission notice appear in associated + * documentation, and + * (c) there is clear notice in each modified Data File or in the Software + * as well as in the documentation associated with the Data File(s) or + * Software that the data or software has been modified. * - * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR - * CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF + * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT OF THIRD PARTY RIGHTS. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS + * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL + * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THE DATA FILES OR SOFTWARE. + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THE DATA FILES OR SOFTWARE. * - * Except as contained in this notice, the name of a copyright holder shall not - * be used in advertising or otherwise to promote the sale, use or other - * dealings in these Data Files or Software without prior written authorization - * of the copyright holder. + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in these Data Files or Software without prior + * written authorization of the copyright holder. */ // Note: this file has been generated by a tool. @@ -68,83 +72,121 @@ public class JavaTimeSupplementary extends OpenListResourceBundle { @Override protected final Object[][] getContents() { + final String[] rocMonthNarrows = { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "", + }; return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "Q1", "Q2", "Q3", "Q4", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "Q1", "Q2", "Q3", "Q4", - } - }, - { "QuarterNarrows", - new String[] { + } + }, + { "QuarterNarrows", + new String[] { "1", "2", "3", "4", - } - }, - { "calendarname.buddhist", - "Buddhist Calendar" }, - { "calendarname.gregorian", - "Gregorian Calendar" }, - { "calendarname.gregory", - "Gregorian Calendar" }, - { "calendarname.islamic", - "Islamic Calendar" }, - { "calendarname.islamic-civil", - "Islamic-Civil Calendar" }, - { "calendarname.islamicc", - "Islamic-Civil Calendar" }, - { "calendarname.japanese", - "Japanese Calendar" }, - { "calendarname.roc", - "Minguo Calendar" }, - { "field.dayperiod", + } + }, + { "field.dayperiod", "Dayperiod" }, - { "field.era", + { "field.era", "Era" }, - { "field.hour", + { "field.hour", "Hour" }, - { "field.minute", + { "field.minute", "Minute" }, - { "field.month", + { "field.month", "Month" }, - { "field.second", + { "field.second", "Second" }, - { "field.week", + { "field.week", "Week" }, - { "field.weekday", + { "field.weekday", "Day of the Week" }, - { "field.year", + { "field.year", "Year" }, - { "field.zone", + { "field.zone", "Zone" }, - { "islamic.DatePatterns", - new String[] { - "EEEE, MMMM d, y GGGG", - "MMMM d, y GGGG", - "MMM d, y GGGG", - "M/d/yy GGGG", - } - }, - { "islamic.Eras", - new String[] { + { "islamic.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "islamic.DatePatterns", + new String[] { + "GGGG y MMMM d, EEEE", + "GGGG y MMMM d", + "GGGG y MMM d", + "G y-MM-dd", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + }, + { "islamic.DayNames", + new String[] { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + }, + { "islamic.DayNarrows", + new String[] { + "S", + "M", + "T", + "W", + "T", + "F", + "S", + } + }, + { "islamic.Eras", + new String[] { "", "AH", - } - }, - { "islamic.MonthAbbreviations", - new String[] { + } + }, + { "islamic.MonthAbbreviations", + new String[] { "Muh.", "Saf.", "Rab. I", @@ -158,10 +200,10 @@ "Dhu\u02bbl-Q.", "Dhu\u02bbl-H.", "", - } - }, - { "islamic.MonthNames", - new String[] { + } + }, + { "islamic.MonthNames", + new String[] { "Muharram", "Safar", "Rabi\u02bb I", @@ -175,113 +217,258 @@ "Dhu\u02bbl-Qi\u02bbdah", "Dhu\u02bbl-Hijjah", "", - } - }, - { "islamic.MonthNarrows", - new String[] { + } + }, + { "islamic.MonthNarrows", + rocMonthNarrows }, + { "islamic.QuarterNames", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "islamic.QuarterNarrows", + new String[] { "1", "2", "3", "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", + } + }, + { "islamic.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "islamic.long.Eras", + new String[] { "", - } - }, - { "islamic.short.Eras", - new String[] { + "AH", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "a", + "p", + } + }, + { "islamic.narrow.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.short.Eras", + new String[] { "", "AH", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { - "EEEE, G y MMMM dd", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { + "G y MMMM d, EEEE", "G y MMMM d", "G y MMM d", - "GGGGG yyyy-MM-dd", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { + "GGGGG y-MM-dd", + } + }, + { "java.time.buddhist.long.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.buddhist.short.Eras", + new String[] { "BC", "B.E.", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "MMM d, y G", - "M/d/yy G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + } + }, + { "java.time.islamic.DatePatterns", + new String[] { + "G y MMMM d, EEEE", + "G y MMMM d", + "G y MMM d", + "GGGGG y-MM-dd", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "G y MMMM d (EEEE)", "G y MMMM d", "G y MMM d", "GGGGGy.MM.dd", - } - }, - { "java.time.japanese.long.Eras", - new String[] { + } + }, + { "java.time.japanese.long.Eras", + new String[] { "", "Meiji", "Taisho", "Showa", "Heisei", - } - }, - { "java.time.japanese.short.Eras", - new String[] { + } + }, + { "java.time.japanese.short.Eras", + new String[] { "", "Meiji", "Taisho", "Showa", "Heisei", - } - }, - { "java.time.roc.DatePatterns", - new String[] { - "EEEE, G y MMMM dd", + } + }, + { "java.time.long.Eras", + new String[] { + "BCE", + "CE", + } + }, + { "java.time.roc.DatePatterns", + new String[] { + "G y MMMM d, EEEE", "G y MMMM d", "G y MMM d", - "GGGGG yyy-MM-dd", - } - }, - { "java.time.short.Eras", - new String[] { + "GGGGG y-MM-dd", + } + }, + { "java.time.short.Eras", + new String[] { "BC", "AD", - } - }, - { "roc.DatePatterns", - new String[] { - "EEEE, GGGG y MMMM dd", + } + }, + { "roc.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "roc.DatePatterns", + new String[] { + "GGGG y MMMM d, EEEE", "GGGG y MMMM d", "GGGG y MMM d", - "G yyy-MM-dd", - } - }, - { "roc.Eras", - new String[] { + "G y-MM-dd", + } + }, + { "roc.DayNames", + new String[] { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + }, + { "roc.DayNarrows", + new String[] { + "S", + "M", + "T", + "W", + "T", + "F", + "S", + } + }, + { "roc.Eras", + new String[] { + "Before R.O.C.", + "R.O.C.", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "M01", + "M02", + "M03", + "M04", + "M05", + "M06", + "M07", + "M08", + "M09", + "M10", + "M11", + "M12", + "", + } + }, + { "roc.MonthNames", + new String[] { + "M01", + "M02", + "M03", + "M04", + "M05", + "M06", + "M07", + "M08", + "M09", + "M10", + "M11", + "M12", + "", + } + }, + { "roc.MonthNarrows", + rocMonthNarrows }, + { "roc.QuarterNames", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "roc.QuarterNarrows", + new String[] { + "1", + "2", + "3", + "4", + } + }, + { "roc.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "roc.long.Eras", + new String[] { + "Before R.O.C.", + "R.O.C.", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "a", + "p", + } + }, + { "roc.narrow.Eras", + new String[] { "Before R.O.C.", "R.O.C.", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "Before R.O.C.", "R.O.C.", - } - }, + } + }, }; } -} +}