infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-09 15:42:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2016-05-31 09:41:18 -07:00
commit 292e12a684
1420 changed files with 258475 additions and 118797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -362,3 +362,4 @@ c84d0cce090e161d736de69e941830adf8c2f87a jdk-9+114
82b8d12a553f5617737c238cec060281d52e351c jdk-9+117
7c04fcb12bd4a31570a238e663fa846dfa5ec3b8 jdk-9+118
caf97b37ebec84288c112d21d3a60cb628cba1e8 jdk-9+119
9330543436402b8f3bd070524846a464d8143557 jdk-9+120

1
.hgtags-top-repo
View File

@ -362,3 +362,4 @@ f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111
e882bcdbdac436523f3d5681611d3118a3804ea7 jdk-9+117
047f95de8f918d8ff5e8cd2636a2abb5c3c8adb8 jdk-9+118
3463a3f14f0f0e8a68f29ac6405454f2fa2f598a jdk-9+119
647e0142a5a52749db572b5e6638d561def6479e jdk-9+120

1
common/autoconf/configure.ac
View File

@ -229,6 +229,7 @@ LIB_SETUP_LIBRARIES
JDKOPT_DETECT_INTREE_EC
JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER
JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
###############################################################################
#

59
common/autoconf/generated-configure.sh
View File

@ -650,6 +650,7 @@ TEST_JOBS
JOBS
MEMORY_SIZE
NUM_CORES
ENABLE_GENERATE_CLASSLIST
BUILD_FAILURE_HANDLER
ENABLE_INTREE_EC
STLPORT_LIB
@ -1226,6 +1227,7 @@ with_dxsdk
with_dxsdk_lib
with_dxsdk_include
enable_jtreg_failure_handler
enable_generate_classlist
with_num_cores
with_memory_size
with_jobs
@ -2005,6 +2007,10 @@ Optional Features:
Default is auto, where the failure handler is built
if all dependencies are present and otherwise just
disabled.
--disable-generate-classlist
forces enabling or disabling of the generation of a
CDS classlist at build time. Default is to generate
it when either the server or client JVMs are built.
--enable-sjavac use sjavac to do fast incremental compiles
[disabled]
--disable-javac-server disable javac server [enabled]
@ -4391,6 +4397,12 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
#
################################################################################
#
# Enable or disable generation of the classlist at build time
#
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@ -5080,7 +5092,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1463732692
DATE_WHEN_GENERATED=1464173584
###############################################################################
#
@ -64812,6 +64824,51 @@ $as_echo "yes, jtreg present" >&6; }
# Check whether --enable-generate-classlist was given.
if test "${enable_generate_classlist+set}" = set; then :
enableval=$enable_generate_classlist;
fi
# Check if it's likely that it's possible to generate the classlist. Depending
# on exact jvm configuration it could be possible anyway.
if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] ; then
ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
else
ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the CDS classlist generation should be enabled" >&5
$as_echo_n "checking if the CDS classlist generation should be enabled... " >&6; }
if test "x$enable_generate_classlist" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
$as_echo "yes, forced" >&6; }
ENABLE_GENERATE_CLASSLIST="true"
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS" >&5
$as_echo "$as_me: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS" >&2;}
fi
elif test "x$enable_generate_classlist" = "xno"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
$as_echo "no, forced" >&6; }
ENABLE_GENERATE_CLASSLIST="false"
elif test "x$enable_generate_classlist" = "x"; then
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xtrue"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ENABLE_GENERATE_CLASSLIST="true"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ENABLE_GENERATE_CLASSLIST="false"
fi
else
as_fn_error $? "Invalid value for --enable-generate-classlist: $enable_generate_classlist" "$LINENO" 5
fi
###############################################################################
#
# Configure parts of the build that only affect the build performance,

43
common/autoconf/jdk-options.m4
View File

@ -491,3 +491,46 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER],
AC_SUBST(BUILD_FAILURE_HANDLER)
])
################################################################################
#
# Enable or disable generation of the classlist at build time
#
AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
[
AC_ARG_ENABLE([generate-classlist], [AS_HELP_STRING([--disable-generate-classlist],
[forces enabling or disabling of the generation of a CDS classlist at build time.
Default is to generate it when either the server or client JVMs are built.])])
# Check if it's likely that it's possible to generate the classlist. Depending
# on exact jvm configuration it could be possible anyway.
if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client); then
ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
else
ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
fi
AC_MSG_CHECKING([if the CDS classlist generation should be enabled])
if test "x$enable_generate_classlist" = "xyes"; then
AC_MSG_RESULT([yes, forced])
ENABLE_GENERATE_CLASSLIST="true"
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS])
fi
elif test "x$enable_generate_classlist" = "xno"; then
AC_MSG_RESULT([no, forced])
ENABLE_GENERATE_CLASSLIST="false"
elif test "x$enable_generate_classlist" = "x"; then
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xtrue"; then
AC_MSG_RESULT([yes])
ENABLE_GENERATE_CLASSLIST="true"
else
AC_MSG_RESULT([no])
ENABLE_GENERATE_CLASSLIST="false"
fi
else
AC_MSG_ERROR([Invalid value for --enable-generate-classlist: $enable_generate_classlist])
fi
AC_SUBST([ENABLE_GENERATE_CLASSLIST])
])

2
common/autoconf/spec.gmk.in
View File

@ -285,6 +285,8 @@ BUILD_HOTSPOT=@BUILD_HOTSPOT@
BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@
ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
# The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
# it in sync.
BOOT_JDK:=@BOOT_JDK@

1
corba/.hgtags
View File

@ -362,3 +362,4 @@ cc30faa2da498c478e89ab062ff160653ca1b170 jdk-9+113
7a1b36bf2fe55a9a7732489ccdd326c910329a7e jdk-9+117
8c2c2d17f7ce92a31c9ccb44a122ec62f5a85ace jdk-9+118
daf533920b1266603b5cbdab31908d2a931c5361 jdk-9+119
5943b791e131e79b969d4cea053aecda34801723 jdk-9+120

1
hotspot/.hgtags
View File

@ -522,3 +522,4 @@ b64432bae5271735fd53300b2005b713e98ef411 jdk-9+114
88170d3642905b9e6cac03e8efcc976885a7e6da jdk-9+117
9b1075cac08dc836ec32e7b368415cbe3aceaf8c jdk-9+118
15f3fe264872766bcb205696198f0c1502420e17 jdk-9+119
0be6f4f5d18671184e62583668cb1d783dffa128 jdk-9+120

1
jaxp/.hgtags
View File

@ -362,3 +362,4 @@ bdbf2342b21bd8ecad1b4e6499a0dfb314952bd7 jdk-9+103
46b57560cd06ebcdd21489250628ff5f9d9d8916 jdk-9+117
a8aa25fc6c5fda0ed7a93b8ffee62da326a752fc jdk-9+118
f92e8518bb34a9628b11e662bf7308561a55eb3b jdk-9+119
ecbe72546137cd29cb73d4dcc81cc099e847d543 jdk-9+120

1
jaxws/.hgtags
View File

@ -365,3 +365,4 @@ b314bb02182b9ca94708a91f312c377f5435f740 jdk-9+114
58265b39fc74b932bda4d4f4649c530a89f55c4e jdk-9+117
6ba73d04589ccc0705a5d8ae5111b63632b6ad20 jdk-9+118
331a825f849afd2e5126c93c88e55bd9ef0c6b8f jdk-9+119
ecd0d6a71c7ccf93584ba4dacdd4fa8455efd741 jdk-9+120

6
jdk/LICENSE
View File

@ -3,7 +3,7 @@ The GNU General Public License (GPL)
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@ -287,8 +287,8 @@ pointer to where the full notice is found.
more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., 59
Temple Place, Suite 330, Boston, MA 02111-1307 USA
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.

6
jdk/make/gensrc/GensrcCLDR.gmk
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2016, 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
@ -23,8 +23,8 @@
# questions.
#
CLDRVERSION := 27.0.0
CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
CLDRVERSION := 29.0.0
CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata

1
jdk/make/mapfiles/libjava/mapfile-vers
View File

@ -267,6 +267,7 @@ SUNWprivate_1.1 {
Java_jdk_internal_misc_VM_geteuid;
Java_jdk_internal_misc_VM_getgid;
Java_jdk_internal_misc_VM_getegid;
Java_jdk_internal_misc_VM_getRuntimeArguments;
Java_jdk_internal_misc_VM_initialize;
Java_java_lang_reflect_Module_defineModule0;

3
jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, 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
@ -284,6 +284,7 @@ class Bundle {
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "DayNarrows");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "AmPmMarkers");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "narrow.AmPmMarkers");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "abbreviated.AmPmMarkers");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterNames");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterAbbreviations");
handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterNarrows");

49
jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
View File

@ -59,6 +59,7 @@ public class CLDRConverter {
private static String SPPL_SOURCE_FILE;
private static String NUMBERING_SOURCE_FILE;
private static String METAZONES_SOURCE_FILE;
private static String LIKELYSUBTAGS_SOURCE_FILE;
static String DESTINATION_DIR = "build/gensrc";
static final String LOCALE_NAME_PREFIX = "locale.displayname.";
@ -71,6 +72,7 @@ public class CLDRConverter {
static final String PARENT_LOCALE_PREFIX = "parentLocale.";
private static SupplementDataParseHandler handlerSuppl;
private static LikelySubtagsParseHandler handlerLikelySubtags;
static NumberingSystemsParseHandler handlerNumbering;
static MetaZonesParseHandler handlerMetaZones;
private static BundleGenerator bundleGenerator;
@ -196,12 +198,13 @@ public class CLDRConverter {
}
// Set up path names
LOCAL_LDML_DTD = CLDR_BASE + "common/dtd/ldml.dtd";
LOCAL_SPPL_LDML_DTD = CLDR_BASE + "common/dtd/ldmlSupplemental.dtd";
SOURCE_FILE_DIR = CLDR_BASE + "common/main";
SPPL_SOURCE_FILE = CLDR_BASE + "common/supplemental/supplementalData.xml";
NUMBERING_SOURCE_FILE = CLDR_BASE + "common/supplemental/numberingSystems.xml";
METAZONES_SOURCE_FILE = CLDR_BASE + "common/supplemental/metaZones.xml";
LOCAL_LDML_DTD = CLDR_BASE + "/dtd/ldml.dtd";
LOCAL_SPPL_LDML_DTD = CLDR_BASE + "/dtd/ldmlSupplemental.dtd";
SOURCE_FILE_DIR = CLDR_BASE + "/main";
SPPL_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalData.xml";
LIKELYSUBTAGS_SOURCE_FILE = CLDR_BASE + "/supplemental/likelySubtags.xml";
NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
if (BASE_LOCALES.isEmpty()) {
setupBaseLocales("en-US");
@ -220,8 +223,8 @@ public class CLDRConverter {
errout("Usage: java CLDRConverter [options]%n"
+ "\t-help output this usage message and exit%n"
+ "\t-verbose output information%n"
+ "\t-draft [approved | provisional | unconfirmed]%n"
+ "\t\t draft level for using data (default: approved)%n"
+ "\t-draft [contributed | approved | provisional | unconfirmed]%n"
+ "\t\t draft level for using data (default: contributed)%n"
+ "\t-base dir base directory for CLDR input files%n"
+ "\t-basemodule generates bundles that go into java.base module%n"
+ "\t-baselocales loc(,loc)* locales that go into the base module%n"
@ -379,7 +382,6 @@ public class CLDRConverter {
});
// Parse numberingSystems to get digit zero character information.
info("..... Parsing numberingSystem.xml .....");
SAXParserFactory numberingParser = SAXParserFactory.newInstance();
numberingParser.setValidating(true);
SAXParser parserNumbering = numberingParser.newSAXParser();
@ -396,7 +398,17 @@ public class CLDRConverter {
enableFileAccess(parserMetaZones);
handlerMetaZones = new MetaZonesParseHandler();
File fileMetaZones = new File(METAZONES_SOURCE_FILE);
parserNumbering.parse(fileMetaZones, handlerMetaZones);
parserMetaZones.parse(fileMetaZones, handlerMetaZones);
// Parse likelySubtags
info("..... Parsing likelySubtags.xml .....");
SAXParserFactory likelySubtagsParser = SAXParserFactory.newInstance();
likelySubtagsParser.setValidating(true);
SAXParser parserLikelySubtags = likelySubtagsParser.newSAXParser();
enableFileAccess(parserLikelySubtags);
handlerLikelySubtags = new LikelySubtagsParseHandler();
File fileLikelySubtags = new File(LIKELYSUBTAGS_SOURCE_FILE);
parserLikelySubtags.parse(fileLikelySubtags, handlerLikelySubtags);
}
private static void convertBundles(List<Bundle> bundles) throws Exception {
@ -434,6 +446,7 @@ public class CLDRConverter {
Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, bundle.getID());
if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("LocaleNames").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "LocaleNames", bundle.getID());
bundleGenerator.generateBundle("util", "LocaleNames", bundle.getJavaID(), true, localeNamesMap, BundleType.OPEN);
}
}
@ -441,6 +454,7 @@ public class CLDRConverter {
Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, bundle.getID(), bundle.getCurrencies());
if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("CurrencyNames").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "CurrencyNames", bundle.getID());
bundleGenerator.generateBundle("util", "CurrencyNames", bundle.getJavaID(), true, currencyNamesMap, BundleType.OPEN);
}
}
@ -448,6 +462,7 @@ public class CLDRConverter {
Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, bundle.getID());
if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("TimeZoneNames").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "TimeZoneNames", bundle.getID());
bundleGenerator.generateBundle("util", "TimeZoneNames", bundle.getJavaID(), true, zoneNamesMap, BundleType.TIMEZONE);
}
}
@ -455,6 +470,7 @@ public class CLDRConverter {
Map<String, Object> calendarDataMap = extractCalendarData(targetMap, bundle.getID());
if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("CalendarData").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "CalendarData", bundle.getID());
bundleGenerator.generateBundle("util", "CalendarData", bundle.getJavaID(), true, calendarDataMap, BundleType.PLAIN);
}
}
@ -462,12 +478,14 @@ public class CLDRConverter {
Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
if (!formatDataMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("FormatData").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "FormatData", bundle.getID());
bundleGenerator.generateBundle("text", "FormatData", bundle.getJavaID(), true, formatDataMap, BundleType.PLAIN);
}
}
// For AvailableLocales
metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "AvailableLocales", bundle.getID());
}
bundleGenerator.generateMetaInfo(metaInfo);
@ -664,6 +682,7 @@ public class CLDRConverter {
"standalone.QuarterNarrows",
"AmPmMarkers",
"narrow.AmPmMarkers",
"abbreviated.AmPmMarkers",
"long.Eras",
"Eras",
"narrow.Eras",
@ -817,6 +836,14 @@ public class CLDRConverter {
return loc.toLanguageTag();
}
private static void addLikelySubtags(Map<String, SortedSet<String>> metaInfo, String category, String id) {
String likelySubtag = handlerLikelySubtags.get(id);
if (likelySubtag != null) {
// Remove Script for now
metaInfo.get(category).add(toLanguageTag(likelySubtag).replaceFirst("-[A-Z][a-z]{3}", ""));
}
}
private static String toLocaleName(String tag) {
if (tag.indexOf('-') == -1) {
return tag;
@ -830,7 +857,7 @@ public class CLDRConverter {
.map(l -> Control.getControl(Control.FORMAT_DEFAULT)
.getCandidateLocales("", l))
.forEach(BASE_LOCALES::addAll);
}
}
// applying parent locale rules to the passed candidates list
// This has to match with the one in sun.util.cldr.CLDRLocaleProviderAdapter

14
jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
View File

@ -290,6 +290,9 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
case "narrow":
pushStringArrayEntry(qName, attributes, "narrow.AmPmMarkers/" + getContainerKey(), 2);
break;
case "abbreviated":
pushStringArrayEntry(qName, attributes, "abbreviated.AmPmMarkers/" + getContainerKey(), 2);
break;
default:
pushIgnoredContainer(qName);
break;
@ -460,6 +463,15 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
pushIgnoredContainer(qName);
}
break;
case "currencyFormatLength":
if (attributes.getValue("type") == null) {
// skipping type="short" data
// for FormatData
pushContainer(qName, attributes);
} else {
pushIgnoredContainer(qName);
}
break;
case "currencyFormat":
// for FormatData
// copy string for later assembly into NumberPatterns
@ -750,7 +762,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
keyName = "narrow.AmPmMarkers/" + context;
break;
case "abbreviated":
keyName = "";
keyName = "abbreviated.AmPmMarkers/" + context;
break;
}
break;

71
jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package build.tools.cldrconverter;
import java.io.File;
import java.io.IOException;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
* Handles parsing of files in Locale Data Markup Language for likelySubtags.xml
* and produces a map that uses the keys and values of JRE locale data.
*/
class LikelySubtagsParseHandler extends AbstractLDMLHandler<String> {
LikelySubtagsParseHandler() {
}
@Override
public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException {
// avoid HTTP traffic to unicode.org
if (systemID.startsWith(CLDRConverter.SPPL_LDML_DTD_SYSTEM_ID)) {
return new InputSource((new File(CLDRConverter.LOCAL_SPPL_LDML_DTD)).toURI().toString());
}
return null;
}
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
switch (qName) {
case "likelySubtag":
// eg, <likelySubtag from="aa" to="aa_Latn_ET"/>
String from = attributes.getValue("from");
if (!from.startsWith("und")) {
// Ignore the "undefined" language for now
put(from, attributes.getValue("to"));
}
pushIgnoredContainer(qName);
break;
default:
// treat anything else as a container
pushContainer(qName, attributes);
break;
}
}
}

10
jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -232,9 +232,11 @@ class LinuxWatchService
for (WatchEvent.Modifier modifier: modifiers) {
if (modifier == null)
return new NullPointerException();
if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
continue; // ignore
return new UnsupportedOperationException("Modifier not supported");
if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
return new UnsupportedOperationException("Modifier not supported");
}
}
}

20
jdk/src/java.base/share/classes/java/lang/Boolean.java
View File

@ -117,7 +117,9 @@ public final class Boolean implements java.io.Serializable,
* Parses the string argument as a boolean. The {@code boolean}
* returned represents the value {@code true} if the string argument
* is not {@code null} and is equal, ignoring case, to the string
* {@code "true"}. <p>
* {@code "true"}.
* Otherwise, a false value is returned, including for a null
* argument.<p>
* Example: {@code Boolean.parseBoolean("True")} returns {@code true}.<br>
* Example: {@code Boolean.parseBoolean("yes")} returns {@code false}.
*
@ -165,6 +167,8 @@ public final class Boolean implements java.io.Serializable,
* specified string. The {@code Boolean} returned represents a
* true value if the string argument is not {@code null}
* and is equal, ignoring case, to the string {@code "true"}.
* Otherwise, a false value is returned, including for a null
* argument.
*
* @param s a string.
* @return the {@code Boolean} value represented by the string.
@ -241,14 +245,12 @@ public final class Boolean implements java.io.Serializable,
/**
* Returns {@code true} if and only if the system property named
* by the argument exists and is equal to the string {@code
* "true"}. (Beginning with version 1.0.2 of the Java&trade;
* platform, the test of this string is case insensitive.) A
* system property is accessible through {@code getProperty}, a
* method defined by the {@code System} class.
* <p>
* If there is no property with the specified name, or if the specified
* name is empty or null, then {@code false} is returned.
* by the argument exists and is equal to, ignoring case, the
* string {@code "true"}.
* A system property is accessible through {@code getProperty}, a
* method defined by the {@code System} class. <p> If there is no
* property with the specified name, or if the specified name is
* empty or null, then {@code false} is returned.
*
* @param name the system property name.
* @return the {@code boolean} value of the system property.

2
jdk/src/java.base/share/classes/java/lang/annotation/ElementType.java
View File

@ -46,7 +46,7 @@ package java.lang.annotation;
* {@code @Target(ElementType.FIELD)} may only be written as a modifier for a
* field declaration.
*
* <p>The constant {@link #TYPE_USE} corresponds to the 15 type contexts in JLS
* <p>The constant {@link #TYPE_USE} corresponds to the type contexts in JLS
* 4.11, as well as to two declaration contexts: type declarations (including
* annotation type declarations) and type parameter declarations.
*

48
jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2016, 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
@ -1491,22 +1491,18 @@ public class SimpleDateFormat extends DateFormat {
if (i < compiledPattern.length) {
int nextTag = compiledPattern[i] >>> 8;
if (!(nextTag == TAG_QUOTE_ASCII_CHAR ||
nextTag == TAG_QUOTE_CHARS)) {
obeyCount = true;
}
int nextCount = compiledPattern[i] & 0xff;
obeyCount = shouldObeyCount(nextTag, nextCount);
if (hasFollowingMinusSign &&
(nextTag == TAG_QUOTE_ASCII_CHAR ||
nextTag == TAG_QUOTE_CHARS)) {
int c;
if (nextTag == TAG_QUOTE_ASCII_CHAR) {
c = compiledPattern[i] & 0xff;
} else {
c = compiledPattern[i+1];
if (nextTag != TAG_QUOTE_ASCII_CHAR) {
nextCount = compiledPattern[i+1];
}
if (c == minusSign) {
if (nextCount == minusSign) {
useFollowingMinusSignAsDelimiter = true;
}
}
@ -1549,6 +1545,36 @@ public class SimpleDateFormat extends DateFormat {
return parsedDate;
}
/* If the next tag/pattern is a <Numeric_Field> then the parser
* should consider the count of digits while parsing the contigous digits
* for the current tag/pattern
*/
private boolean shouldObeyCount(int tag, int count) {
switch (tag) {
case PATTERN_MONTH:
case PATTERN_MONTH_STANDALONE:
return count <= 2;
case PATTERN_YEAR:
case PATTERN_DAY_OF_MONTH:
case PATTERN_HOUR_OF_DAY1:
case PATTERN_HOUR_OF_DAY0:
case PATTERN_MINUTE:
case PATTERN_SECOND:
case PATTERN_MILLISECOND:
case PATTERN_DAY_OF_YEAR:
case PATTERN_DAY_OF_WEEK_IN_MONTH:
case PATTERN_WEEK_OF_YEAR:
case PATTERN_WEEK_OF_MONTH:
case PATTERN_HOUR1:
case PATTERN_HOUR0:
case PATTERN_WEEK_YEAR:
case PATTERN_ISO_DAY_OF_WEEK:
return true;
default:
return false;
}
}
/**
* Private code-size reduction function used by subParse.
* @param text the time text being parsed.

4
jdk/src/java.base/share/classes/java/util/Locale.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2016, 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
@ -198,7 +198,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
*
* <p>The keywords are mapped to a BCP 47 extension value using the
* extension key 'u' ({@link #UNICODE_LOCALE_EXTENSION}). The above
* example, "nu-thai", becomes the extension "u-nu-thai".code
* example, "nu-thai", becomes the extension "u-nu-thai".
*
* <p>Thus, when a <code>Locale</code> object contains Unicode locale
* attributes and keywords,

30
jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
View File

@ -67,9 +67,9 @@ public class BasicImageReader implements AutoCloseable {
static private final boolean MAP_ALL =
isSystemProperty("jdk.image.map.all", "true", IS_64_BIT ? "true" : "false");
private final String name;
private final ByteOrder byteOrder;
private final Path imagePath;
private final ByteOrder byteOrder;
private final String name;
private final ByteBuffer memoryMap;
private final FileChannel channel;
private final ImageHeader header;
@ -83,11 +83,9 @@ public class BasicImageReader implements AutoCloseable {
protected BasicImageReader(Path path, ByteOrder byteOrder)
throws IOException {
Objects.requireNonNull(path);
Objects.requireNonNull(byteOrder);
this.name = path.toString();
this.byteOrder = byteOrder;
imagePath = path;
this.imagePath = Objects.requireNonNull(path);
this.byteOrder = Objects.requireNonNull(byteOrder);
this.name = this.imagePath.toString();
ByteBuffer map;
@ -211,6 +209,8 @@ public class BasicImageReader implements AutoCloseable {
}
public static void releaseByteBuffer(ByteBuffer buffer) {
Objects.requireNonNull(buffer);
if (!MAP_ALL) {
ImageBufferCache.releaseBuffer(buffer);
}
@ -240,10 +240,14 @@ public class BasicImageReader implements AutoCloseable {
}
public ImageLocation findLocation(String mn, String rn) {
Objects.requireNonNull(mn);
Objects.requireNonNull(rn);
return findLocation("/" + mn + "/" + rn);
}
public synchronized ImageLocation findLocation(String name) {
Objects.requireNonNull(name);
// Details of the algorithm used here can be found in
// jdk.tools.jlink.internal.PerfectHashBuilder.
byte[] bytes = ImageStringsReader.mutf8FromString(name);
@ -287,16 +291,25 @@ public class BasicImageReader implements AutoCloseable {
}
public long[] getAttributes(int offset) {
if (offset < 0 || offset >= locations.limit()) {
throw new IndexOutOfBoundsException("offset");
}
ByteBuffer buffer = slice(locations, offset, locations.limit() - offset);
return ImageLocation.decompress(buffer);
}
public String getString(int offset) {
if (offset < 0 || offset >= strings.limit()) {
throw new IndexOutOfBoundsException("offset");
}
ByteBuffer buffer = slice(strings, offset, strings.limit() - offset);
return ImageStringsReader.stringFromByteBuffer(buffer);
}
private byte[] getBufferBytes(ByteBuffer buffer) {
Objects.requireNonNull(buffer);
byte[] bytes = new byte[buffer.limit()];
buffer.get(bytes);
@ -343,6 +356,7 @@ public class BasicImageReader implements AutoCloseable {
}
public byte[] getResource(String name) {
Objects.requireNonNull(name);
ImageLocation location = findLocation(name);
return location != null ? getResource(location) : null;
@ -362,6 +376,7 @@ public class BasicImageReader implements AutoCloseable {
}
public ByteBuffer getResourceBuffer(ImageLocation loc) {
Objects.requireNonNull(loc);
long offset = loc.getContentOffset() + indexSize;
long compressedSize = loc.getCompressedSize();
long uncompressedSize = loc.getUncompressedSize();
@ -399,6 +414,7 @@ public class BasicImageReader implements AutoCloseable {
}
public InputStream getResourceStream(ImageLocation loc) {
Objects.requireNonNull(loc);
byte[] bytes = getResource(loc);
return new ByteArrayInputStream(bytes);

5
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java
View File

@ -27,6 +27,7 @@ package jdk.internal.jimage;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.util.Objects;
/**
* @implNote This class needs to maintain JDK 8 source compatibility.
@ -75,6 +76,8 @@ public final class ImageHeader {
}
static ImageHeader readFrom(IntBuffer buffer) {
Objects.requireNonNull(buffer);
if (buffer.capacity() != HEADER_SLOTS) {
throw new InternalError("jimage header not the correct size");
}
@ -94,11 +97,13 @@ public final class ImageHeader {
}
public void writeTo(ImageStream stream) {
Objects.requireNonNull(stream);
stream.ensure(getHeaderSize());
writeTo(stream.getBuffer());
}
public void writeTo(ByteBuffer buffer) {
Objects.requireNonNull(buffer);
buffer.putInt(magic);
buffer.putInt(majorVersion << 16 | minorVersion);
buffer.putInt(flags);

10
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java
View File

@ -26,6 +26,7 @@
package jdk.internal.jimage;
import java.nio.ByteBuffer;
import java.util.Objects;
/**
* @implNote This class needs to maintain JDK 8 source compatibility.
@ -50,8 +51,8 @@ public class ImageLocation {
protected final ImageStrings strings;
public ImageLocation(long[] attributes, ImageStrings strings) {
this.attributes = attributes;
this.strings = strings;
this.attributes = Objects.requireNonNull(attributes);
this.strings = Objects.requireNonNull(strings);
}
ImageStrings getStrings() {
@ -67,6 +68,7 @@ public class ImageLocation {
}
static long[] decompress(ByteBuffer bytes) {
Objects.requireNonNull(bytes);
long[] attributes = new long[ATTRIBUTE_COUNT];
if (bytes != null) {
@ -103,6 +105,7 @@ public class ImageLocation {
}
public static byte[] compress(long[] attributes) {
Objects.requireNonNull(attributes);
ImageStream stream = new ImageStream(16);
for (int kind = ATTRIBUTE_END + 1; kind < ATTRIBUTE_COUNT; kind++) {
@ -124,6 +127,8 @@ public class ImageLocation {
}
public boolean verify(String name) {
Objects.requireNonNull(name);
return name.equals(getFullName());
}
@ -250,6 +255,7 @@ public class ImageLocation {
}
static ImageLocation readFrom(BasicImageReader reader, int offset) {
Objects.requireNonNull(reader);
long[] attributes = reader.getAttributes(offset);
ImageStringsReader strings = reader.getStrings();

8
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
View File

@ -59,6 +59,9 @@ public final class ImageReader implements AutoCloseable {
}
public static ImageReader open(Path imagePath, ByteOrder byteOrder) throws IOException {
Objects.requireNonNull(imagePath);
Objects.requireNonNull(byteOrder);
return SharedImageReader.open(imagePath, byteOrder);
}
@ -218,6 +221,9 @@ public final class ImageReader implements AutoCloseable {
}
public static ImageReader open(Path imagePath, ByteOrder byteOrder) throws IOException {
Objects.requireNonNull(imagePath);
Objects.requireNonNull(byteOrder);
synchronized (OPEN_FILES) {
SharedImageReader reader = OPEN_FILES.get(imagePath);
@ -237,6 +243,8 @@ public final class ImageReader implements AutoCloseable {
}
public void close(ImageReader image) throws IOException {
Objects.requireNonNull(image);
synchronized (OPEN_FILES) {
if (!openers.remove(image)) {
throw new IOException("image file already closed");

2
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReaderFactory.java
View File

@ -31,6 +31,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
import java.util.Objects;
/**
* Factory to get ImageReader
@ -54,6 +55,7 @@ public class ImageReaderFactory {
* Returns an {@code ImageReader} to read from the given image file
*/
public static ImageReader get(Path jimage) throws IOException {
Objects.requireNonNull(jimage);
ImageReader reader = readers.get(jimage);
if (reader != null) {
return reader;

9
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java
View File

@ -28,6 +28,7 @@ package jdk.internal.jimage;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Arrays;
import java.util.Objects;
/**
* @implNote This class needs to maintain JDK 8 source compatibility.
@ -57,16 +58,16 @@ public class ImageStream {
public ImageStream(int size, ByteOrder byteOrder) {
buffer = ByteBuffer.allocate(size);
buffer.order(byteOrder);
buffer.order(Objects.requireNonNull(byteOrder));
}
public ImageStream(byte[] bytes, ByteOrder byteOrder) {
buffer = ByteBuffer.wrap(bytes);
buffer.order(byteOrder);
buffer = ByteBuffer.wrap(Objects.requireNonNull(bytes));
buffer.order(Objects.requireNonNull(byteOrder));
}
public ImageStream(ByteBuffer buffer) {
this.buffer = buffer;
this.buffer = Objects.requireNonNull(buffer);
}
public ImageStream align(int alignment) {

17
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java
View File

@ -27,6 +27,7 @@ package jdk.internal.jimage;
import java.io.UTFDataFormatException;
import java.nio.ByteBuffer;
import java.util.Objects;
/**
* @implNote This class needs to maintain JDK 8 source compatibility.
@ -40,7 +41,7 @@ public class ImageStringsReader implements ImageStrings {
private final BasicImageReader reader;
ImageStringsReader(BasicImageReader reader) {
this.reader = reader;
this.reader = Objects.requireNonNull(reader);
}
@Override
@ -54,7 +55,19 @@ public class ImageStringsReader implements ImageStrings {
}
private static int hashCode(byte[] bytes, int offset, int count, int seed) {
for (int i = offset, limit = offset + count; i < limit; i++) {
Objects.requireNonNull(bytes);
if (offset < 0 || count < 0 || offset > bytes.length - count) {
throw new IndexOutOfBoundsException("offset=" + offset + ", count=" + count);
}
int limit = offset + count;
if (limit < 0 || limit > bytes.length) {
throw new IndexOutOfBoundsException("limit=" + limit);
}
for (int i = offset; i < limit; i++) {
seed = (seed * HASH_MULTIPLIER) ^ (bytes[i] & 0xFF);
}

17
jdk/src/java.base/share/classes/jdk/internal/misc/VM.java
View File

@ -475,6 +475,23 @@ public class VM {
*/
public static native long getNanoTimeAdjustment(long offsetInSeconds);
/**
* Returns the VM arguments for this runtime environment.
*
* @implNote
* The HotSpot JVM processes the input arguments from multiple sources
* in the following order:
* 1. JAVA_TOOL_OPTIONS environment variable
* 2. Options from JNI Invocation API
* 3. _JAVA_OPTIONS environment variable
*
* If VM options file is specified via -XX:VMOptionsFile, the vm options
* file is read and expanded in place of -XX:VMOptionFile option.
*
* Open issue with -XX:Flags (see JDK-8157979)
*/
public static native String[] getRuntimeArguments();
static {
initialize();
}

6
jdk/src/java.base/share/classes/module-info.java
View File

@ -152,8 +152,7 @@ module java.base {
java.xml,
jdk.dynalink,
jdk.jartool,
jdk.jlink,
jdk.scripting.nashorn;
jdk.jlink;
exports jdk.internal.misc to
java.corba,
java.desktop,
@ -165,6 +164,7 @@ module java.base {
java.sql,
java.xml,
jdk.charsets,
jdk.compiler,
jdk.jartool,
jdk.jlink,
jdk.net,
@ -215,6 +215,8 @@ module java.base {
exports sun.nio.cs to
java.desktop,
jdk.charsets;
exports sun.nio.fs to
jdk.unsupported;
exports sun.reflect.annotation to
jdk.compiler;
exports sun.reflect.generics.reflectiveObjects to

143
jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java Normal file
View File

@ -0,0 +1,143 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sun.nio.fs;
import java.nio.file.CopyOption;
import java.nio.file.OpenOption;
import java.nio.file.WatchEvent;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Provides support for handling JDK-specific OpenOption, CopyOption and
* WatchEvent.Modifier types.
*/
public final class ExtendedOptions {
// maps InternalOption to ExternalOption
private static final Map<InternalOption<?>, Wrapper<?>> internalToExternal
= new ConcurrentHashMap<>();
/**
* Wraps an option or modifier.
*/
private static final class Wrapper<T> {
private final Object option;
private final T param;
Wrapper(Object option, T param) {
this.option = option;
this.param = param;
}
T parameter() {
return param;
}
}
/**
* The internal version of a JDK-specific OpenOption, CopyOption or
* WatchEvent.Modifier.
*/
public static final class InternalOption<T> {
InternalOption() { }
private void registerInternal(Object option, T param) {
Wrapper<T> wrapper = new Wrapper<T>(option, param);
internalToExternal.put(this, wrapper);
}
/**
* Register this internal option as a OpenOption.
*/
public void register(OpenOption option) {
registerInternal(option, null);
}
/**
* Register this internal option as a CopyOption.
*/
public void register(CopyOption option) {
registerInternal(option, null);
}
/**
* Register this internal option as a WatchEvent.Modifier.
*/
public void register(WatchEvent.Modifier option) {
registerInternal(option, null);
}
/**
* Register this internal option as a WatchEvent.Modifier with the
* given parameter.
*/
public void register(WatchEvent.Modifier option, T param) {
registerInternal(option, param);
}
/**
* Returns true if the given option (or modifier) maps to this internal
* option.
*/
public boolean matches(Object option) {
Wrapper <?> wrapper = internalToExternal.get(this);
if (wrapper == null)
return false;
else
return option == wrapper.option;
}
/**
* Returns the parameter object associated with this internal option.
*/
@SuppressWarnings("unchecked")
public T parameter() {
Wrapper<?> wrapper = internalToExternal.get(this);
if (wrapper == null)
return null;
else
return (T) wrapper.parameter();
}
}
// Internal equivalents of the options and modifiers defined in
// package com.sun.nio.file
public static final InternalOption<Void> INTERRUPTIBLE = new InternalOption<>();
public static final InternalOption<Void> NOSHARE_READ = new InternalOption<>();
public static final InternalOption<Void> NOSHARE_WRITE = new InternalOption<>();
public static final InternalOption<Void> NOSHARE_DELETE = new InternalOption<>();
public static final InternalOption<Void> FILE_TREE = new InternalOption<>();
public static final InternalOption<Integer> SENSITIVITY_HIGH = new InternalOption<>();
public static final InternalOption<Integer> SENSITIVITY_MEDIUM = new InternalOption<>();
public static final InternalOption<Integer> SENSITIVITY_LOW = new InternalOption<>();
}

63
jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -25,16 +25,32 @@
package sun.nio.fs;
import java.nio.file.*;
import java.nio.file.attribute.*;
import java.nio.file.ClosedWatchServiceException;
import java.nio.file.DirectoryIteratorException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.NotDirectoryException;
import java.nio.file.Path;
import java.nio.file.StandardWatchEventKinds;
import java.nio.file.WatchEvent;
import java.nio.file.WatchKey;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
import com.sun.nio.file.SensitivityWatchEventModifier;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
/**
* Simple WatchService implementation that uses periodic tasks to poll
@ -46,8 +62,7 @@ class PollingWatchService
extends AbstractWatchService
{
// map of registrations
private final Map<Object,PollingWatchKey> map =
new HashMap<Object,PollingWatchKey>();
private final Map<Object, PollingWatchKey> map = new HashMap<>();
// used to execute the periodic tasks that poll for changes
private final ScheduledExecutorService scheduledExecutor;
@ -58,7 +73,7 @@ class PollingWatchService
.newSingleThreadScheduledExecutor(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
Thread t = new Thread(null, r, "FileSystemWatchService", 0, false);
Thread t = new Thread(null, r, "FileSystemWatcher", 0, false);
t.setDaemon(true);
return t;
}});
@ -74,8 +89,7 @@ class PollingWatchService
throws IOException
{
// check events - CCE will be thrown if there are invalid elements
final Set<WatchEvent.Kind<?>> eventSet =
new HashSet<WatchEvent.Kind<?>>(events.length);
final Set<WatchEvent.Kind<?>> eventSet = new HashSet<>(events.length);
for (WatchEvent.Kind<?> event: events) {
// standard events
if (event == StandardWatchEventKinds.ENTRY_CREATE ||
@ -99,17 +113,22 @@ class PollingWatchService
if (eventSet.isEmpty())
throw new IllegalArgumentException("No events to register");
// A modifier may be used to specify the sensitivity level
SensitivityWatchEventModifier sensivity = SensitivityWatchEventModifier.MEDIUM;
// Extended modifiers may be used to specify the sensitivity level
int sensitivity = 10;
if (modifiers.length > 0) {
for (WatchEvent.Modifier modifier: modifiers) {
if (modifier == null)
throw new NullPointerException();
if (modifier instanceof SensitivityWatchEventModifier) {
sensivity = (SensitivityWatchEventModifier)modifier;
continue;
if (ExtendedOptions.SENSITIVITY_HIGH.matches(modifier)) {
sensitivity = ExtendedOptions.SENSITIVITY_HIGH.parameter();
} else if (ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier)) {
sensitivity = ExtendedOptions.SENSITIVITY_MEDIUM.parameter();
} else if (ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
sensitivity = ExtendedOptions.SENSITIVITY_LOW.parameter();
} else {
throw new UnsupportedOperationException("Modifier not supported");
}
throw new UnsupportedOperationException("Modifier not supported");
}
}
@ -120,12 +139,12 @@ class PollingWatchService
// registration is done in privileged block as it requires the
// attributes of the entries in the directory.
try {
final SensitivityWatchEventModifier s = sensivity;
int value = sensitivity;
return AccessController.doPrivileged(
new PrivilegedExceptionAction<PollingWatchKey>() {
@Override
public PollingWatchKey run() throws IOException {
return doPrivilegedRegister(path, eventSet, s);
return doPrivilegedRegister(path, eventSet, value);
}
});
} catch (PrivilegedActionException pae) {
@ -140,7 +159,7 @@ class PollingWatchService
// existing key if already registered
private PollingWatchKey doPrivilegedRegister(Path path,
Set<? extends WatchEvent.Kind<?>> events,
SensitivityWatchEventModifier sensivity)
int sensitivityInSeconds)
throws IOException
{
// check file is a directory and get its file key if possible
@ -169,7 +188,7 @@ class PollingWatchService
watchKey.disable();
}
}
watchKey.enable(events, sensivity.sensitivityValueInSeconds());
watchKey.enable(events, sensitivityInSeconds);
return watchKey;
}
@ -178,7 +197,7 @@ class PollingWatchService
@Override
void implClose() throws IOException {
synchronized (map) {
for (Map.Entry<Object,PollingWatchKey> entry: map.entrySet()) {
for (Map.Entry<Object, PollingWatchKey> entry: map.entrySet()) {
PollingWatchKey watchKey = entry.getValue();
watchKey.disable();
watchKey.invalidate();

55
jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
View File

@ -29,6 +29,7 @@ import java.security.AlgorithmConstraints;
import java.security.CryptoPrimitive;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Set;
import java.util.EnumSet;
import java.math.BigInteger;
@ -59,7 +60,7 @@ import sun.security.x509.X509CRLImpl;
import sun.security.x509.AlgorithmId;
/**
* A <code>PKIXCertPathChecker</code> implementation to check whether a
* A {@code PKIXCertPathChecker} implementation to check whether a
* specified certificate contains the required algorithm constraints.
* <p>
* Certificate fields such as the subject public key, the signature
@ -74,6 +75,7 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
private final AlgorithmConstraints constraints;
private final PublicKey trustedPubKey;
private final Date pkixdate;
private PublicKey prevPubKey;
private static final Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
@ -99,7 +101,7 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
private boolean trustedMatch = false;
/**
* Create a new <code>AlgorithmChecker</code> with the algorithm
* Create a new {@code AlgorithmChecker} with the algorithm
* constraints specified in security property
* "jdk.certpath.disabledAlgorithms".
*
@ -107,11 +109,26 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
* certificate
*/
public AlgorithmChecker(TrustAnchor anchor) {
this(anchor, certPathDefaultConstraints);
this(anchor, certPathDefaultConstraints, null);
}
/**
* Create a new <code>AlgorithmChecker</code> with the
* Create a new {@code AlgorithmChecker} with the
* given {@code TrustAnchor} and {@code AlgorithmConstraints}.
*
* @param anchor the trust anchor selected to validate the target
* certificate
* @param constraints the algorithm constraints (or null)
*
* @throws IllegalArgumentException if the {@code anchor} is null
*/
public AlgorithmChecker(TrustAnchor anchor,
AlgorithmConstraints constraints) {
this(anchor, constraints, null);
}
/**
* Create a new {@code AlgorithmChecker} with the
* given {@code AlgorithmConstraints}.
* <p>
* Note that this constructor will be used to check a certification
@ -124,20 +141,24 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
this.prevPubKey = null;
this.trustedPubKey = null;
this.constraints = constraints;
this.pkixdate = null;
}
/**
* Create a new <code>AlgorithmChecker</code> with the
* given <code>TrustAnchor</code> and <code>AlgorithmConstraints</code>.
* Create a new {@code AlgorithmChecker} with the
* given {@code TrustAnchor} and {@code AlgorithmConstraints}.
*
* @param anchor the trust anchor selected to validate the target
* certificate
* @param constraints the algorithm constraints (or null)
* @param pkixdate Date the constraints are checked against. The value is
* either the PKIXParameter date or null for the current date.
*
* @throws IllegalArgumentException if the <code>anchor</code> is null
* @throws IllegalArgumentException if the {@code anchor} is null
*/
public AlgorithmChecker(TrustAnchor anchor,
AlgorithmConstraints constraints) {
AlgorithmConstraints constraints,
Date pkixdate) {
if (anchor == null) {
throw new IllegalArgumentException(
@ -157,6 +178,22 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
this.prevPubKey = trustedPubKey;
this.constraints = constraints;
this.pkixdate = pkixdate;
}
/**
* Create a new {@code AlgorithmChecker} with the
* given {@code TrustAnchor} and {@code PKIXParameter} date.
*
* @param anchor the trust anchor selected to validate the target
* certificate
* @param pkixdate Date the constraints are checked against. The value is
* either the PKIXParameter date or null for the current date.
*
* @throws IllegalArgumentException if the {@code anchor} is null
*/
public AlgorithmChecker(TrustAnchor anchor, Date pkixdate) {
this(anchor, certPathDefaultConstraints, pkixdate);
}
// Check this 'cert' for restrictions in the AnchorCertificates
@ -259,7 +296,7 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
// permits() will throw exception on failure.
certPathDefaultConstraints.permits(primitives,
new CertConstraintParameters((X509Certificate)cert,
trustedMatch));
trustedMatch, pkixdate));
// new CertConstraintParameters(x509Cert, trustedMatch));
// If there is no previous key, set one and exit
if (prevPubKey == null) {

2
jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
View File

@ -172,7 +172,7 @@ public final class PKIXCertPathValidator extends CertPathValidatorSpi {
List<PKIXCertPathChecker> certPathCheckers = new ArrayList<>();
// add standard checkers that we will be using
certPathCheckers.add(untrustedChecker);
certPathCheckers.add(new AlgorithmChecker(anchor));
certPathCheckers.add(new AlgorithmChecker(anchor, params.date()));
certPathCheckers.add(new KeyChecker(certPathLen,
params.targetCertConstraints()));
certPathCheckers.add(new ConstraintsChecker(certPathLen));

3
jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
View File

@ -343,7 +343,8 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi {
checkers.add(policyChecker);
// add the algorithm checker
checkers.add(new AlgorithmChecker(builder.trustAnchor));
checkers.add(new AlgorithmChecker(builder.trustAnchor,
buildParams.date()));
BasicChecker basicChecker = null;
if (nextState.keyParamsNeeded()) {

34
jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
View File

@ -90,6 +90,30 @@ final class RSAClientKeyExchange extends HandshakeMessage {
}
}
/*
* Retrieving the cipher's provider name for the debug purposes
* can throw an exception by itself.
*/
private static String safeProviderName(Cipher cipher) {
try {
return cipher.getProvider().toString();
} catch (Exception e) {
if (debug != null && Debug.isOn("handshake")) {
System.out.println("Retrieving The Cipher provider name" +
" caused exception " + e.getMessage());
}
}
try {
return cipher.toString() + " (provider name not available)";
} catch (Exception e) {
if (debug != null && Debug.isOn("handshake")) {
System.out.println("Retrieving The Cipher name" +
" caused exception " + e.getMessage());
}
}
return "(cipher/provider names not available)";
}
/*
* Server gets the PKCS #1 (block format 02) data, decrypts
* it with its private key.
@ -132,15 +156,19 @@ final class RSAClientKeyExchange extends HandshakeMessage {
cipher.getProvider().getName());
} catch (InvalidKeyException | UnsupportedOperationException iue) {
if (debug != null && Debug.isOn("handshake")) {
System.out.println("The Cipher provider " +
cipher.getProvider().getName() +
" caused exception: " + iue.getMessage());
System.out.println("The Cipher provider "
+ safeProviderName(cipher)
+ " caused exception: " + iue.getMessage());
}
needFailover = true;
}
if (needFailover) {
// The cipher might be spoiled by unsuccessful call to init(),
// so request a fresh instance
cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
// Use DECRYPT_MODE and dispose the previous initialization.
cipher.init(Cipher.DECRYPT_MODE, privateKey);
boolean failed = false;

15
jdk/src/java.base/share/classes/sun/security/util/CertConstraintParameters.java
View File

@ -26,6 +26,7 @@
package sun.security.util;
import java.security.cert.X509Certificate;
import java.util.Date;
/**
* This class is a wrapper for keeping state and passing objects between PKIX,
@ -34,18 +35,21 @@ import java.security.cert.X509Certificate;
public class CertConstraintParameters {
// A certificate being passed to check against constraints.
private final X509Certificate cert;
// This is true if the trust anchor in the certificate chain matches a cert
// in AnchorCertificates
private final boolean trustedMatch;
// PKIXParameter date
private final Date pkixDate;
public CertConstraintParameters(X509Certificate c, boolean match) {
public CertConstraintParameters(X509Certificate c, boolean match,
Date pkixdate) {
cert = c;
trustedMatch = match;
pkixDate = pkixdate;
}
public CertConstraintParameters(X509Certificate c) {
this(c, false);
this(c, false, null);
}
// Returns if the trust anchor has a match if anchor checking is enabled.
@ -56,4 +60,9 @@ public class CertConstraintParameters {
public X509Certificate getCertificate() {
return cert;
}
public Date getPKIXParamDate() {
return pkixDate;
}
}

207
jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
View File

@ -31,11 +31,15 @@ import java.security.Key;
import java.security.cert.CertPathValidatorException;
import java.security.cert.CertPathValidatorException.BasicReason;
import java.security.cert.X509Certificate;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@ -226,6 +230,8 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
private Map<String, Set<Constraint>> constraintsMap = new HashMap<>();
private static final Pattern keySizePattern = Pattern.compile(
"keySize\\s*(<=|<|==|!=|>|>=)\\s*(\\d+)");
private static final Pattern denyAfterPattern = Pattern.compile(
"denyAfter\\s+(\\d{4})-(\\d{2})-(\\d{2})");
public Constraints(String[] constraintArray) {
for (String constraintEntry : constraintArray) {
@ -259,6 +265,8 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
Constraint c, lastConstraint = null;
// Allow only one jdkCA entry per constraint entry
boolean jdkCALimit = false;
// Allow only one denyAfter entry per constraint entry
boolean denyAfterLimit = false;
for (String entry : policy.split("&")) {
entry = entry.trim();
@ -284,6 +292,22 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
}
c = new jdkCAConstraint(algorithm);
jdkCALimit = true;
} else if(matcher.usePattern(denyAfterPattern).matches()) {
if (debug != null) {
debug.println("Constraints set to denyAfter");
}
if (denyAfterLimit) {
throw new IllegalArgumentException("Only one " +
"denyAfter entry allowed in property. " +
"Constraint: " + constraintEntry);
}
int year = Integer.parseInt(matcher.group(1));
int month = Integer.parseInt(matcher.group(2));
int day = Integer.parseInt(matcher.group(3));
c = new DenyAfterConstraint(algorithm, year, month,
day);
denyAfterLimit = true;
} else {
throw new IllegalArgumentException("Error in security" +
" property. Constraint unknown: " + entry);
@ -360,7 +384,15 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
}
}
// Abstract class for algorithm constraint checking
/**
* This abstract Constraint class for algorithm-based checking
* may contain one or more constraints. If the '&' on the {@Security}
* property is used, multiple constraints have been grouped together
* requiring all the constraints to fail for the check to be disallowed.
*
* If the class contains multiple constraints, the next constraint
* is stored in {@code nextConstraint} in linked-list fashion.
*/
private abstract static class Constraint {
String algorithm;
Constraint nextConstraint = null;
@ -396,22 +428,79 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
}
/**
* Check if an algorithm constraint permit this key to be used.
* Check if an algorithm constraint is permitted with a given key.
*
* If the check inside of {@code permit()} fails, it must call
* {@code next()} with the same {@code Key} parameter passed if
* multiple constraints need to be checked.
*
* @param key Public key
* @return true if constraints do not match
* @return 'true' if constraint is allowed, 'false' if disallowed.
*/
public boolean permits(Key key) {
return true;
}
/**
* Check if an algorithm constraint is permit this certificate to
* be used.
* @param cp CertificateParameter containing certificate and state info
* @return true if constraints do not match
* Check if an algorithm constraint is permitted with a given
* CertConstraintParameters.
*
* If the check inside of {@code permits()} fails, it must call
* {@code next()} with the same {@code CertConstraintParameters}
* parameter passed if multiple constraints need to be checked.
*
* @param cp CertConstraintParameter containing certificate info
* @throws CertPathValidatorException if constraint disallows.
*
*/
public abstract void permits(CertConstraintParameters cp)
throws CertPathValidatorException;
/**
* Recursively check if the constraints are allowed.
*
* If {@code nextConstraint} is non-null, this method will
* call {@code nextConstraint}'s {@code permits()} to check if the
* constraint is allowed or denied. If the constraint's
* {@code permits()} is allowed, this method will exit this and any
* recursive next() calls, returning 'true'. If the constraints called
* were disallowed, the last constraint will throw
* {@code CertPathValidatorException}.
*
* @param cp CertConstraintParameters
* @return 'true' if constraint allows the operation, 'false' if
* we are at the end of the constraint list or,
* {@code nextConstraint} is null.
*/
boolean next(CertConstraintParameters cp)
throws CertPathValidatorException {
if (nextConstraint != null) {
nextConstraint.permits(cp);
return true;
}
return false;
}
/**
* Recursively check if this constraint is allowed,
*
* If {@code nextConstraint} is non-null, this method will
* call {@code nextConstraint}'s {@code permit()} to check if the
* constraint is allowed or denied. If the constraint's
* {@code permit()} is allowed, this method will exit this and any
* recursive next() calls, returning 'true'. If the constraints
* called were disallowed the check will exit with 'false'.
*
* @param key Public key
* @return 'true' if constraint allows the operation, 'false' if
* the constraint denies the operation.
*/
boolean next(Key key) {
if (nextConstraint != null && nextConstraint.permits(key)) {
return true;
}
return false;
}
}
/*
@ -424,9 +513,9 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
}
/*
* Check if each constraint fails and check if there is a linked
* constraint Any permitted constraint will exit the linked list
* to allow the operation.
* Check if CertConstraintParameters has a trusted match, if it does
* call next() for any following constraints. If it does not, exit
* as this constraint(s) does not restrict the operation.
*/
public void permits(CertConstraintParameters cp)
throws CertPathValidatorException {
@ -434,10 +523,9 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
debug.println("jdkCAConstraints.permits(): " + algorithm);
}
// Return false if the chain has a trust anchor in cacerts
// Check chain has a trust anchor in cacerts
if (cp.isTrustedMatch()) {
if (nextConstraint != null) {
nextConstraint.permits(cp);
if (next(cp)) {
return;
}
throw new CertPathValidatorException(
@ -448,6 +536,99 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
}
}
/*
* This class handles the denyAfter constraint. The date is in the UTC/GMT
* timezone.
*/
private static class DenyAfterConstraint extends Constraint {
private Date denyAfterDate;
private static final SimpleDateFormat dateFormat =
new SimpleDateFormat("EEE, MMM d HH:mm:ss z YYYY");
DenyAfterConstraint(String algo, int year, int month, int day) {
Calendar c;
algorithm = algo;
if (debug != null) {
debug.println("DenyAfterConstraint read in as: year " +
year + ", month = " + month + ", day = " + day);
}
c = new Calendar.Builder().setTimeZone(TimeZone.getTimeZone("GMT"))
.setDate(year, month - 1, day).build();
if (year > c.getActualMaximum(Calendar.YEAR) ||
year < c.getActualMinimum(Calendar.YEAR)) {
throw new IllegalArgumentException(
"Invalid year given in constraint: " + year);
}
if ((month - 1) > c.getActualMaximum(Calendar.MONTH) ||
(month - 1) < c.getActualMinimum(Calendar.MONTH)) {
throw new IllegalArgumentException(
"Invalid month given in constraint: " + month);
}
if (day > c.getActualMaximum(Calendar.DAY_OF_MONTH) ||
day < c.getActualMinimum(Calendar.DAY_OF_MONTH)) {
throw new IllegalArgumentException(
"Invalid Day of Month given in constraint: " + day);
}
denyAfterDate = c.getTime();
if (debug != null) {
debug.println("DenyAfterConstraint date set to: " +
dateFormat.format(denyAfterDate));
}
}
/*
* Checking that the provided date is not beyond the constraint date.
* The provided date can be the PKIXParameter date if given,
* otherwise it is the current date.
*
* If the constraint disallows, call next() for any following
* constraints. Throw an exception if this is the last constraint.
*/
@Override
public void permits(CertConstraintParameters cp)
throws CertPathValidatorException {
Date currentDate;
if (cp.getPKIXParamDate() != null) {
currentDate = cp.getPKIXParamDate();
} else {
currentDate = new Date();
}
if (!denyAfterDate.after(currentDate)) {
if (next(cp)) {
return;
}
throw new CertPathValidatorException(
"denyAfter constraint check failed. " +
"Constraint date: " +
dateFormat.format(denyAfterDate) +
"; Cert date: " +
dateFormat.format(currentDate),
null, null, -1, BasicReason.ALGORITHM_CONSTRAINED);
}
}
/*
* Return result if the constraint's date is beyond the current date
* in UTC timezone.
*/
public boolean permits(Key key) {
if (next(key)) {
return true;
}
if (debug != null) {
debug.println("DenyAfterConstraints.permits(): " + algorithm);
}
return denyAfterDate.after(new Date());
}
}
/*
* This class contains constraints dealing with the key size

80
jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -132,12 +132,6 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"Year" },
{ "field.zone",
"Zone" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
@ -245,18 +239,18 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -387,35 +381,35 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
},
{ "roc.MonthAbbreviations",
new String[] {
"M01",
"M02",
"M03",
"M04",
"M05",
"M06",
"M07",
"M08",
"M09",
"M10",
"M11",
"M12",
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
"",
}
},
{ "roc.MonthNames",
new String[] {
"M01",
"M02",
"M03",
"M04",
"M05",
"M06",
"M07",
"M08",
"M09",
"M10",
"M11",
"M12",
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
"",
}
},
@ -445,6 +439,12 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
@ -453,8 +453,8 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
"AM",
"PM",
}
},
{ "roc.narrow.Eras",

57
jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -99,8 +99,30 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"Minguo Calendar" },
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"era" },
{ "field.hour",
"hour" },
{ "field.minute",
"minute" },
{ "field.month",
"month" },
{ "field.second",
"second" },
{ "field.week",
"week" },
{ "field.weekday",
"day of the week" },
{ "field.year",
"year" },
{ "field.zone",
"Time Zone" },
"time zone" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, MMMM d, y GGGG",
@ -144,6 +166,12 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"h:mm a",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
@ -224,23 +252,6 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"Minguo",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
"",
}
},
{ "roc.MonthNames",
new String[] {
"January",
@ -305,6 +316,12 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"Minguo",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",

76
jdk/src/java.base/share/conf/security/java.security
View File

@ -570,9 +570,7 @@ krb5.kdc.bad.policy = tryLast
# describes the mechanism for disabling algorithms based on algorithm name
# and/or key length. This includes algorithms used in certificates, as well
# as revocation information such as CRLs and signed OCSP Responses.
#
# The syntax of the disabled algorithm string is described as this Java
# BNF-style:
# The syntax of the disabled algorithm string is described as follows:
# DisabledAlgorithms:
# " DisabledAlgorithm { , DisabledAlgorithm } "
#
@ -583,26 +581,23 @@ krb5.kdc.bad.policy = tryLast
# (see below)
#
# Constraint:
# KeySizeConstraint, CertConstraint
# KeySizeConstraint | CAConstraint | DenyAfterConstraint
#
# KeySizeConstraint:
# keySize Operator DecimalInteger
# keySize Operator KeyLength
#
# Operator:
# <= | < | == | != | >= | >
#
# DecimalInteger:
# DecimalDigits
# KeyLength:
# Integer value of the algorithm's key length in bits
#
# DecimalDigits:
# DecimalDigit {DecimalDigit}
#
# DecimalDigit: one of
# 1 2 3 4 5 6 7 8 9 0
#
# CertConstraint
# CAConstraint:
# jdkCA
#
# DenyAfterConstraint:
# denyAfter YYYY-MM-DD
#
# The "AlgorithmName" is the standard algorithm name of the disabled
# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
# Documentation" for information about Standard Algorithm Names. Matching
@ -615,27 +610,42 @@ krb5.kdc.bad.policy = tryLast
# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion
# will not disable algorithms related to "ECDSA".
#
# A "Constraint" provides further guidance for the algorithm being specified.
# The "KeySizeConstraint" requires a key of a valid size range if the
# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the
# key size specified in number of bits. For example, "RSA keySize <= 1024"
# indicates that any RSA key with key size less than or equal to 1024 bits
# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
# that any RSA key with key size less than 1024 or greater than 2048 should
# be disabled. Note that the "KeySizeConstraint" only makes sense to key
# algorithms.
# A "Constraint" defines restrictions on the keys and/or certificates for
# a specified AlgorithmName:
#
# "CertConstraint" specifies additional constraints for
# certificates that contain algorithms that are restricted:
# KeySizeConstraint:
# keySize Operator KeyLength
# The constraint requires a key of a valid size range if the
# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates
# the key size specified in number of bits. For example,
# "RSA keySize <= 1024" indicates that any RSA key with key size less
# than or equal to 1024 bits should be disabled, and
# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key
# with key size less than 1024 or greater than 2048 should be disabled.
# This constraint is only used on algorithms that have a key size.
#
# "jdkCA" prohibits the specified algorithm only if the algorithm is used
# in a certificate chain that terminates at a marked trust anchor in the
# lib/security/cacerts keystore.  All other chains are not affected.
# If the jdkCA constraint is not set, then all chains using the
# specified algorithm are restricted. jdkCA may only be used once in
# a DisabledAlgorithm expression.
# Example:  To apply this constraint to SHA-1 certificates, include
# the following:  "SHA1 jdkCA"
# CAConstraint:
# jdkCA
# This constraint prohibits the specified algorithm only if the
# algorithm is used in a certificate chain that terminates at a marked
# trust anchor in the lib/security/cacerts keystore. If the jdkCA
# constraint is not set, then all chains using the specified algorithm
# are restricted. jdkCA may only be used once in a DisabledAlgorithm
# expression.
# Example:  To apply this constraint to SHA-1 certificates, include
# the following:  "SHA1 jdkCA"
#
# DenyAfterConstraint:
# denyAfter YYYY-MM-DD
# This constraint prohibits a certificate with the specified algorithm
# from being used after the date regardless of the certificate's
# validity.  JAR files that are signed and timestamped before the
# constraint date with certificates containing the disabled algorithm
# will not be restricted.  The date is processed in the UTC timezone.
# This constraint can only be used once in a DisabledAlgorithm
# expression.
# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020,
# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03"
#
# When an algorithm must satisfy more than one constraint, it must be
# delimited by an ampersand '&'. For example, to restrict certificates in a

5
jdk/src/java.base/share/native/libjava/VM.c
View File

@ -55,3 +55,8 @@ Java_jdk_internal_misc_VM_initialize(JNIEnv *env, jclass cls) {
(*env)->RegisterNatives(env, cls,
methods, sizeof(methods)/sizeof(methods[0]));
}
JNIEXPORT jobjectArray JNICALL
Java_jdk_internal_misc_VM_getRuntimeArguments(JNIEnv *env, jclass cls) {
return JVM_GetVmArguments(env);
}

11
jdk/src/java.base/share/native/libverify/check_code.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2016, 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
@ -1744,9 +1744,14 @@ static int instruction_length(unsigned char *iptr, unsigned char *end)
}
default: {
if (instruction < 0 || instruction > JVM_OPC_MAX)
return -1;
/* A length of 0 indicates an error. */
int length = opcode_length[instruction];
return (length <= 0) ? -1 : length;
if (opcode_length[instruction] <= 0)
return -1;
return opcode_length[instruction];
}
}
}

9
jdk/src/java.base/share/native/libzip/zip_util.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2016, 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
@ -76,6 +76,13 @@ static void freeCEN(jzfile *);
static jint INITIAL_META_COUNT = 2; /* initial number of entries in meta name array */
/*
* Declare library specific JNI_Onload entry if static build
*/
#ifdef STATIC_BUILD
DEF_STATIC_JNI_OnLoad
#endif
/*
* The ZFILE_* functions exist to provide some platform-independence with
* respect to file access needs.

8
jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
View File

@ -272,9 +272,11 @@ class SolarisWatchService
for (WatchEvent.Modifier modifier: modifiers) {
if (modifier == null)
return new NullPointerException();
if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
continue; // ignore
return new UnsupportedOperationException("Modifier not supported");
if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
return new UnsupportedOperationException("Modifier not supported");
}
}
}

13
jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -25,13 +25,18 @@
package sun.nio.fs;
import java.nio.file.*;
import java.io.IOException;
import java.nio.file.AtomicMoveNotSupportedException;
import java.nio.file.CopyOption;
import java.nio.file.DirectoryNotEmptyException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.LinkOption;
import java.nio.file.LinkPermission;
import java.nio.file.StandardCopyOption;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import com.sun.nio.file.ExtendedCopyOption;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;
@ -82,7 +87,7 @@ class UnixCopyFile {
flags.failIfUnableToCopyBasic = true;
continue;
}
if (option == ExtendedCopyOption.INTERRUPTIBLE) {
if (ExtendedOptions.INTERRUPTIBLE.matches(option)) {
flags.interruptible = true;
continue;
}

25
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -34,8 +34,6 @@ import java.nio.file.OpenOption;
import java.nio.file.StandardOpenOption;
import java.util.Set;
import com.sun.nio.file.ExtendedOpenOption;
import jdk.internal.misc.JavaIOFileDescriptorAccess;
import jdk.internal.misc.SharedSecrets;
import sun.nio.ch.FileChannelImpl;
@ -103,15 +101,6 @@ class WindowsChannelFactory {
}
continue;
}
if (option instanceof ExtendedOpenOption) {
switch ((ExtendedOpenOption)option) {
case NOSHARE_READ : flags.shareRead = false; break;
case NOSHARE_WRITE : flags.shareWrite = false; break;
case NOSHARE_DELETE : flags.shareDelete = false; break;
default: throw new UnsupportedOperationException();
}
continue;
}
if (option == LinkOption.NOFOLLOW_LINKS) {
flags.noFollowLinks = true;
continue;
@ -120,6 +109,18 @@ class WindowsChannelFactory {
flags.openReparsePoint = true;
continue;
}
if (ExtendedOptions.NOSHARE_READ.matches(option)) {
flags.shareRead = false;
continue;
}
if (ExtendedOptions.NOSHARE_WRITE.matches(option)) {
flags.shareWrite = false;
continue;
}
if (ExtendedOptions.NOSHARE_DELETE.matches(option)) {
flags.shareDelete = false;
continue;
}
if (option == null)
throw new NullPointerException();
throw new UnsupportedOperationException();

5
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -28,7 +28,6 @@ package sun.nio.fs;
import java.nio.file.*;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import com.sun.nio.file.ExtendedCopyOption;
import static sun.nio.fs.WindowsNativeDispatcher.*;
import static sun.nio.fs.WindowsConstants.*;
@ -67,7 +66,7 @@ class WindowsFileCopy {
copyAttributes = true;
continue;
}
if (option == ExtendedCopyOption.INTERRUPTIBLE) {
if (ExtendedOptions.INTERRUPTIBLE.matches(option)) {
interruptible = true;
continue;
}

6
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -32,8 +32,6 @@ import java.net.URI;
import java.util.*;
import java.lang.ref.WeakReference;
import com.sun.nio.file.ExtendedWatchEventModifier;
import static sun.nio.fs.WindowsNativeDispatcher.*;
import static sun.nio.fs.WindowsConstants.*;
@ -864,7 +862,7 @@ class WindowsPath implements Path {
modifiers = Arrays.copyOf(modifiers, ml);
int i=0;
while (i < ml) {
if (modifiers[i++] == ExtendedWatchEventModifier.FILE_TREE) {
if (ExtendedOptions.FILE_TREE.matches(modifiers[i++])) {
watchSubtree = true;
break;
}

13
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -35,7 +35,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import com.sun.nio.file.ExtendedWatchEventModifier;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.WindowsNativeDispatcher.*;
@ -342,14 +341,16 @@ class WindowsWatchService
// FILE_TREE modifier allowed
for (WatchEvent.Modifier modifier: modifiers) {
if (modifier == ExtendedWatchEventModifier.FILE_TREE) {
if (ExtendedOptions.FILE_TREE.matches(modifier)) {
watchSubtree = true;
} else {
if (modifier == null)
return new NullPointerException();
if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
continue; // ignore
return new UnsupportedOperationException("Modifier not supported");
if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
!ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
return new UnsupportedOperationException("Modifier not supported");
}
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -273,6 +273,12 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"h:mm a",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -499,6 +505,12 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"h:mm a",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",

58
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -90,17 +90,19 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
}
},
{ "calendarname.buddhist",
"\u0431\u0443\u0434\u044b\u0441\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
"\u0431\u0443\u0434\u044b\u0439\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.gregorian",
"\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
"\u0433\u0440\u044b\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.gregory",
"\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
"\u0433\u0440\u044b\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.islamic",
"\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.islamic-civil",
"\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.japanese",
"\u044f\u043f\u043e\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.roc",
"\u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440 \u041c\u0456\u043d\u044c\u0433\u043e" },
{ "field.dayperiod",
"\u0414\u041f/\u041f\u041f" },
{ "field.era",
@ -119,10 +121,12 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"\u0434\u0437\u0435\u043d\u044c \u0442\u044b\u0434\u043d\u044f" },
{ "field.year",
"\u0433\u043e\u0434" },
{ "field.zone",
"\u0447\u0430\u0441\u0430\u0432\u044b \u043f\u043e\u044f\u0441" },
{ "islamic.AmPmMarkers",
new String[] {
"\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u0434\u0430 \u043f\u0430\u045e\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u045e\u0434\u043d\u044f",
}
},
{ "islamic.DatePatterns",
@ -182,6 +186,14 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"4-\u0442\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
@ -190,6 +202,18 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"HH.mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u0440\u0430\u043d\u0456\u0446\u044b",
"\u0432\u0435\u0447\u0430\u0440\u0430",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u0440\u0430\u043d.",
"\u0432\u0435\u0447.",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
@ -216,8 +240,8 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
},
{ "java.time.long.Eras",
new String[] {
"\u0434\u0430 \u043d.\u044d.",
"\u043d.\u044d.",
"\u0434\u0430 \u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b",
"\u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b",
}
},
{ "java.time.roc.DatePatterns",
@ -236,8 +260,8 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
},
{ "roc.AmPmMarkers",
new String[] {
"\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u0434\u0430 \u043f\u0430\u045e\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u045e\u0434\u043d\u044f",
}
},
{ "roc.DatePatterns",
@ -356,6 +380,18 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"HH.mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u0440\u0430\u043d\u0456\u0446\u044b",
"\u0432\u0435\u0447\u0430\u0440\u0430",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u0440\u0430\u043d.",
"\u0432\u0435\u0447.",
}
},
};
}
}

32
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -219,6 +219,12 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
@ -318,18 +324,18 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
},
{ "roc.MonthAbbreviations",
new String[] {
"\u044f\u043d.",
"\u0444\u0435\u0432\u0440.",
"\u044f\u043d\u0443",
"\u0444\u0435\u0432",
"\u043c\u0430\u0440\u0442",
"\u0430\u043f\u0440.",
"\u0430\u043f\u0440",
"\u043c\u0430\u0439",
"\u044e\u043d\u0438",
"\u044e\u043b\u0438",
"\u0430\u0432\u0433.",
"\u0441\u0435\u043f\u0442.",
"\u043e\u043a\u0442.",
"\u043d\u043e\u0435\u043c.",
"\u0434\u0435\u043a.",
"\u0430\u0432\u0433",
"\u0441\u0435\u043f",
"\u043e\u043a\u0442",
"\u043d\u043e\u0435",
"\u0434\u0435\u043a",
"",
}
},
@ -391,6 +397,12 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",

38
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -122,7 +122,7 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
{ "field.year",
"any" },
{ "field.zone",
"zona" },
"fus horari" },
{ "islamic.AmPmMarkers",
new String[] {
"a. m.",
@ -133,8 +133,8 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
new String[] {
"EEEE d MMMM 'de' y GGGG",
"d MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/yy G",
"d/M/y GGGG",
"d/M/yy G",
}
},
{ "islamic.DayAbbreviations",
@ -202,10 +202,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"a. m.",
"p. m.",
}
},
{ "java.time.buddhist.DatePatterns",
@ -232,16 +238,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
new String[] {
"EEEE d MMMM 'de' y G",
"d MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
"d/M/y G",
"d/M/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y G",
"d MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
"d/M/y G",
"d/M/yy GGGGG",
}
},
{ "java.time.long.Eras",
@ -386,10 +392,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"a. m.",
"p. m.",
}
},
};

44
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -96,29 +96,29 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
{ "calendarname.roc",
"Kalend\u00e1\u0159 \u010c\u00ednsk\u00e9 republiky" },
{ "field.dayperiod",
"dop./odp." },
"\u010d\u00e1st dne" },
{ "field.era",
"Letopo\u010det" },
"letopo\u010det" },
{ "field.hour",
"Hodina" },
"hodina" },
{ "field.minute",
"Minuta" },
"minuta" },
{ "field.month",
"M\u011bs\u00edc" },
"m\u011bs\u00edc" },
{ "field.second",
"Sekunda" },
"sekunda" },
{ "field.week",
"T\u00fdden" },
"t\u00fdden" },
{ "field.weekday",
"Den v t\u00fddnu" },
"den v t\u00fddnu" },
{ "field.year",
"Rok" },
"rok" },
{ "field.zone",
"\u010casov\u00e9 p\u00e1smo" },
"\u010dasov\u00e9 p\u00e1smo" },
{ "islamic.AmPmMarkers",
new String[] {
"dopoledne",
"odpoledne",
"dop.",
"odp.",
}
},
{ "islamic.DatePatterns",
@ -200,6 +200,12 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"dop.",
"odp.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -282,8 +288,8 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
},
{ "roc.AmPmMarkers",
new String[] {
"dopoledne",
"odpoledne",
"dop.",
"odp.",
}
},
{ "roc.DatePatterns",
@ -408,6 +414,12 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"dop.",
"odp.",
}
},
{ "roc.long.Eras",
new String[] {
"P\u0159ed R. O. C.",

46
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -112,23 +112,29 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"\u00c6ra" },
"\u00e6ra" },
{ "field.hour",
"Time" },
"time" },
{ "field.minute",
"Minut" },
"minut" },
{ "field.month",
"M\u00e5ned" },
"m\u00e5ned" },
{ "field.second",
"Sekund" },
"sekund" },
{ "field.week",
"Uge" },
"uge" },
{ "field.weekday",
"Ugedag" },
"ugedag" },
{ "field.year",
"\u00c5r" },
"\u00e5r" },
{ "field.zone",
"Tidszone" },
"tidszone" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
@ -214,6 +220,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -274,6 +286,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
},
{ "java.time.short.Eras",
javatimelongEras },
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
@ -402,6 +420,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"Minguo",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -204,6 +204,12 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"vorm.",
"nachm.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -404,6 +410,12 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"vorm.",
"nachm.",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",

42
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -106,23 +106,23 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
{ "field.dayperiod",
"\u03c0.\u03bc./\u03bc.\u03bc." },
{ "field.era",
"\u03a0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" },
"\u03c0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" },
{ "field.hour",
"\u038f\u03c1\u03b1" },
"\u03ce\u03c1\u03b1" },
{ "field.minute",
"\u039b\u03b5\u03c0\u03c4\u03cc" },
"\u03bb\u03b5\u03c0\u03c4\u03cc" },
{ "field.month",
"\u039c\u03ae\u03bd\u03b1\u03c2" },
"\u03bc\u03ae\u03bd\u03b1\u03c2" },
{ "field.second",
"\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" },
"\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" },
{ "field.week",
"\u0395\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" },
"\u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" },
{ "field.weekday",
"\u0397\u03bc\u03ad\u03c1\u03b1 \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1\u03c2" },
"\u03ba\u03b1\u03b8\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae" },
{ "field.year",
"\u0388\u03c4\u03bf\u03c2" },
"\u03ad\u03c4\u03bf\u03c2" },
{ "field.zone",
"\u0396\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" },
"\u03b6\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" },
{ "islamic.AmPmMarkers",
new String[] {
"\u03c0.\u03bc.",
@ -202,10 +202,16 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"h:mm a",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u03c0.\u03bc.",
"\u03bc.\u03bc.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u03c0",
"\u03bc",
"\u03c0\u03bc",
"\u03bc\u03bc",
}
},
{ "java.time.buddhist.DatePatterns",
@ -392,6 +398,12 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"h:mm a",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u03c0.\u03bc.",
"\u03bc.\u03bc.",
}
},
{ "roc.long.Eras",
new String[] {
"\u03a0\u03c1\u03b9\u03bd R.O.C.",
@ -400,8 +412,8 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u03c0",
"\u03bc",
"\u03c0\u03bc",
"\u03bc\u03bc",
}
},
{ "roc.narrow.Eras",

132
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -73,52 +73,120 @@ public class JavaTimeSupplementary_en_AU extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
{ "field.dayperiod",
"am/pm" },
{ "islamic.AmPmMarkers",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/MM/y G",
"am",
"pm",
}
},
{ "java.time.buddhist.DatePatterns",
{ "islamic.DayAbbreviations",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
"Sun.",
"Mon.",
"Tue.",
"Wed.",
"Thu.",
"Fri.",
"Sat.",
}
},
{ "java.time.islamic.DatePatterns",
{ "islamic.DayNarrows",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
"Su.",
"M.",
"Tu.",
"W.",
"Th.",
"F.",
"Sa.",
}
},
{ "java.time.japanese.DatePatterns",
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"d/MM/y GGGGG",
"am",
"pm",
}
},
{ "java.time.roc.DatePatterns",
{ "islamic.narrow.AmPmMarkers",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
"am",
"pm",
}
},
{ "roc.DatePatterns",
{ "roc.AmPmMarkers",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/MM/y G",
"am",
"pm",
}
},
{ "roc.DayAbbreviations",
new String[] {
"Sun.",
"Mon.",
"Tue.",
"Wed.",
"Thu.",
"Fri.",
"Sat.",
}
},
{ "roc.DayNarrows",
new String[] {
"Su.",
"M.",
"Tu.",
"W.",
"Th.",
"F.",
"Sa.",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan.",
"Feb.",
"Mar.",
"Apr.",
"May",
"Jun.",
"Jul.",
"Aug.",
"Sep.",
"Oct.",
"Nov.",
"Dec.",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"Jan.",
"Feb.",
"Mar.",
"Apr.",
"May",
"Jun.",
"Jul.",
"Aug.",
"Sep.",
"Oct.",
"Nov.",
"Dec.",
"",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"am",
"pm",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"am",
"pm",
}
},
};

38
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -74,11 +74,11 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
protected final Object[][] getContents() {
return new Object[][] {
{ "field.dayperiod",
"a.m./p.m." },
"am/pm" },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"am",
"pm",
}
},
{ "islamic.TimePatterns",
@ -89,10 +89,22 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"am",
"pm",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"am",
"pm",
}
},
{ "roc.TimePatterns",
@ -103,6 +115,18 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"am",
"pm",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

20
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -87,6 +87,14 @@ public class JavaTimeSupplementary_en_IE extends OpenListResourceBundle {
"G y-MM-dd",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d MMMM y G",
@ -133,6 +141,14 @@ public class JavaTimeSupplementary_en_IE extends OpenListResourceBundle {
"G y-MM-dd",
}
},
{ "roc.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
};
}
}

18
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java
View File

@ -26,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -81,6 +81,14 @@ public class JavaTimeSupplementary_en_MT extends OpenListResourceBundle {
"G y-MM-dd",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
@ -121,6 +129,14 @@ public class JavaTimeSupplementary_en_MT extends OpenListResourceBundle {
"G y-MM-dd",
}
},
{ "roc.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
};
}
}

70
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -105,22 +105,24 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"calendario de la Rep\u00fablica de China" },
{ "field.dayperiod",
"a. m./p. m." },
{ "field.era",
"era" },
{ "field.hour",
"Hora" },
"hora" },
{ "field.minute",
"Minuto" },
"minuto" },
{ "field.month",
"Mes" },
"mes" },
{ "field.second",
"Segundo" },
"segundo" },
{ "field.week",
"Semana" },
"semana" },
{ "field.weekday",
"D\u00eda de la semana" },
"d\u00eda de la semana" },
{ "field.year",
"A\u00f1o" },
"a\u00f1o" },
{ "field.zone",
"Zona horaria" },
"zona horaria" },
{ "islamic.AmPmMarkers",
new String[] {
"a. m.",
@ -131,8 +133,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
"d 'de' MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/yy G",
"d/M/y GGGG",
"d/M/yy GGGG",
}
},
{ "islamic.DayAbbreviations",
@ -190,6 +192,14 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"4.\u00ba trimestre",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss (zzzz)",
@ -198,6 +208,12 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -206,8 +222,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"a. m.",
"p. m.",
}
},
{ "islamic.narrow.Eras",
@ -226,8 +242,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
"d/M/y G",
"d/M/yy G",
}
},
{ "java.time.buddhist.long.Eras",
@ -246,8 +262,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
"d/M/y G",
"d/M/yy G",
}
},
{ "java.time.japanese.DatePatterns",
@ -268,8 +284,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
"d/M/y G",
"d/M/yy G",
}
},
{ "java.time.short.Eras",
@ -288,8 +304,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
"d 'de' MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/yy G",
"d/M/y GGGG",
"d/M/yy GGGG",
}
},
{ "roc.DayAbbreviations",
@ -406,6 +422,12 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "roc.long.Eras",
new String[] {
"antes de R.O.C.",
@ -414,8 +436,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
"a. m.",
"p. m.",
}
},
{ "roc.narrow.Eras",

28
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -73,6 +73,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterNames",
new String[] {
"1.\u00b0 trimestre",
"2.\u00b0 trimestre",
"3.\u00b0 trimestre",
"4.\u00ba trimestre",
}
},
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
@ -81,6 +89,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
"dd-MM-y G",
}
},
{ "islamic.QuarterNames",
new String[] {
"1.\u00b0 trimestre",
"2.\u00b0 trimestre",
"3.\u00b0 trimestre",
"4.\u00ba trimestre",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
@ -121,6 +137,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
"dd-MM-y G",
}
},
{ "roc.QuarterNames",
new String[] {
"1.\u00b0 trimestre",
"2.\u00b0 trimestre",
"3.\u00b0 trimestre",
"4.\u00ba trimestre",
}
},
};
}
}

42
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -81,10 +81,23 @@ public class JavaTimeSupplementary_es_CO extends OpenListResourceBundle {
"d/MM/yy G",
}
},
{ "islamic.narrow.AmPmMarkers",
{ "islamic.DayNarrows",
new String[] {
"a. m.",
"p. m.",
"d",
"l",
"m",
"m",
"j",
"v",
"s",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "java.time.buddhist.DatePatterns",
@ -127,10 +140,23 @@ public class JavaTimeSupplementary_es_CO extends OpenListResourceBundle {
"d/MM/yy G",
}
},
{ "roc.narrow.AmPmMarkers",
{ "roc.DayNarrows",
new String[] {
"a. m.",
"p. m.",
"d",
"l",
"m",
"m",
"j",
"v",
"s",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
};

172
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java Normal file
View File

@ -0,0 +1,172 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2016 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) 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,
* 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.
*
* 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.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_DO extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "field.era",
"Era" },
{ "field.minute",
"Minuto" },
{ "field.month",
"Mes" },
{ "field.second",
"Segundo" },
{ "field.week",
"Semana" },
{ "field.weekday",
"D\u00eda de la semana" },
{ "field.year",
"A\u00f1o" },
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"dd/MM/y GGGG",
"G y-MM-dd",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd/MM/y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd/MM/y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd/MM/y G",
"GGGGG y-MM-dd",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"dd/MM/y GGGG",
"G y-MM-dd",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
};
}
}

20
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -103,16 +103,6 @@ public class JavaTimeSupplementary_es_MX extends OpenListResourceBundle {
"Calendario gregoriano" },
{ "calendarname.roc",
"calendario minguo" },
{ "field.dayperiod",
"a.m./p.m." },
{ "field.era",
"era" },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
@ -188,12 +178,6 @@ public class JavaTimeSupplementary_es_MX extends OpenListResourceBundle {
"GGGGG y-MM-dd",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",

52
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -73,6 +73,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"1er. trimestre",
"2do. trimestre",
"3er. trimestre",
"4.\u00ba trimestre",
}
},
{ "QuarterNames",
new String[] {
"1er. trimestre",
"2do. trimestre",
"3er. trimestre",
"4.\u00ba trimestre",
}
},
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
@ -81,6 +97,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
"MM/dd/yy G",
}
},
{ "islamic.QuarterNames",
new String[] {
"1er. trimestre",
"2do. trimestre",
"3er. trimestre",
"4.\u00ba trimestre",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
@ -121,6 +153,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
"MM/dd/yy G",
}
},
{ "roc.QuarterNames",
new String[] {
"1er. trimestre",
"2do. trimestre",
"3er. trimestre",
"4.\u00ba trimestre",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
};
}
}

20
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -81,6 +81,14 @@ public class JavaTimeSupplementary_es_PR extends OpenListResourceBundle {
"MM/dd/yy G",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
@ -121,6 +129,14 @@ public class JavaTimeSupplementary_es_PR extends OpenListResourceBundle {
"MM/dd/yy G",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
};
}
}

124
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java Normal file
View File

@ -0,0 +1,124 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2016 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) 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,
* 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.
*
* 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.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_US extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.short.Eras",
new String[] {
"a.C.",
"d.C.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2016 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) 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,
* 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.
*
* 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.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_VE extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"1er trimestre",
"2do trimestre",
"3er trimestre",
"4to trimestre",
}
},
{ "QuarterNames",
new String[] {
"1er trimestre",
"2do trimestre",
"3er trimestre",
"4to trimestre",
}
},
{ "islamic.QuarterNames",
new String[] {
"1er trimestre",
"2do trimestre",
"3er trimestre",
"4to trimestre",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "roc.QuarterNames",
new String[] {
"1er trimestre",
"2do trimestre",
"3er trimestre",
"4to trimestre",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
};
}
}

32
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -123,6 +123,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
"aasta" },
{ "field.zone",
"ajav\u00f6\u00f6nd" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d. MMMM y GGGG",
@ -196,6 +202,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d. MMMM y G",
@ -222,8 +234,8 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
},
{ "java.time.long.Eras",
new String[] {
"enne meie aega",
"meie aja j\u00e4rgi",
"enne Kristust",
"p\u00e4rast Kristust",
}
},
{ "java.time.roc.DatePatterns",
@ -240,6 +252,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
"m.a.j.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d. MMMM y GGGG",
@ -356,6 +374,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -221,6 +221,12 @@ public class JavaTimeSupplementary_fi extends OpenListResourceBundle {
"H.mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"ap.",
"ip.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"ap.",
@ -419,6 +425,12 @@ public class JavaTimeSupplementary_fi extends OpenListResourceBundle {
"H.mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"ap.",
"ip.",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",

28
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -127,6 +127,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
"ann\u00e9e" },
{ "field.zone",
"fuseau horaire" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
@ -246,6 +252,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -306,6 +318,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
"ap. J.-C.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
@ -434,6 +452,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
"RdC",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.narrow.Eras",
new String[] {
"avant RdC",

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -81,6 +81,12 @@ public class JavaTimeSupplementary_fr_CA extends OpenListResourceBundle {
"y-MM-dd G",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d MMMM y G",
@ -121,6 +127,12 @@ public class JavaTimeSupplementary_fr_CA extends OpenListResourceBundle {
"yy-MM-dd G",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

28
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -200,6 +200,18 @@ public class JavaTimeSupplementary_ga extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d MMMM y G",
@ -366,6 +378,18 @@ public class JavaTimeSupplementary_ga extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -219,6 +219,12 @@ public class JavaTimeSupplementary_hi_IN extends OpenListResourceBundle {
"h:mm a",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u092a\u0942\u0930\u094d\u0935",
"\u0905\u092a\u0930",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u092a\u0942",
@ -409,6 +415,12 @@ public class JavaTimeSupplementary_hi_IN extends OpenListResourceBundle {
"h:mm a",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u092a\u0942\u0930\u094d\u0935",
"\u0905\u092a\u0930",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u092a\u0942",

58
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -72,10 +72,6 @@ import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
final String[] javatimelongEras = {
"Prije Krista",
"Poslije Krista",
};
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
@ -117,22 +113,30 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
"kalendar Republike Kine" },
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"era" },
{ "field.hour",
"Sat" },
"sat" },
{ "field.minute",
"Minuta" },
"minuta" },
{ "field.month",
"Mjesec" },
"mjesec" },
{ "field.second",
"Sekunda" },
"sekunda" },
{ "field.week",
"Tjedan" },
"tjedan" },
{ "field.weekday",
"Dan u tjednu" },
"dan u tjednu" },
{ "field.year",
"Godina" },
"godina" },
{ "field.zone",
"Vremenska zona" },
"vremenska zona" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d. MMMM y. GGGG",
@ -240,7 +244,7 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
new String[] {
"EEEE, d. MMMM y. G",
"d. MMMM y. G",
"d. M. y. G",
"d. MMM y. G",
"dd.MM.y. GGGGG",
}
},
@ -274,7 +278,7 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
},
{ "java.time.japanese.long.Eras",
new String[] {
"Poslije Krista",
"poslije Krista",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
@ -291,22 +295,36 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
}
},
{ "java.time.long.Eras",
javatimelongEras },
new String[] {
"prije Krista",
"poslije Krista",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d. MMMM y. G",
"d. MMMM y. G",
"d. M. y. G",
"d. MMM y. G",
"dd.MM.y. GGGGG",
}
},
{ "java.time.short.Eras",
javatimelongEras },
new String[] {
"Prije Krista",
"Poslije Krista",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d. MMMM y. GGGG",
"d. MMMM y. GGGG",
"d. M. y. GGGG",
"d. MMM y. GGGG",
"dd.MM.y. G",
}
},

20
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -192,8 +192,8 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
new String[] {
"Moh.",
"Saf.",
"R\u00e9bi I",
"R\u00e9bi II",
"R\u00e9b. 1",
"R\u00e9b. 2",
"Dsem. I",
"Dsem. II",
"Red.",
@ -254,6 +254,12 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"de.",
"du.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -462,6 +468,12 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"de.",
"du.",
}
},
{ "roc.long.Eras",
new String[] {
"R.O.C. el\u0151tt",

495
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java Normal file
View File

@ -0,0 +1,495 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2016 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) 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,
* 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.
*
* 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.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_in extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "calendarname.buddhist",
"Kalender Buddha" },
{ "calendarname.gregorian",
"Kalender Gregorian" },
{ "calendarname.gregory",
"Kalender Gregorian" },
{ "calendarname.islamic",
"Kalender Islam" },
{ "calendarname.islamic-civil",
"Kalender Sipil Islam" },
{ "calendarname.japanese",
"Kalender Jepang" },
{ "calendarname.roc",
"Kalendar Minguo" },
{ "field.dayperiod",
"AM/PM" },
{ "field.hour",
"Jam" },
{ "field.minute",
"Menit" },
{ "field.month",
"Bulan" },
{ "field.second",
"Detik" },
{ "field.week",
"Minggu" },
{ "field.weekday",
"Hari dalam Seminggu" },
{ "field.year",
"Tahun" },
{ "field.zone",
"Zona Waktu" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"Min",
"Sen",
"Sel",
"Rab",
"Kam",
"Jum",
"Sab",
}
},
{ "islamic.DayNames",
new String[] {
"Minggu",
"Senin",
"Selasa",
"Rabu",
"Kamis",
"Jumat",
"Sabtu",
}
},
{ "islamic.DayNarrows",
new String[] {
"M",
"S",
"S",
"R",
"K",
"J",
"S",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.MonthAbbreviations",
new String[] {
"Muh.",
"Saf.",
"Rab. I",
"Rab. II",
"Jum. I",
"Jum. II",
"Raj.",
"Sha.",
"Ram.",
"Syaw.",
"Dhu\u02bbl-Q.",
"Dhu\u02bbl-H.",
"",
}
},
{ "islamic.MonthNames",
new String[] {
"Muharram",
"Safar",
"Rabi\u02bb I",
"Rabi\u02bb II",
"Jumada I",
"Jumada II",
"Rajab",
"Sya\u2019ban",
"Ramadhan",
"Syawal",
"Dhu\u02bbl-Qi\u02bbdah",
"Dhu\u02bbl-Hijjah",
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "islamic.QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.japanese.long.Eras",
new String[] {
"M",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"M",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
}
},
{ "java.time.long.Eras",
new String[] {
"Sebelum Masehi",
"M",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"BCE",
"CE",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"Min",
"Sen",
"Sel",
"Rab",
"Kam",
"Jum",
"Sab",
}
},
{ "roc.DayNames",
new String[] {
"Minggu",
"Senin",
"Selasa",
"Rabu",
"Kamis",
"Jumat",
"Sabtu",
}
},
{ "roc.DayNarrows",
new String[] {
"M",
"S",
"S",
"R",
"K",
"J",
"S",
}
},
{ "roc.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan",
"Feb",
"Mar",
"Apr",
"Mei",
"Jun",
"Jul",
"Agt",
"Sep",
"Okt",
"Nov",
"Des",
"",
}
},
{ "roc.MonthNames",
new String[] {
"Januari",
"Februari",
"Maret",
"April",
"Mei",
"Juni",
"Juli",
"Agustus",
"September",
"Oktober",
"November",
"Desember",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"J",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "roc.QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "roc.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "roc.long.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.narrow.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.short.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
};
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -202,6 +202,12 @@ public class JavaTimeSupplementary_is extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"f.h.",
"e.h.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"f.",
@ -374,6 +380,12 @@ public class JavaTimeSupplementary_is extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"f.h.",
"e.h.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"f.",

40
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -107,22 +107,30 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
"Calendario Minguo" },
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"era" },
{ "field.hour",
"Ora" },
"ora" },
{ "field.minute",
"Minuto" },
"minuto" },
{ "field.month",
"Mese" },
"mese" },
{ "field.second",
"Secondo" },
{ "field.week",
"Settimana" },
"settimana" },
{ "field.weekday",
"Giorno della settimana" },
"giorno della settimana" },
{ "field.year",
"Anno" },
"anno" },
{ "field.zone",
"Fuso orario" },
"fuso orario" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
@ -282,6 +290,12 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
"dopo Cristo",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
@ -325,7 +339,7 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
},
{ "roc.Eras",
new String[] {
"Prima della R.O.C.",
"Prima di R.O.C.",
"Minguo",
}
},
@ -406,7 +420,7 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
},
{ "roc.long.Eras",
new String[] {
"Prima della R.O.C.",
"Prima di R.O.C.",
"Minguo",
}
},
@ -418,13 +432,13 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
},
{ "roc.narrow.Eras",
new String[] {
"Prima della R.O.C.",
"Prima di R.O.C.",
"Minguo",
}
},
{ "roc.short.Eras",
new String[] {
"Prima della R.O.C.",
"Prima di R.O.C.",
"Minguo",
}
},

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -77,7 +77,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d-MMM-y GGGG",
"d MMM y GGGG",
"dd.MM.yy G",
}
},
@ -85,7 +85,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d-MMM-y G",
"d MMM y G",
"dd.MM.yy GGGGG",
}
},
@ -93,7 +93,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d-MMM-y G",
"d MMM y G",
"dd.MM.yy GGGGG",
}
},
@ -101,7 +101,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d-MMM-y G",
"d MMM y G",
"dd.MM.yy GGGGG",
}
},
@ -109,7 +109,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d-MMM-y G",
"d MMM y G",
"dd.MM.yy GGGGG",
}
},
@ -117,7 +117,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
new String[] {
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d-MMM-y GGGG",
"d MMM y GGGG",
"dd.MM.yy G",
}
},

374
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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-2016 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.
@ -69,7 +73,7 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterNames",
{ "QuarterAbbreviations",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
@ -77,12 +81,12 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "QuarterNarrows",
{ "QuarterNames",
new String[] {
"1",
"2",
"3",
"4",
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "calendarname.buddhist",
@ -95,14 +99,12 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9" },
{ "calendarname.islamic-civil",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
{ "calendarname.islamicc",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
{ "calendarname.japanese",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9" },
{ "calendarname.roc",
"\u05dc\u05d5\u05d7 \u05d4\u05e9\u05e0\u05d4 \u05d4\u05e1\u05d9\u05e0\u05d9 Minguo" },
{ "field.dayperiod",
"\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
{ "field.era",
"\u05ea\u05e7\u05d5\u05e4\u05d4" },
{ "field.hour",
@ -121,47 +123,327 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
"\u05e9\u05e0\u05d4" },
{ "field.zone",
"\u05d0\u05d6\u05d5\u05e8" },
{ "islamic.AmPmMarkers",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
"\u05d0\u05d7\u05d4\u05f4\u05e6",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y GGGG",
"d \u05d1MMMM y GGGG",
"d \u05d1MMM y GGGG",
"dd/MM/yy G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"\u05d9\u05d5\u05dd \u05d0\u05f3",
"\u05d9\u05d5\u05dd \u05d1\u05f3",
"\u05d9\u05d5\u05dd \u05d2\u05f3",
"\u05d9\u05d5\u05dd \u05d3\u05f3",
"\u05d9\u05d5\u05dd \u05d4\u05f3",
"\u05d9\u05d5\u05dd \u05d5\u05f3",
"\u05e9\u05d1\u05ea",
}
},
{ "islamic.DayNames",
new String[] {
"\u05d9\u05d5\u05dd \u05e8\u05d0\u05e9\u05d5\u05df",
"\u05d9\u05d5\u05dd \u05e9\u05e0\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05dc\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e8\u05d1\u05d9\u05e2\u05d9",
"\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea",
}
},
{ "islamic.DayNarrows",
new String[] {
"\u05d0\u05f3",
"\u05d1\u05f3",
"\u05d2\u05f3",
"\u05d3\u05f3",
"\u05d4\u05f3",
"\u05d5\u05f3",
"\u05e9\u05f3",
}
},
{ "islamic.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "islamic.MonthAbbreviations",
new String[] {
"\u05de\u05d5\u05d7\u05e8\u05dd",
"\u05e6\u05e4\u05e8",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05f3",
"\u05e8\u05d1\u05d9\u05e2 \u05d1\u05f3",
"\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0\u05f3",
"\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d1\u05f3",
"\u05e8\u05d2\u05f3\u05d1",
"\u05e9\u05e2\u05d1\u05d0\u05df",
"\u05e8\u05de\u05d3\u05d0\u05df",
"\u05e9\u05d5\u05d5\u05d0\u05dc",
"\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05e7\u05e2\u05d3\u05d4",
"\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05d7\u05d9\u05d2\u05f3\u05d4",
"",
}
},
{ "islamic.MonthNames",
new String[] {
"\u05de\u05d5\u05d7\u05e8\u05dd",
"\u05e1\u05e4\u05e8",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9",
"\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
"\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9",
"\u05e8\u05d2\u05f3\u05d0\u05d1",
"\u05e6\u05e4\u05e8",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05dc",
"\u05e8\u05d1\u05d9\u05e2 \u05d0-\u05ea\u05f3\u05d0\u05e0\u05d9",
"\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0\u05dc-\u05d0\u05d5\u05dc\u05d0",
"\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0-\u05ea\u05f3\u05d0\u05e0\u05d9\u05d4",
"\u05e8\u05d2\u05f3\u05d1",
"\u05e9\u05e2\u05d1\u05d0\u05df",
"\u05e8\u05d0\u05de\u05d3\u05df",
"\u05e8\u05de\u05d3\u05d0\u05df",
"\u05e9\u05d5\u05d5\u05d0\u05dc",
"\u05d6\u05d5 \u05d0\u05dc-QI'DAH",
"\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4",
"\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05e7\u05e2\u05d3\u05d4",
"\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05d7\u05d9\u05d2\u05f3\u05d4",
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "islamic.QuarterNames",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
"\u05d0\u05d7\u05d4\u05f4\u05e6",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y G",
"d \u05d1MMMM y G",
"d \u05d1MMM y G",
"d.M.y GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y G",
"d \u05d1MMMM y G",
"d \u05d1MMM y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y G",
"d \u05d1MMMM y G",
"d \u05d1MMM y G",
"d.M.y GGGGG",
}
},
{ "java.time.long.Eras",
new String[] {
"\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
"\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y G",
"d \u05d1MMMM y G",
"d \u05d1MMM y G",
"d.M.y GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"\u05dc\u05e1\u05d4\"\u05e0",
"\u05dc\u05e4\u05e1\u05d4\"\u05e0",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
"\u05d0\u05d7\u05d4\u05f4\u05e6",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d \u05d1MMMM y GGGG",
"d \u05d1MMMM y GGGG",
"d \u05d1MMM y GGGG",
"d.M.y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"\u05d9\u05d5\u05dd \u05d0\u05f3",
"\u05d9\u05d5\u05dd \u05d1\u05f3",
"\u05d9\u05d5\u05dd \u05d2\u05f3",
"\u05d9\u05d5\u05dd \u05d3\u05f3",
"\u05d9\u05d5\u05dd \u05d4\u05f3",
"\u05d9\u05d5\u05dd \u05d5\u05f3",
"\u05e9\u05d1\u05ea",
}
},
{ "roc.DayNames",
new String[] {
"\u05d9\u05d5\u05dd \u05e8\u05d0\u05e9\u05d5\u05df",
"\u05d9\u05d5\u05dd \u05e9\u05e0\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05dc\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e8\u05d1\u05d9\u05e2\u05d9",
"\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
"\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea",
}
},
{ "roc.DayNarrows",
new String[] {
"\u05d0\u05f3",
"\u05d1\u05f3",
"\u05d2\u05f3",
"\u05d3\u05f3",
"\u05d4\u05f3",
"\u05d5\u05f3",
"\u05e9\u05f3",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"\u05d9\u05e0\u05d5\u05f3",
"\u05e4\u05d1\u05e8\u05f3",
"\u05de\u05e8\u05e5",
"\u05d0\u05e4\u05e8\u05f3",
"\u05de\u05d0\u05d9",
"\u05d9\u05d5\u05e0\u05d9",
"\u05d9\u05d5\u05dc\u05d9",
"\u05d0\u05d5\u05d2\u05f3",
"\u05e1\u05e4\u05d8\u05f3",
"\u05d0\u05d5\u05e7\u05f3",
"\u05e0\u05d5\u05d1\u05f3",
"\u05d3\u05e6\u05de\u05f3",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u05d9\u05e0\u05d5\u05d0\u05e8",
"\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8",
"\u05de\u05e8\u05e5",
"\u05d0\u05e4\u05e8\u05d9\u05dc",
"\u05de\u05d0\u05d9",
"\u05d9\u05d5\u05e0\u05d9",
"\u05d9\u05d5\u05dc\u05d9",
"\u05d0\u05d5\u05d2\u05d5\u05e1\u05d8",
"\u05e1\u05e4\u05d8\u05de\u05d1\u05e8",
"\u05d0\u05d5\u05e7\u05d8\u05d5\u05d1\u05e8",
"\u05e0\u05d5\u05d1\u05de\u05d1\u05e8",
"\u05d3\u05e6\u05de\u05d1\u05e8",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "roc.QuarterNames",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "roc.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
"\u05d0\u05d7\u05d4\u05f4\u05e6",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
"\u05d0\u05d7\u05d4\u05f4\u05e6",
}
},
};
}
}

167
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw_IL.java
View File

@ -1,167 +0,0 @@
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* 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.
*
* 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.
*
* 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.
*
* 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.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_iw_IL extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterNames",
new String[] {
"\u05e8\u05d1\u05e2\u05d5\u05df 1",
"\u05e8\u05d1\u05e2\u05d5\u05df 2",
"\u05e8\u05d1\u05e2\u05d5\u05df 3",
"\u05e8\u05d1\u05e2\u05d5\u05df 4",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d1\u05d5\u05d3\u05d4\u05d9\u05e1\u05d8\u05d9" },
{ "calendarname.gregorian",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
{ "calendarname.gregory",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
{ "calendarname.islamic",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9" },
{ "calendarname.islamic-civil",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
{ "calendarname.islamicc",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
{ "calendarname.japanese",
"\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9" },
{ "calendarname.roc",
"\u05dc\u05d5\u05d7 \u05d4\u05e9\u05e0\u05d4 \u05d4\u05e1\u05d9\u05e0\u05d9 Minguo" },
{ "field.dayperiod",
"\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
{ "field.era",
"\u05ea\u05e7\u05d5\u05e4\u05d4" },
{ "field.hour",
"\u05e9\u05e2\u05d4" },
{ "field.minute",
"\u05d3\u05e7\u05d4" },
{ "field.month",
"\u05d7\u05d5\u05d3\u05e9" },
{ "field.second",
"\u05e9\u05e0\u05d9\u05d9\u05d4" },
{ "field.week",
"\u05e9\u05d1\u05d5\u05e2" },
{ "field.weekday",
"\u05d9\u05d5\u05dd \u05d1\u05e9\u05d1\u05d5\u05e2" },
{ "field.year",
"\u05e9\u05e0\u05d4" },
{ "field.zone",
"\u05d0\u05d6\u05d5\u05e8" },
{ "islamic.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "islamic.MonthNames",
new String[] {
"\u05de\u05d5\u05d7\u05e8\u05dd",
"\u05e1\u05e4\u05e8",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
"\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9",
"\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
"\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9",
"\u05e8\u05d2\u05f3\u05d0\u05d1",
"\u05e9\u05e2\u05d1\u05d0\u05df",
"\u05e8\u05d0\u05de\u05d3\u05df",
"\u05e9\u05d5\u05d5\u05d0\u05dc",
"\u05d6\u05d5 \u05d0\u05dc-QI'DAH",
"\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4",
"",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
}
},
{ "java.time.long.Eras",
new String[] {
"\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
"\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4",
}
},
{ "java.time.short.Eras",
new String[] {
"\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1",
"\u05dc\u05e1\u05d4\u05f4\u05e0",
}
},
};
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -240,6 +240,12 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u5348\u524d",
"\u5348\u5f8c",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -458,6 +464,12 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u5348\u524d",
"\u5348\u5f8c",
}
},
{ "roc.long.Eras",
new String[] {
"\u6c11\u56fd\u524d",

29
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -184,6 +184,23 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
"AH",
}
},
{ "islamic.MonthNames",
new String[] {
"\ubb34\ud558\ub78c",
"\uc0ac\ud30c\ub974",
"\ub77c\ube44 \uc54c \uc544\uc648",
"\ub77c\ube44 \uc54c \uc384\ub2c8",
"\uc8fc\ub9c8\ub2e4 \uc54c \uc544\uc648",
"\uc8fc\ub9c8\ub2e4 \uc54c \uc384\ub2c8",
"\ub77c\uc7a1",
"\uc250\uc544\ubc18",
"\ub77c\ub9c8\ub2e8",
"\uc250\uc648",
"\ub4c0 \uc54c \uae4c\ub2e4",
"\ub4c0 \uc54c \ud788\uc790",
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1\ubd84\uae30",
@ -224,8 +241,8 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\uc624\uc804",
"\uc624\ud6c4",
"AM",
"PM",
}
},
{ "islamic.narrow.Eras",
@ -434,8 +451,8 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\uc624\uc804",
"\uc624\ud6c4",
"AM",
"PM",
}
},
{ "roc.narrow.Eras",

40
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -106,23 +106,25 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
{ "calendarname.roc",
"Kinijos Respublikos kalendorius" },
{ "field.dayperiod",
"Iki piet\u0173 / po piet\u0173" },
"iki piet\u0173 / po piet\u0173" },
{ "field.era",
"era" },
{ "field.hour",
"Valanda" },
"valanda" },
{ "field.minute",
"Minut\u0117" },
"minut\u0117" },
{ "field.month",
"M\u0117nuo" },
"m\u0117nuo" },
{ "field.second",
"Sekund\u0117" },
"sekund\u0117" },
{ "field.week",
"Savait\u0117" },
"savait\u0117" },
{ "field.weekday",
"Savait\u0117s diena" },
"savait\u0117s diena" },
{ "field.year",
"Metai" },
"metai" },
{ "field.zone",
"Laiko juosta" },
"laiko juosta" },
{ "islamic.AmPmMarkers",
new String[] {
"prie\u0161piet",
@ -208,6 +210,12 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"prie\u0161piet",
"popiet",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -216,7 +224,7 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"pr.p.",
"pr. p.",
"pop.",
}
},
@ -434,6 +442,12 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"prie\u0161piet",
"popiet",
}
},
{ "roc.long.Eras",
new String[] {
"Prie\u0161 R.O.C.",
@ -442,7 +456,7 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"pr.p.",
"pr. p.",
"pop.",
}
},

32
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -112,25 +112,25 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
{ "calendarname.roc",
"\u0136\u012bnas Republikas kalend\u0101rs" },
{ "field.dayperiod",
"Priek\u0161pusdien\u0101/p\u0113cpusdien\u0101" },
"priek\u0161pusdien\u0101/p\u0113cpusdien\u0101" },
{ "field.era",
"\u0112ra" },
"\u0113ra" },
{ "field.hour",
"Stundas" },
"stundas" },
{ "field.minute",
"Min\u016btes" },
"min\u016btes" },
{ "field.month",
"M\u0113nesis" },
"m\u0113nesis" },
{ "field.second",
"Sekundes" },
"sekundes" },
{ "field.week",
"ned\u0113\u013ca" },
{ "field.weekday",
"ned\u0113\u013cas diena" },
{ "field.year",
"Gads" },
"gads" },
{ "field.zone",
"Laika josla" },
"laika josla" },
{ "islamic.AmPmMarkers",
new String[] {
"priek\u0161pusdien\u0101",
@ -227,6 +227,12 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"priek\u0161p.",
"p\u0113cp.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"priek\u0161p.",
@ -407,6 +413,12 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"priek\u0161p.",
"p\u0113cp.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"priek\u0161p.",

34
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -102,27 +102,27 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
{ "calendarname.japanese",
"\u0408\u0430\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.roc",
"\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u043d\u0430" },
"\u041c\u0438\u043d\u0433\u0443\u043e-\u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "field.dayperiod",
"\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435/\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435" },
{ "field.era",
"\u0415\u0440\u0430" },
"\u0435\u0440\u0430" },
{ "field.hour",
"\u0427\u0430\u0441" },
"\u0447\u0430\u0441" },
{ "field.minute",
"\u041c\u0438\u043d\u0443\u0442\u0430" },
"\u043c\u0438\u043d\u0443\u0442\u0430" },
{ "field.month",
"\u041c\u0435\u0441\u0435\u0446" },
"\u043c\u0435\u0441\u0435\u0446" },
{ "field.second",
"\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
"\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
{ "field.week",
"\u041d\u0435\u0434\u0435\u043b\u0430" },
"\u043d\u0435\u0434\u0435\u043b\u0430" },
{ "field.weekday",
"\u0414\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" },
"\u0434\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" },
{ "field.year",
"\u0433\u043e\u0434\u0438\u043d\u0430" },
{ "field.zone",
"\u0437\u043e\u043d\u0430" },
"\u0432\u0440\u0435\u043c\u0435\u043d\u0441\u043a\u0430 \u0437\u043e\u043d\u0430" },
{ "islamic.AmPmMarkers",
new String[] {
"\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
@ -202,6 +202,12 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
"\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440\u0435\u0442.",
@ -374,6 +380,12 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
"\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440\u0435\u0442.",

28
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -206,12 +206,24 @@ public class JavaTimeSupplementary_ms extends OpenListResourceBundle {
"h:mm a",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"PG",
"PTG",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -402,6 +414,18 @@ public class JavaTimeSupplementary_ms extends OpenListResourceBundle {
"h:mm a",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"PG",
"PTG",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
};
}
}

16
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -119,6 +119,12 @@ public class JavaTimeSupplementary_mt extends OpenListResourceBundle {
"Sena" },
{ "field.zone",
"\u017bona" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d 'ta'\u2019 MMMM y GGGG",
@ -228,6 +234,12 @@ public class JavaTimeSupplementary_mt extends OpenListResourceBundle {
"WK",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d 'ta'\u2019 MMMM y GGGG",

58
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -108,19 +108,23 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
{ "field.dayperiod",
"a.m./p.m." },
{ "field.era",
"Tijdperk" },
"tijdperk" },
{ "field.hour",
"Uur" },
{ "field.minute",
"Minuut" },
"minuut" },
{ "field.month",
"Maand" },
"maand" },
{ "field.second",
"Seconde" },
"seconde" },
{ "field.week",
"week" },
{ "field.weekday",
"Dag van de week" },
"dag van de week" },
{ "field.year",
"Jaar" },
"jaar" },
{ "field.zone",
"tijdzone" },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
@ -240,6 +244,12 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -300,6 +310,24 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
"dd-MM-yy GGGGG",
}
},
{ "java.time.japanese.long.Eras",
new String[] {
"na Christus",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"n.Chr.",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
}
},
{ "java.time.long.Eras",
new String[] {
"voor Christus",
@ -369,7 +397,7 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
},
{ "roc.Eras",
new String[] {
"Before R.O.C.",
"voor R.O.C.",
"Minguo",
}
},
@ -448,9 +476,15 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"voor R.O.C.",
"Minguo",
}
},
@ -462,13 +496,13 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"voor R.O.C.",
"Minguo",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",
"voor R.O.C.",
"Minguo",
}
},

128
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -89,6 +89,14 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"4. kvartal",
}
},
{ "QuarterNarrows",
new String[] {
"1.",
"2.",
"3.",
"4.",
}
},
{ "calendarname.buddhist",
"buddhistisk kalender" },
{ "calendarname.gregorian",
@ -98,7 +106,7 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
{ "calendarname.islamic",
"islamsk kalender" },
{ "calendarname.islamic-civil",
"islamsk sivil kalender" },
"islamsk kalender (tabell, sivil)" },
{ "calendarname.islamic-umalqura",
"islamsk kalender (Umm al-Qura)" },
{ "calendarname.japanese",
@ -108,23 +116,23 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"Tidsalder" },
"tidsalder" },
{ "field.hour",
"Time" },
"time" },
{ "field.minute",
"Minutt" },
"minutt" },
{ "field.month",
"M\u00e5ned" },
"m\u00e5ned" },
{ "field.second",
"Sekund" },
"sekund" },
{ "field.week",
"Uke" },
"uke" },
{ "field.weekday",
"Ukedag" },
"ukedag" },
{ "field.year",
"\u00c5r" },
"\u00e5r" },
{ "field.zone",
"Tidssone" },
"tidssone" },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
@ -178,6 +186,40 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"AH",
}
},
{ "islamic.MonthAbbreviations",
new String[] {
"muh.",
"saf.",
"rab. I",
"rab. II",
"jum. I",
"jum. II",
"raj.",
"sha.",
"ram.",
"shaw.",
"dhu\u02bbl-q.",
"dhu\u02bbl-h.",
"",
}
},
{ "islamic.MonthNames",
new String[] {
"muharram",
"safar",
"rabi\u02bb I",
"rabi\u02bb II",
"jumada I",
"jumada II",
"rajab",
"sha\u02bbban",
"ramadan",
"shawwal",
"dhu\u02bbl-qi\u02bbdah",
"dhu\u02bbl-hijjah",
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"K1",
@ -196,10 +238,10 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
"1.",
"2.",
"3.",
"4.",
}
},
{ "islamic.TimePatterns",
@ -210,12 +252,24 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"HH.mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -264,10 +318,28 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"d.M y G",
}
},
{ "java.time.japanese.long.Eras",
new String[] {
"etter Kristus",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"e.Kr.",
"M",
"T",
"S",
"H",
}
},
{ "java.time.long.Eras",
new String[] {
"f.Kr.",
"e.Kr.",
"f\u00f8r Kristus",
"etter Kristus",
}
},
{ "java.time.roc.DatePatterns",
@ -404,6 +476,14 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"4. kvartal",
}
},
{ "roc.QuarterNarrows",
new String[] {
"1.",
"2.",
"3.",
"4.",
}
},
{ "roc.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
@ -412,12 +492,24 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"HH.mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",

28
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -129,6 +129,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
"rok" },
{ "field.zone",
"strefa czasowa" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y GGGG",
@ -236,6 +242,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
@ -284,6 +296,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
},
{ "java.time.short.Eras",
javatimelongEras },
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM y GGGG",
@ -412,6 +430,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
"ROC",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Przed ROC",

50
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -105,22 +105,30 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
"Calend\u00e1rio da Rep\u00fablica da China" },
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"era" },
{ "field.hour",
"Hora" },
"hora" },
{ "field.minute",
"Minuto" },
"minuto" },
{ "field.month",
"M\u00eas" },
"m\u00eas" },
{ "field.second",
"Segundo" },
"segundo" },
{ "field.week",
"Semana" },
"semana" },
{ "field.weekday",
"Dia da semana" },
"dia da semana" },
{ "field.year",
"Ano" },
"ano" },
{ "field.zone",
"Fuso hor\u00e1rio" },
"fuso hor\u00e1rio" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
@ -206,6 +214,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
@ -256,8 +270,8 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
},
{ "java.time.long.Eras",
new String[] {
"Antes de Cristo",
"Ano do Senhor",
"antes de Cristo",
"depois de Cristo",
}
},
{ "java.time.roc.DatePatterns",
@ -274,6 +288,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
"d.C.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
@ -402,6 +422,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
"R.O.C.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Antes de R.O.C.",

56
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -109,10 +109,21 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d 'de' MMM, y GGGG",
"GGGG y MMM d",
"d/M/y GGGG",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"domingo",
"segunda",
"ter\u00e7a",
"quarta",
"quinta",
"sexta",
"s\u00e1bado",
}
},
{ "islamic.QuarterNames",
new String[] {
"1.\u00ba trimestre",
@ -121,6 +132,12 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
"4.\u00ba trimestre",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a.m.",
@ -131,7 +148,7 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d 'de' MMM, y G",
"G y MMM d",
"d/M/y G",
}
},
@ -139,7 +156,7 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d 'de' MMM, y G",
"G y MMM d",
"d/M/y G",
}
},
@ -147,21 +164,15 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"d 'de' MMM, y G",
"dd/MM/y G",
"d/M/y G",
}
},
{ "java.time.long.Eras",
new String[] {
"antes de Cristo",
"depois de Cristo",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d 'de' MMM, y G",
"G y MMM d",
"d/M/y G",
}
},
@ -175,10 +186,21 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d 'de' MMM, y GGGG",
"GGGG y MMM d",
"d/M/y GGGG",
}
},
{ "roc.DayAbbreviations",
new String[] {
"domingo",
"segunda",
"ter\u00e7a",
"quarta",
"quinta",
"sexta",
"s\u00e1bado",
}
},
{ "roc.QuarterNames",
new String[] {
"1.\u00ba trimestre",
@ -187,6 +209,12 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
"4.\u00ba trimestre",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",

44
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -139,13 +139,13 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
},
{ "islamic.DayAbbreviations",
new String[] {
"Dum",
"Lun",
"Mar",
"Mie",
"Joi",
"Vin",
"S\u00e2m",
"dum.",
"lun.",
"mar.",
"mie.",
"joi",
"vin.",
"s\u00e2m.",
}
},
{ "islamic.DayNames",
@ -208,6 +208,12 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
"HH:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.long.Eras",
new String[] {
"",
@ -304,13 +310,13 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
},
{ "roc.DayAbbreviations",
new String[] {
"Dum",
"Lun",
"Mar",
"Mie",
"Joi",
"Vin",
"S\u00e2m",
"dum.",
"lun.",
"mar.",
"mie.",
"joi",
"vin.",
"s\u00e2m.",
}
},
{ "roc.DayNames",
@ -410,6 +416,12 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
"HH:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",

66
jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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,7 +26,7 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
@ -108,23 +108,29 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
{ "field.dayperiod",
"\u0414\u041f/\u041f\u041f" },
{ "field.era",
"\u042d\u0440\u0430" },
"\u044d\u0440\u0430" },
{ "field.hour",
"\u0427\u0430\u0441" },
"\u0447\u0430\u0441" },
{ "field.minute",
"\u041c\u0438\u043d\u0443\u0442\u0430" },
"\u043c\u0438\u043d\u0443\u0442\u0430" },
{ "field.month",
"\u041c\u0435\u0441\u044f\u0446" },
"\u043c\u0435\u0441\u044f\u0446" },
{ "field.second",
"\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
"\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
{ "field.week",
"\u041d\u0435\u0434\u0435\u043b\u044f" },
"\u043d\u0435\u0434\u0435\u043b\u044f" },
{ "field.weekday",
"\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" },
"\u0434\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" },
{ "field.year",
"\u0413\u043e\u0434" },
"\u0433\u043e\u0434" },
{ "field.zone",
"\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" },
"\u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" },
{ "islamic.AmPmMarkers",
new String[] {
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. GGGG",
@ -232,10 +238,16 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
"H:mm",
}
},
{ "islamic.abbreviated.AmPmMarkers",
new String[] {
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "java.time.buddhist.DatePatterns",
@ -276,7 +288,7 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
},
{ "java.time.japanese.long.Eras",
new String[] {
"\u043d. \u044d.",
"\u043e\u0442 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
"\u042d\u043f\u043e\u0445\u0430 \u041c\u044d\u0439\u0434\u0437\u0438",
"\u042d\u043f\u043e\u0445\u0430 \u0422\u0430\u0439\u0441\u044c\u043e",
"\u0421\u044c\u043e\u0432\u0430",
@ -294,8 +306,8 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
},
{ "java.time.long.Eras",
new String[] {
"\u0434\u043e \u043d. \u044d.",
"\u043d. \u044d.",
"\u0434\u043e \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
"\u043e\u0442 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
}
},
{ "java.time.roc.DatePatterns",
@ -312,6 +324,12 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
"\u043d.\u044d.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. GGGG",
@ -363,11 +381,11 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
new String[] {
"\u044f\u043d\u0432.",
"\u0444\u0435\u0432\u0440.",
"\u043c\u0430\u0440\u0442\u0430",
"\u043c\u0430\u0440.",
"\u0430\u043f\u0440.",
"\u043c\u0430\u044f",
"\u0438\u044e\u043d\u044f",
"\u0438\u044e\u043b\u044f",
"\u0438\u044e\u043d.",
"\u0438\u044e\u043b.",
"\u0430\u0432\u0433.",
"\u0441\u0435\u043d\u0442.",
"\u043e\u043a\u0442.",
@ -434,6 +452,12 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
"H:mm",
}
},
{ "roc.abbreviated.AmPmMarkers",
new String[] {
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
@ -442,8 +466,8 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
"\u0414\u041f",
"\u041f\u041f",
}
},
{ "roc.narrow.Eras",

Some files were not shown because too many files have changed in this diff Show More