From d9ef16dbb6917a4fff7711b32f3dd87611560dd1 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Thu, 29 Feb 2024 08:15:46 +0000 Subject: [PATCH 01/86] 8326140: src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp ReleaseStringChars might be missing in early returns Reviewed-by: clanger, prr --- .../AccessBridgeJavaEntryPoints.cpp | 118 +++++++----------- 1 file changed, 42 insertions(+), 76 deletions(-) diff --git a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp index 5386e4afdd3..c16fd791e5b 100644 --- a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp +++ b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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 @@ -82,6 +82,22 @@ AccessBridgeJavaEntryPoints::~AccessBridgeJavaEntryPoints() { return (returnVal); \ } +#define EXCEPTION_CHECK_WITH_RELEASE(situationDescription, returnVal, js, stringBytes) \ + if (exception = jniEnv->ExceptionOccurred()) { \ + PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to GetStringLength; returning %d", situationDescription, returnVal); \ + jniEnv->ExceptionDescribe(); \ + jniEnv->ExceptionClear(); \ + jniEnv->ReleaseStringChars(js, stringBytes); \ + return (returnVal); \ + } \ + jniEnv->ReleaseStringChars(js, stringBytes); \ + if (exception = jniEnv->ExceptionOccurred()) { \ + PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to ReleaseStringChars; returning %d", situationDescription, returnVal); \ + jniEnv->ExceptionDescribe(); \ + jniEnv->ExceptionClear(); \ + return (returnVal); \ + } + #define EXCEPTION_CHECK_VOID(situationDescription) \ if (exception = jniEnv->ExceptionOccurred()) { \ PrintDebugString("[ERROR]: *** Exception occured while doing: %s", situationDescription); \ @@ -1215,9 +1231,7 @@ AccessBridgeJavaEntryPoints::getVirtualAccessibleName ( EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(name, stringBytes, nameSize - 1); length = jniEnv->GetStringLength(js); - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); jniEnv->CallVoidMethod ( accessBridgeObject, decrementReferenceMethod, js); @@ -1380,9 +1394,7 @@ AccessBridgeJavaEntryPoints::getTextAttributesInRange(const jobject accessibleCo length = jniEnv->GetStringLength(js); test_attributes.fullAttributesString[length < (sizeof(test_attributes.fullAttributesString) / sizeof(wchar_t)) ? length : (sizeof(test_attributes.fullAttributesString) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAttributesAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to CallVoidMethod()", FALSE); @@ -1735,11 +1747,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(info->name, stringBytes, (sizeof(info->name) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); info->name[length < (sizeof(info->name) / sizeof(wchar_t)) ? length : (sizeof(info->name) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleName - call to CallVoidMethod()", FALSE); @@ -1767,11 +1777,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(info->description, stringBytes, (sizeof(info->description) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); info->description[length < (sizeof(info->description) / sizeof(wchar_t)) ? length : (sizeof(info->description) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleName - call to CallVoidMethod()", FALSE); @@ -1799,11 +1807,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRole - call to GetStringChars()", FALSE); wcsncpy(info->role, stringBytes, (sizeof(info->role) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRole", FALSE, js, stringBytes); info->role[length < (sizeof(info->role) / sizeof(wchar_t)) ? length : (sizeof(info->role) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRole - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRole - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleRole - call to CallVoidMethod()", FALSE); @@ -1831,11 +1837,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to GetStringChars()", FALSE); wcsncpy(info->role_en_US, stringBytes, (sizeof(info->role_en_US) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRole_en_US", FALSE, js, stringBytes); info->role_en_US[length < (sizeof(info->role_en_US) / sizeof(wchar_t)) ? length : (sizeof(info->role_en_US) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to CallVoidMethod()", FALSE); @@ -1862,11 +1866,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleState - call to GetStringChars()", FALSE); wcsncpy(info->states, stringBytes, (sizeof(info->states) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleState", FALSE, js, stringBytes); info->states[length < (sizeof(info->states) / sizeof(wchar_t)) ? length : (sizeof(info->states) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleState - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleState - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleState - call to CallVoidMethod()", FALSE); @@ -1893,11 +1895,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleState_en_US - call to GetStringChars()", FALSE); wcsncpy(info->states_en_US, stringBytes, (sizeof(info->states_en_US) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleState_en_US", FALSE, js, stringBytes); info->states_en_US[length < (sizeof(info->states_en_US) / sizeof(wchar_t)) ? length : (sizeof(info->states_en_US) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleState_en_US - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleState_en_US - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleState_en_US - call to CallVoidMethod()", FALSE); @@ -2809,11 +2809,9 @@ AccessBridgeJavaEntryPoints::getAccessibleRelationSet(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRelation key - call to GetStringChars()", FALSE); wcsncpy(relationSet->relations[i].key, stringBytes, (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRelation key", FALSE, js, stringBytes); relationSet->relations[i].key [length < (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t)) ? length : (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRelation key - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRelation key - call to ReleaseStringChars()", FALSE); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleRelation key - call to CallVoidMethod()", FALSE); @@ -2915,9 +2913,7 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertext(jobject accessibleContext, length = (sizeof(hypertext->links[i].text) / sizeof(wchar_t)) - 2; } hypertext->links[i].text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3052,9 +3048,7 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertextExt(const jobject accessibleC length = (sizeof(hypertext->links[bufIndex].text) / sizeof(wchar_t)) - 2; } hypertext->links[bufIndex].text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3171,9 +3165,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleHyperlink(jobject hypertext, length = (sizeof(info->text) / sizeof(wchar_t)) - 2; } info->text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3300,9 +3292,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleIcons(jobject accessibleContext, length = (sizeof(icons->iconInfo[i].description) / sizeof(wchar_t)) - 2; } icons->iconInfo[i].description[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleIcon description - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleIcon description - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleIcon description", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleIcon description - call to CallVoidMethod()", FALSE); @@ -3379,9 +3369,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleActions(jobject accessibleContext length = (sizeof(actions->actionInfo[i].name ) / sizeof(wchar_t)) - 2; } actions->actionInfo[i].name [length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAction name - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAction name - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAction name", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleAction name - call to CallVoidMethod()", FALSE); @@ -3561,9 +3549,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextItems(jobject accessibleContext, length = jniEnv->GetStringLength(js); textItems->word[length < (sizeof(textItems->word) / sizeof(wchar_t)) ? length : (sizeof(textItems->word) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleWordAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to CallVoidMethod()", FALSE); @@ -3597,9 +3583,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextItems(jobject accessibleContext, } else { textItems->sentence[(sizeof(textItems->sentence) / sizeof(wchar_t))-2] = (wchar_t) 0; } - EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleSentenceAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to CallVoidMethod()", FALSE); @@ -3673,9 +3657,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextSelectionInfo(jobject accessibleCo length = jniEnv->GetStringLength(js); selectionInfo->selectedText[length < (sizeof(selectionInfo->selectedText) / sizeof(wchar_t)) ? length : (sizeof(selectionInfo->selectedText) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleTextSelectedText", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to CallVoidMethod()", FALSE); @@ -3890,9 +3872,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->backgroundColor[length < (sizeof(attributes->backgroundColor) / sizeof(wchar_t)) ? length : (sizeof(attributes->backgroundColor) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting BackgroundColorFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -3927,9 +3907,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->foregroundColor[length < (sizeof(attributes->foregroundColor) / sizeof(wchar_t)) ? length : (sizeof(attributes->foregroundColor) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting ForegroundColorFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -3964,9 +3942,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->fontFamily[length < (sizeof(attributes->fontFamily) / sizeof(wchar_t)) ? length : (sizeof(attributes->fontFamily) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting FontFamilyFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -4170,9 +4146,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->fullAttributesString[length < (sizeof(attributes->fullAttributesString) / sizeof(wchar_t)) ? length : (sizeof(attributes->fullAttributesString) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAttributesAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to CallVoidMethod()", FALSE); @@ -4413,9 +4387,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextRange(jobject accessibleContext, PrintDebugString("[INFO]: Accessible Text stringBytes length = %d", length); text[length < len ? length : len - 2] = (wchar_t) 0; wPrintDebugString(L"[INFO]: Accessible Text 'text' after null termination = %ls", text); - EXCEPTION_CHECK("Getting AccessibleTextRange - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleTextRange - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleTextRange", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleTextRange - call to CallVoidMethod()", FALSE); @@ -4458,9 +4430,7 @@ AccessBridgeJavaEntryPoints::getCurrentAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting CurrentAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to CallVoidMethod()", FALSE); @@ -4501,9 +4471,7 @@ AccessBridgeJavaEntryPoints::getMaximumAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting MaximumAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to CallVoidMethod()", FALSE); @@ -4544,9 +4512,7 @@ AccessBridgeJavaEntryPoints::getMinimumAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting MinimumAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to CallVoidMethod()", FALSE); From e772e7817981b7b5c01b95245cf2022372494619 Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Thu, 29 Feb 2024 09:55:49 +0000 Subject: [PATCH 02/86] 8326948: Force English locale for timeout formatting Reviewed-by: honkar, prr, gli --- test/jdk/java/awt/regtesthelpers/PassFailJFrame.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java index b7a0f58a2f8..f8bd913dab2 100644 --- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java +++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java @@ -47,6 +47,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -639,7 +640,8 @@ private void updateTime(final long leftTime) { long hours = leftTime / 3_600_000; long minutes = (leftTime - hours * 3_600_000) / 60_000; long seconds = (leftTime - hours * 3_600_000 - minutes * 60_000) / 1_000; - label.setText(String.format("Test timeout: %02d:%02d:%02d", + label.setText(String.format(Locale.ENGLISH, + "Test timeout: %02d:%02d:%02d", hours, minutes, seconds)); } From 430290066c23d09166a84f2f6f89e770c6ba04ff Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Thu, 29 Feb 2024 12:08:14 +0000 Subject: [PATCH 03/86] 8319673: Few security tests ignore VM flags Reviewed-by: weijun, hchao --- .../provider/KeyProtector/IterationCount.java | 24 +++------- .../security/Security/ConfigFileTest.java | 45 ++++++++++++------- .../security/provider/KeyStore/DKSTest.java | 4 +- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java b/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java index e61f8b45f77..70c6cad411a 100644 --- a/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java +++ b/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java @@ -52,9 +52,6 @@ public class IterationCount { private static final String clientStr = "CLIENT"; - private static final String javaBinPath = - System.getProperty("java.home", ".") + File.separator + "bin" + - File.separator + "java"; public static void main(String[] args) throws Throwable { if (args[0].equals("HOST")) { @@ -78,22 +75,14 @@ public static void main(String[] args) throws Throwable { System.out.println("TEST PASS - OK"); } - private static List getBasicCommand() { - List cmd = new ArrayList<>(); - cmd.add(javaBinPath); - cmd.add("-cp"); - cmd.add(System.getProperty("test.classes", ".")); - return cmd; - } - private static void executeCommand(List cmd, String expectedCount) throws Throwable { cmd.add("--add-opens=java.base/com.sun.crypto.provider=ALL-UNNAMED"); cmd.add(IterationCount.class.getName()); cmd.add(clientStr); cmd.add(expectedCount); - OutputAnalyzer out = ProcessTools.executeCommand( - cmd.toArray(new String[cmd.size()])); + ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(cmd); + OutputAnalyzer out = ProcessTools.executeCommand(pb); out.shouldHaveExitValue(0); } @@ -102,7 +91,7 @@ private static void testSystem(String expectedCount, String setValue) System.out.println("Test setting " + (setValue != null ? setValue : "nothing") + " as a System property"); - List cmd = getBasicCommand(); + List cmd = new ArrayList<>(); if (setValue != null) { cmd.add("-Djdk.jceks.iterationCount=" + setValue); } @@ -112,7 +101,7 @@ private static void testSystem(String expectedCount, String setValue) private static void testSecurity(String expectedCount, String setValue) throws Throwable { - testSecurity(expectedCount, setValue, getBasicCommand()); + testSecurity(expectedCount, setValue, new ArrayList<>()); } private static void testSecurity(String expectedCount, String setValue, @@ -140,15 +129,14 @@ private static void testSystemOverridesSecurity() throws Throwable { " the Security one"); String systemValue = Integer.toString(30000); System.out.println("System value: " + systemValue); - List cmd = getBasicCommand(); + List cmd = new ArrayList<>(); cmd.add("-Djdk.jceks.iterationCount=" + systemValue); testSecurity(systemValue, Integer.toString(40000), cmd); } private static void writeJavaSecurityProp(String javaSecurityPath, String setValue) throws IOException { - try (FileOutputStream fos = new FileOutputStream( - new File(javaSecurityPath))) { + try (FileOutputStream fos = new FileOutputStream(javaSecurityPath)) { fos.write(("jdk.jceks.iterationCount=" + setValue).getBytes()); } } diff --git a/test/jdk/java/security/Security/ConfigFileTest.java b/test/jdk/java/security/Security/ConfigFileTest.java index fe022fc45ce..b9264b937ec 100644 --- a/test/jdk/java/security/Security/ConfigFileTest.java +++ b/test/jdk/java/security/Security/ConfigFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, 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 @@ -21,6 +21,7 @@ * questions. */ +import jdk.test.lib.Utils; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; @@ -30,7 +31,9 @@ import java.security.Provider; import java.security.Security; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Optional; /* @@ -50,6 +53,9 @@ public class ConfigFileTest { private static boolean overrideDetected = false; + private static Path COPY_JDK_DIR = Path.of("./jdk-8155246-tmpdir"); + private static Path COPIED_JAVA = COPY_JDK_DIR.resolve("bin", "java"); + public static void main(String[] args) throws Exception { Path copyJdkDir = Path.of("./jdk-8155246-tmpdir"); Path copiedJava = Optional.of( @@ -72,29 +78,29 @@ public static void main(String[] args) throws Exception { String extraPropsFile = Path.of(System.getProperty("test.src"), "override.props").toString(); // sanity test -XshowSettings:security option - exerciseShowSettingsSecurity(copiedJava.toString(), "-cp", System.getProperty("test.classes"), - "-Djava.security.debug=all", "-XshowSettings:security", "ConfigFileTest", "runner"); + exerciseShowSettingsSecurity(buildCommand("-cp", System.getProperty("test.classes"), + "-Djava.security.debug=all", "-XshowSettings:security", "ConfigFileTest", "runner")); // exercise some debug flags while we're here // regular JDK install - should expect success exerciseSecurity(0, "java", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), - "-Djava.security.debug=all", "-Djavax.net.debug=all", "ConfigFileTest", "runner"); + buildCommand("-cp", System.getProperty("test.classes"), + "-Djava.security.debug=all", "-Djavax.net.debug=all", "ConfigFileTest", "runner")); // given an overriding security conf file that doesn't exist, we shouldn't // overwrite the properties from original/master security conf file exerciseSecurity(0, "SUN version", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", "-Djava.security.properties==file:///" + extraPropsFile + "badFileName", - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // test JDK launch with customized properties file exerciseSecurity(0, "NumProviders: 6", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", "-Djava.security.properties==file:///" + extraPropsFile, - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // delete the master conf file Files.delete(Path.of(copyJdkDir.toString(), "conf", @@ -102,16 +108,16 @@ public static void main(String[] args) throws Exception { // launch JDK without java.security file being present or specified exerciseSecurity(1, "Error loading java.security file", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // test the override functionality also. Should not be allowed since // "security.overridePropertiesFile=true" Security property is missing. exerciseSecurity(1, "Error loading java.security file", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", - "-Djava.security.properties==file:///" + extraPropsFile, "ConfigFileTest", "runner"); + "-Djava.security.properties==file:///" + extraPropsFile, "ConfigFileTest", "runner")); if (!overrideDetected) { throw new RuntimeException("Override scenario not seen"); @@ -119,8 +125,14 @@ public static void main(String[] args) throws Exception { } } - private static void exerciseSecurity(int exitCode, String output, String... args) throws Exception { - ProcessBuilder process = new ProcessBuilder(args); + private static ProcessBuilder buildCommand(String... command) { + ArrayList args = new ArrayList<>(); + args.add(COPIED_JAVA.toString()); + Collections.addAll(args, Utils.prependTestJavaOpts(command)); + return new ProcessBuilder(args); + } + + private static void exerciseSecurity(int exitCode, String output, ProcessBuilder process) throws Exception { OutputAnalyzer oa = ProcessTools.executeProcess(process); oa.shouldHaveExitValue(exitCode) .shouldContain(output); @@ -141,8 +153,7 @@ private static void exerciseSecurity(int exitCode, String output, String... args } // exercise the -XshowSettings:security launcher - private static void exerciseShowSettingsSecurity(String... args) throws Exception { - ProcessBuilder process = new ProcessBuilder(args); + private static void exerciseShowSettingsSecurity(ProcessBuilder process) throws Exception { OutputAnalyzer oa = ProcessTools.executeProcess(process); oa.shouldHaveExitValue(0) .shouldContain("Security properties:") diff --git a/test/jdk/sun/security/provider/KeyStore/DKSTest.java b/test/jdk/sun/security/provider/KeyStore/DKSTest.java index 1d1943ec729..9c35a1c1dd9 100644 --- a/test/jdk/sun/security/provider/KeyStore/DKSTest.java +++ b/test/jdk/sun/security/provider/KeyStore/DKSTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, 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 @@ -80,7 +80,7 @@ public class DKSTest { public static void main(String[] args) throws Exception { if (args.length == 0) { // Environment variable and system properties referred in domains.cfg used by this Test. - ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(List.of( + ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(List.of( "-Dtest.src=" + TEST_SRC , "-Duser.dir=" + USER_DIR, "DKSTest", "run")); pb.environment().putAll(System.getenv()); pb.environment().put("KEYSTORE_PWD", "test12"); From 8f6edd8dc866bf970b7e7b8358f62832887e6e8b Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Thu, 29 Feb 2024 14:36:44 +0000 Subject: [PATCH 04/86] 8326975: Parallel: Remove redundant PSOldGen::is_allocated Reviewed-by: gli, tschatzl --- src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp | 2 +- src/hotspot/share/gc/parallel/psOldGen.cpp | 6 ------ src/hotspot/share/gc/parallel/psOldGen.hpp | 3 --- src/hotspot/share/gc/parallel/psParallelCompact.cpp | 8 ++------ src/hotspot/share/gc/parallel/psParallelCompact.hpp | 2 +- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index 64d3a8d4a10..961451e5b59 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -122,7 +122,7 @@ jint ParallelScavengeHeap::initialize() { _gc_policy_counters = new PSGCAdaptivePolicyCounters("ParScav:MSC", 2, 2, _size_policy); - if (!PSParallelCompact::initialize()) { + if (!PSParallelCompact::initialize_aux_data()) { return JNI_ENOMEM; } diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp index 14be4745b15..2e1de34258a 100644 --- a/src/hotspot/share/gc/parallel/psOldGen.cpp +++ b/src/hotspot/share/gc/parallel/psOldGen.cpp @@ -121,12 +121,6 @@ void PSOldGen::initialize_performance_counters(const char* perf_data_name, int l _object_space, _gen_counters); } -// Assume that the generation has been allocated if its -// reserved size is not 0. -bool PSOldGen::is_allocated() { - return virtual_space()->reserved_size() != 0; -} - size_t PSOldGen::num_iterable_blocks() const { return (object_space()->used_in_bytes() + IterateBlockSize - 1) / IterateBlockSize; } diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp index 4898baa3a44..82aa920f401 100644 --- a/src/hotspot/share/gc/parallel/psOldGen.hpp +++ b/src/hotspot/share/gc/parallel/psOldGen.hpp @@ -105,9 +105,6 @@ class PSOldGen : public CHeapObj { ObjectStartArray* start_array() { return &_start_array; } PSVirtualSpace* virtual_space() const { return _virtual_space;} - // Has the generation been successfully allocated? - bool is_allocated(); - // Size info size_t capacity_in_bytes() const { return object_space()->capacity_in_bytes(); } size_t used_in_bytes() const { return object_space()->used_in_bytes(); } diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 9df0d7fb4d7..80dbe4cb73c 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -862,14 +862,10 @@ void PSParallelCompact::post_initialize() { ParCompactionManager::initialize(mark_bitmap()); } -bool PSParallelCompact::initialize() { +bool PSParallelCompact::initialize_aux_data() { ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); MemRegion mr = heap->reserved_region(); - - // Was the old gen get allocated successfully? - if (!heap->old_gen()->is_allocated()) { - return false; - } + assert(mr.byte_size() != 0, "heap should be reserved"); initialize_space_info(); initialize_dead_wood_limiter(); diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 94995bd4f19..8012df325f0 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -1069,7 +1069,7 @@ class PSParallelCompact : AllStatic { // allocations. This should be called during the VM initialization // at a pointer where it would be appropriate to return a JNI_ENOMEM // in the event of a failure. - static bool initialize(); + static bool initialize_aux_data(); // Closure accessors static BoolObjectClosure* is_alive_closure() { return &_is_alive_closure; } From db0e2b8faf41b1dcf3cb8e637e213f50ced92584 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Thu, 29 Feb 2024 16:47:04 +0000 Subject: [PATCH 05/86] 8326944: (ch) Minor typo in the ScatteringByteChannel.read(ByteBuffer[] dsts,int offset,int length) javadoc Reviewed-by: naoto, iris, coffeys, gli --- .../classes/java/nio/channels/ScatteringByteChannel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java b/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java index fd48d4baa6e..27fce3c1e09 100644 --- a/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java +++ b/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -56,7 +56,7 @@ public interface ScatteringByteChannel * *

An invocation of this method attempts to read up to r bytes * from this channel, where r is the total number of bytes remaining - * the specified subsequence of the given buffer array, that is, + * in the specified subsequence of the given buffer array, that is, * * {@snippet lang=java : * dsts[offset].remaining() From bbfda6599a878746cd0bab72952deae95e9f5dea Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Thu, 29 Feb 2024 16:47:14 +0000 Subject: [PATCH 06/86] 8326897: (fs) The utility TestUtil.supportsLinks is wrongly used to check for hard link support Reviewed-by: gli, alanb --- .../nio/file/DirectoryStream/SecureDS.java | 24 +++++----- .../java/nio/file/Files/CheckPermissions.java | 8 ++-- test/jdk/java/nio/file/Files/CopyAndMove.java | 44 +++++++++---------- .../java/nio/file/Files/CopyInterference.java | 4 +- .../nio/file/Files/CreateDirectories.java | 4 +- .../java/nio/file/Files/DeleteOnClose.java | 4 +- test/jdk/java/nio/file/Files/Misc.java | 13 +++--- test/jdk/java/nio/file/Files/SBC.java | 12 ++--- .../nio/file/Files/SetLastModifiedTime.java | 4 +- test/jdk/java/nio/file/Files/StreamTest.java | 22 +++++----- test/jdk/java/nio/file/Files/SubstDrive.java | 7 +-- test/jdk/java/nio/file/Files/SymlinkTime.java | 4 +- .../Files/walkFileTree/CreateFileTree.java | 6 +-- test/jdk/java/nio/file/Path/ToRealPath.java | 14 +++--- test/jdk/java/nio/file/TestUtil.java | 21 ++++++++- .../attribute/DosFileAttributeView/Basic.java | 4 +- .../PosixFileAttributeView/Basic.java | 4 +- .../UserDefinedFileAttributeView/Basic.java | 4 +- 18 files changed, 112 insertions(+), 91 deletions(-) diff --git a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java index 250e84763db..d4f197eb09b 100644 --- a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java +++ b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -37,7 +37,7 @@ import java.util.*; public class SecureDS { - static boolean supportsLinks; + static boolean supportsSymbolicLinks; public static void main(String[] args) throws IOException { Path dir = TestUtil.createTemporaryDirectory(); @@ -52,7 +52,7 @@ public static void main(String[] args) throws IOException { return; } - supportsLinks = TestUtil.supportsLinks(dir); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(dir); // run tests doBasicTests(dir); @@ -76,11 +76,11 @@ static void doBasicTests(Path dir) throws IOException { createDirectory(dir1.resolve(dirEntry)); // myfilelink -> myfile Path link1Entry = Paths.get("myfilelink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(link1Entry), fileEntry); // mydirlink -> mydir Path link2Entry = Paths.get("mydirlink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(link2Entry), dirEntry); // open directory and then move it so that it is no longer accessible @@ -92,7 +92,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: iterate over all entries int count = 0; for (Path entry: stream) { count++; } - assertTrue(count == (supportsLinks ? 4 : 2)); + assertTrue(count == (supportsSymbolicLinks ? 4 : 2)); // Test: getFileAttributeView to access directory's attributes assertTrue(stream @@ -117,7 +117,7 @@ static void doBasicTests(Path dir) throws IOException { .getFileAttributeView(dirEntry, BasicFileAttributeView.class, NOFOLLOW_LINKS) .readAttributes() .isDirectory()); - if (supportsLinks) { + if (supportsSymbolicLinks) { assertTrue(stream .getFileAttributeView(link1Entry, BasicFileAttributeView.class) .readAttributes() @@ -139,7 +139,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: newByteChannel Set opts = Collections.emptySet(); stream.newByteChannel(fileEntry, opts).close(); - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.newByteChannel(link1Entry, opts).close(); try { Set mixed = new HashSet<>(); @@ -153,7 +153,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: newDirectoryStream stream.newDirectoryStream(dirEntry).close(); stream.newDirectoryStream(dirEntry, LinkOption.NOFOLLOW_LINKS).close(); - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.newDirectoryStream(link2Entry).close(); try { stream.newDirectoryStream(link2Entry, LinkOption.NOFOLLOW_LINKS) @@ -163,7 +163,7 @@ static void doBasicTests(Path dir) throws IOException { } // Test: delete - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.deleteFile(link1Entry); stream.deleteFile(link2Entry); } @@ -186,7 +186,7 @@ static void doMoveTests(Path dir) throws IOException { Path dirEntry = Paths.get("mydir"); createDirectory(dir1.resolve(dirEntry)); Path linkEntry = Paths.get("mylink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(linkEntry), Paths.get("missing")); // target name @@ -211,7 +211,7 @@ static void doMoveTests(Path dir) throws IOException { stream2.deleteDirectory(target); // Test: move dir1/mylink -> dir2/newfile - if (supportsLinks) { + if (supportsSymbolicLinks) { stream1.move(linkEntry, stream2, target); assertTrue(isSymbolicLink(dir2.resolve(target))); stream2.deleteFile(target); diff --git a/test/jdk/java/nio/file/Files/CheckPermissions.java b/test/jdk/java/nio/file/Files/CheckPermissions.java index 5a8ff7f8b67..397ace359f7 100644 --- a/test/jdk/java/nio/file/Files/CheckPermissions.java +++ b/test/jdk/java/nio/file/Files/CheckPermissions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2024, 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 @@ -251,7 +251,7 @@ public static void main(String[] args) throws IOException { delete(target); } - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsSymbolicLinks(testdir)) { Path link = testdir.resolve("link1234"); createSymbolicLink(link, file); try { @@ -297,7 +297,7 @@ public static void main(String[] args) throws IOException { // -- createSymbolicLink -- - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsSymbolicLinks(testdir)) { prepare(); Path link = testdir.resolve("link1234"); createSymbolicLink(link, file); @@ -311,7 +311,7 @@ public static void main(String[] args) throws IOException { // -- createLink -- - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsHardLinks(testdir)) { prepare(); Path link = testdir.resolve("entry234"); createLink(link, file); diff --git a/test/jdk/java/nio/file/Files/CopyAndMove.java b/test/jdk/java/nio/file/Files/CopyAndMove.java index 4f1acf4dcc3..f8bc9f997b7 100644 --- a/test/jdk/java/nio/file/Files/CopyAndMove.java +++ b/test/jdk/java/nio/file/Files/CopyAndMove.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -70,8 +70,8 @@ public static void main(String[] args) throws Exception { FileStore fileStore1 = getFileStore(dir1); printDirInfo("dir1", dir1, fileStore1); testPosixAttributes = fileStore1.supportsFileAttributeView("posix"); - testCopyFileToFile(dir1, dir1, TestUtil.supportsLinks(dir1)); - testMove(dir1, dir1, TestUtil.supportsLinks(dir1)); + testCopyFileToFile(dir1, dir1, TestUtil.supportsSymbolicLinks(dir1)); + testMove(dir1, dir1, TestUtil.supportsSymbolicLinks(dir1)); // Use test.dir to define second directory if possible as it might // be a different volume/file system and so improve test coverage. @@ -87,8 +87,8 @@ public static void main(String[] args) throws Exception { try { testPosixAttributes = fileStore2.supportsFileAttributeView("posix"); - testCopyFileToFile(dir2, dir2, TestUtil.supportsLinks(dir2)); - testMove(dir2, dir2, TestUtil.supportsLinks(dir2)); + testCopyFileToFile(dir2, dir2, TestUtil.supportsSymbolicLinks(dir2)); + testMove(dir2, dir2, TestUtil.supportsSymbolicLinks(dir2)); } finally { TestUtil.removeAll(dir2); } @@ -101,7 +101,7 @@ public static void main(String[] args) throws Exception { dir2 = TestUtil.createTemporaryDirectory(testDir); } boolean testSymbolicLinks = - TestUtil.supportsLinks(dir1) && TestUtil.supportsLinks(dir2); + TestUtil.supportsSymbolicLinks(dir1) && TestUtil.supportsSymbolicLinks(dir2); testPosixAttributes = fileStore1.supportsFileAttributeView("posix") && fileStore2.supportsFileAttributeView("posix"); testCopyFileToFile(dir1, dir2, testSymbolicLinks); @@ -309,7 +309,7 @@ static void moveAndVerify(Path source, Path target, CopyOption... options) /** * Tests all possible ways to invoke move */ - static void testMove(Path dir1, Path dir2, boolean supportsLinks) + static void testMove(Path dir1, Path dir2, boolean supportsSymbolicLinks) throws IOException { Path source, target, entry; @@ -531,7 +531,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link to file, target does not exist */ - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = createSourceFile(dir1); source = dir1.resolve("link"); createSymbolicLink(source, tmp); @@ -544,7 +544,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link to directory, target does not exist */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -555,7 +555,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move broken symbolic link, target does not exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = Paths.get("doesnotexist"); source = dir1.resolve("link"); createSymbolicLink(source, tmp); @@ -567,7 +567,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link, target exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -584,7 +584,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move regular file, target exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -596,7 +596,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: move symbolic link, target exists and is empty directory */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -608,7 +608,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: symbolic link, target exists and is non-empty directory */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -628,7 +628,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test atomic move of symbolic link (same file store) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir1); target = getTargetFile(dir2); @@ -743,7 +743,7 @@ static void copyAndVerify(Path source, Path target, CopyOption... options) /** * Tests all possible ways to invoke copy to copy a file to a file */ - static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) + static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsSymbolicLinks) throws IOException { Path source, target, link, entry; @@ -947,7 +947,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Follow link */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = createSourceFile(dir1); link = dir1.resolve("link"); createSymbolicLink(link, source.getFileName()); @@ -960,7 +960,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link (to file) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = createSourceFile(dir1); link = dir1.resolve("link"); createSymbolicLink(link, source); @@ -973,7 +973,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link (to directory) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("mydir"); createDirectory(source); link = dir1.resolve("link"); @@ -987,7 +987,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy broken link */ - if (supportsLinks) { + if (supportsSymbolicLinks) { assertTrue(notExists(source)); link = dir1.resolve("link"); createSymbolicLink(link, source); @@ -999,7 +999,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link to UNC (Windows only) */ - if (supportsLinks && Platform.isWindows()) { + if (supportsSymbolicLinks && Platform.isWindows()) { Path unc = Paths.get("\\\\rialto\\share\\file"); link = dir1.resolve("link"); createSymbolicLink(link, unc); @@ -1066,7 +1066,7 @@ static void testCopyInputStreamToFile() throws IOException { } Path tmpdir = createTempDirectory("blah"); try { - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = createSymbolicLink(tmpdir.resolve("link"), tmpdir.resolve("target")); try { diff --git a/test/jdk/java/nio/file/Files/CopyInterference.java b/test/jdk/java/nio/file/Files/CopyInterference.java index 310d3e382ca..e3b62398bac 100644 --- a/test/jdk/java/nio/file/Files/CopyInterference.java +++ b/test/jdk/java/nio/file/Files/CopyInterference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -114,7 +114,7 @@ private static Stream pathAndOptionsProvider() new CopyOption[] {REPLACE_EXISTING}); list.add(args); - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { // symbolic link, followed Path link = dir.resolve("link"); Files.createSymbolicLink(link, sourceFile); diff --git a/test/jdk/java/nio/file/Files/CreateDirectories.java b/test/jdk/java/nio/file/Files/CreateDirectories.java index e3204192cdc..fc5a5025955 100644 --- a/test/jdk/java/nio/file/Files/CreateDirectories.java +++ b/test/jdk/java/nio/file/Files/CreateDirectories.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, 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 @@ -46,7 +46,7 @@ public class CreateDirectories { public void testSymlinkDir() throws Exception { // create a temp dir as the "root" in which we will run our tests. final Path top = TestUtil.createTemporaryDirectory(); - if (!TestUtil.supportsLinks(top)) { + if (!TestUtil.supportsSymbolicLinks(top)) { System.out.println("Skipping tests since symbolic links isn't " + "supported under directory "+ top); throw new SkipException("Symbolic links not supported"); diff --git a/test/jdk/java/nio/file/Files/DeleteOnClose.java b/test/jdk/java/nio/file/Files/DeleteOnClose.java index f5fab1c5be2..238bb1f87a6 100644 --- a/test/jdk/java/nio/file/Files/DeleteOnClose.java +++ b/test/jdk/java/nio/file/Files/DeleteOnClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -82,7 +82,7 @@ public static void runTest(Path path) throws Exception { Path dir = Files.createTempDirectory("blah"); try { // check that DELETE_ON_CLOSE fails when file is a sym link - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { file = dir.resolve("foo"); Files.createFile(file); Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/Files/Misc.java b/test/jdk/java/nio/file/Files/Misc.java index 1d3df155675..024b518141b 100644 --- a/test/jdk/java/nio/file/Files/Misc.java +++ b/test/jdk/java/nio/file/Files/Misc.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -156,7 +156,7 @@ static void testIsSameFile(Path tmpdir) throws IOException { /** * Test: Symbolic links */ - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { createSymbolicLink(thatFile, thisFile); try { assertTrue(isSameFile(thisFile, thatFile)); @@ -198,7 +198,7 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { assertTrue(!isDirectory(file, NOFOLLOW_LINKS)); assertTrue(!isSymbolicLink(file)); - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = tmpdir.resolve("link"); createSymbolicLink(link, tmpdir); @@ -222,6 +222,10 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { } finally { delete(link); } + } + + if (TestUtil.supportsHardLinks(tmpdir)) { + Path link = tmpdir.resolve("hardlink"); createLink(link, file); try { @@ -234,7 +238,6 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { delete(link); } } - } finally { delete(file); } @@ -273,7 +276,7 @@ static void testAccessMethods(Path tmpdir) throws IOException { } // sym link exists - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = tmpdir.resolve("link"); createSymbolicLink(link, file); diff --git a/test/jdk/java/nio/file/Files/SBC.java b/test/jdk/java/nio/file/Files/SBC.java index 8f470b8d9ed..7aa04b18462 100644 --- a/test/jdk/java/nio/file/Files/SBC.java +++ b/test/jdk/java/nio/file/Files/SBC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -39,12 +39,12 @@ public class SBC { - static boolean supportsLinks; + static boolean supportsSymbolicLinks; public static void main(String[] args) throws Exception { Path dir = TestUtil.createTemporaryDirectory(); try { - supportsLinks = TestUtil.supportsLinks(dir); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(dir); // open options createTests(dir); @@ -84,7 +84,7 @@ static void createTests(Path dir) throws Exception { Files.newByteChannel(file, CREATE, WRITE).close(); // create file where existing file is a sym link - if (supportsLinks) { + if (supportsSymbolicLinks) { Path link = Files.createSymbolicLink(dir.resolve("link"), file); try { // file already exists @@ -121,7 +121,7 @@ static void createTests(Path dir) throws Exception { } catch (FileAlreadyExistsException x) { } // create should fail - if (supportsLinks) { + if (supportsSymbolicLinks) { Path link = dir.resolve("link"); Path target = dir.resolve("thisDoesNotExist"); Files.createSymbolicLink(link, target); @@ -224,7 +224,7 @@ static void truncateExistingTests(Path dir) throws Exception { // test NOFOLLOW_LINKS option static void noFollowLinksTests(Path dir) throws Exception { - if (!supportsLinks) + if (!supportsSymbolicLinks) return; Path file = Files.createFile(dir.resolve("foo")); try { diff --git a/test/jdk/java/nio/file/Files/SetLastModifiedTime.java b/test/jdk/java/nio/file/Files/SetLastModifiedTime.java index 98f77d4c8d8..d06b78b2922 100644 --- a/test/jdk/java/nio/file/Files/SetLastModifiedTime.java +++ b/test/jdk/java/nio/file/Files/SetLastModifiedTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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 @@ -87,7 +87,7 @@ public void testDirectory() throws Exception { @Test public void testSymbolicLink() throws Exception { - if (TestUtil.supportsLinks(testDir)) { + if (TestUtil.supportsSymbolicLinks(testDir)) { Path target = Files.createFile(testDir.resolve("target")); Path link = testDir.resolve("link"); Files.createSymbolicLink(link, target); diff --git a/test/jdk/java/nio/file/Files/StreamTest.java b/test/jdk/java/nio/file/Files/StreamTest.java index c21faf96627..cc4aa1b1e5c 100644 --- a/test/jdk/java/nio/file/Files/StreamTest.java +++ b/test/jdk/java/nio/file/Files/StreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, 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 @@ -72,7 +72,7 @@ public class StreamTest { * - linkFile(./file) */ static Path testFolder; - static boolean supportsLinks; + static boolean supportsSymbolicLinks; static Path[] level1; static Path[] all; static Path[] all_folowLinks; @@ -80,7 +80,7 @@ public class StreamTest { @BeforeClass void setupTestFolder() throws IOException { testFolder = TestUtil.createTemporaryDirectory(); - supportsLinks = TestUtil.supportsLinks(testFolder); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(testFolder); TreeSet set = new TreeSet<>(); // Level 1 @@ -96,7 +96,7 @@ void setupTestFolder() throws IOException { set.add(file); set.add(dir); set.add(dir2); - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = testFolder.resolve("linkDir"); Files.createSymbolicLink(tmp, dir); set.add(tmp); @@ -113,7 +113,7 @@ void setupTestFolder() throws IOException { tmp = dir.resolve("f1"); Files.createFile(tmp); set.add(tmp); - if (supportsLinks) { + if (supportsSymbolicLinks) { tmp = dir.resolve("lnDir2"); Files.createSymbolicLink(tmp, dir2); set.add(tmp); @@ -123,7 +123,7 @@ void setupTestFolder() throws IOException { all = set.toArray(new Path[0]); // Follow links - if (supportsLinks) { + if (supportsSymbolicLinks) { tmp = testFolder.resolve("linkDir"); set.add(tmp.resolve("d1")); set.add(tmp.resolve("f1")); @@ -212,7 +212,7 @@ private void validateFileSystemLoopException(Path start, Path... causes) { } public void testWalkFollowLinkLoop() { - if (!supportsLinks) { + if (!supportsSymbolicLinks) { return; } @@ -513,7 +513,7 @@ public void testSecurityException() throws IOException { Path triggerLink = null; Path linkTriggerDir = null; Path linkTriggerFile = null; - if (supportsLinks) { + if (supportsSymbolicLinks) { Path dir = testFolder.resolve("dir"); triggerLink = Files.createSymbolicLink(dir.resolve("SecurityException"), empty); linkTriggerDir = Files.createSymbolicLink(dir.resolve("lnDirSE"), triggerDir); @@ -539,7 +539,7 @@ public void testSecurityException() throws IOException { assertEqualsNoOrder(result, new String[] { "dir2", "SecurityException", "fileInSE", "file" }); } - if (supportsLinks) { + if (supportsSymbolicLinks) { try (Stream s = Files.list(fakeRoot.resolve("dir"))) { String[] result = s.map(path -> path.getFileName().toString()) .toArray(String[]::new); @@ -562,7 +562,7 @@ public void testSecurityException() throws IOException { assertEqualsNoOrder(result, new String[] { "dir2", "file" }); } - if (supportsLinks) { + if (supportsSymbolicLinks) { // not following links try (Stream s = Files.walk(fakeRoot.resolve("dir"))) { String[] result = s.map(path -> path.getFileName().toString()) @@ -639,7 +639,7 @@ public void testSecurityException() throws IOException { if (fs != null) { fs.close(); } - if (supportsLinks) { + if (supportsSymbolicLinks) { Files.delete(triggerLink); Files.delete(linkTriggerDir); Files.delete(linkTriggerFile); diff --git a/test/jdk/java/nio/file/Files/SubstDrive.java b/test/jdk/java/nio/file/Files/SubstDrive.java index 88bf1948926..94fdeadcef3 100644 --- a/test/jdk/java/nio/file/Files/SubstDrive.java +++ b/test/jdk/java/nio/file/Files/SubstDrive.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Microsoft Corporation. All rights reserved. + * Copyright (c) 2024, 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 @@ -276,7 +277,7 @@ public void testMoveAndCopySubstDrive() throws IOException { */ @Test public void testGetResolvedSymlinkAttribute() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } @@ -308,7 +309,7 @@ public void testGetResolvedSymlinkAttribute() throws IOException { */ @Test public void testSubstWithSymlinkedDirectory() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } @@ -350,7 +351,7 @@ public void testSubstWithSymlinkedDirectory() throws IOException { */ @Test public void testMoveAndCopyFilesToSymlinkedDrive() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } diff --git a/test/jdk/java/nio/file/Files/SymlinkTime.java b/test/jdk/java/nio/file/Files/SymlinkTime.java index 89590cfdb3c..5d654b0fad4 100644 --- a/test/jdk/java/nio/file/Files/SymlinkTime.java +++ b/test/jdk/java/nio/file/Files/SymlinkTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, 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 @@ -41,7 +41,7 @@ public class SymlinkTime { public static void main(String[] args) throws IOException { Path dir = TestUtil.createTemporaryDirectory(); - if (!TestUtil.supportsLinks(dir)) { + if (!TestUtil.supportsSymbolicLinks(dir)) { System.out.println("Links not supported: skipping test"); return; } diff --git a/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java b/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java index 98bc2866e7a..9f9be7ad1e0 100644 --- a/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java +++ b/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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,7 +34,7 @@ public class CreateFileTree { private static final Random rand = new Random(); - private static boolean supportsLinks(Path dir) { + private static boolean supportsSymbolicLinks(Path dir) { Path link = dir.resolve("testlink"); Path target = dir.resolve("testtarget"); try { @@ -77,7 +77,7 @@ static Path create() throws IOException { } // create a few sym links in the file tree so as to create cycles - if (supportsLinks(top)) { + if (supportsSymbolicLinks(top)) { int links = 1 + rand.nextInt(5); for (int i=0; i doesNotExist.toRealPath(NOFOLLOW_LINKS)); } - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") @Test public void shouldResolveLinks() throws IOException { Path resolvedFile = FILE; @@ -110,7 +110,7 @@ public void shouldResolveLinks() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void shouldNotResolveLinks() throws IOException { Files.createSymbolicLink(LINK, FILE.toAbsolutePath()); assertEquals(LINK.toRealPath(NOFOLLOW_LINKS).getFileName(), @@ -143,7 +143,7 @@ public void eliminateDotsNoFollow() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void noCollapseDots1() throws IOException { Path subPath = DIR.resolve(Path.of("dir", "subdir")); Path sub = Files.createDirectories(subPath); @@ -163,7 +163,7 @@ public void noCollapseDots1() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void noCollapseDots2() throws IOException { Path subPath = DIR.resolve(Path.of("dir", "subdir")); Path sub = Files.createDirectories(subPath); diff --git a/test/jdk/java/nio/file/TestUtil.java b/test/jdk/java/nio/file/TestUtil.java index 66cf21bfb35..26c06f1dae3 100644 --- a/test/jdk/java/nio/file/TestUtil.java +++ b/test/jdk/java/nio/file/TestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -102,7 +102,7 @@ static Path createDirectoryWithLongPath(Path dir) /** * Returns true if symbolic links are supported */ - static boolean supportsLinks(Path dir) { + static boolean supportsSymbolicLinks(Path dir) { Path link = dir.resolve("testlink"); Path target = dir.resolve("testtarget"); try { @@ -115,4 +115,21 @@ static boolean supportsLinks(Path dir) { return false; } } + + /** + * Returns true if hard links are supported + */ + static boolean supportsHardLinks(Path dir) { + Path link = dir.resolve("testlink"); + Path target = dir.resolve("testtarget"); + try { + Files.createLink(link, target); + Files.delete(link); + return true; + } catch (UnsupportedOperationException x) { + return false; + } catch (IOException x) { + return false; + } + } } diff --git a/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java index b00ceb56d25..0412401dc58 100644 --- a/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -79,7 +79,7 @@ static void readWriteTests(Path dir) throws IOException { testAttributes(Files.getFileAttributeView(file, DosFileAttributeView.class)); // Following tests use a symbolic link so skip if not supported - if (!TestUtil.supportsLinks(dir)) + if (!TestUtil.supportsSymbolicLinks(dir)) return; Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java index 6626a289dce..765af125595 100644 --- a/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -167,7 +167,7 @@ static void permissionTests(Path dir) Files.delete(file); } - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { // create link (to file that doesn't exist) and test reading of // permissions Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java index 00ab4670ba6..da46e401365 100644 --- a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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 @@ -299,7 +299,7 @@ public static void main(String[] args) throws IOException { } // test access to user defined attributes of sym link - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { Path target = dir.resolve("doesnotexist"); Path link = dir.resolve("link"); Files.createSymbolicLink(link, target); From d9aa1deac8474f87dd867809f7265b9496917c6f Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Thu, 29 Feb 2024 16:56:16 +0000 Subject: [PATCH 07/86] 8318605: Enable parallelism in vmTestbase/nsk/stress/stack tests Reviewed-by: gli, shade, lmesnik --- .../nsk/stress/stack/TEST.properties | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties deleted file mode 100644 index 8b51b2a9115..00000000000 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2018, 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. -# -# 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. -# - -exclusiveAccess.dirs=. From b8fc4186d59ce21e878c4de30983d7cacf69b7a5 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Thu, 29 Feb 2024 17:51:10 +0000 Subject: [PATCH 08/86] 8326525: com/sun/tools/attach/BasicTests.java does not verify AgentLoadException case Reviewed-by: cjplummer, lmesnik, sspitsyn --- test/jdk/com/sun/tools/attach/BasicTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/jdk/com/sun/tools/attach/BasicTests.java b/test/jdk/com/sun/tools/attach/BasicTests.java index 833d7022ce8..4dc7065630f 100644 --- a/test/jdk/com/sun/tools/attach/BasicTests.java +++ b/test/jdk/com/sun/tools/attach/BasicTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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 @@ -171,6 +171,7 @@ public static void main(String args[]) throws Exception { System.out.println(" - Test: Load an agent that does not exist"); try { vm.loadAgent("SilverBullet.jar"); + throw new RuntimeException("AgentLoadException not thrown as expected!"); } catch (AgentLoadException x) { System.out.println(" - AgentLoadException thrown as expected!"); } From d29cefb6ebfd03638e1ca880ff20a0489e4e4fa5 Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Thu, 29 Feb 2024 20:18:17 +0000 Subject: [PATCH 09/86] 8326838: JFR: Native mirror events Reviewed-by: mgronlun --- .../jdk/jfr/internal/MetadataRepository.java | 43 ++++++++++++++++--- .../share/classes/jdk/jfr/internal/Type.java | 6 ++- .../classes/jdk/jfr/internal/TypeLibrary.java | 4 +- .../classes/jdk/jfr/internal/util/Utils.java | 16 ++++++- 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java index 4b54150e5bb..29267803009 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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,12 +35,14 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import jdk.jfr.AnnotationElement; import jdk.jfr.Event; import jdk.jfr.EventType; +import jdk.jfr.Name; import jdk.jfr.Period; import jdk.jfr.StackTrace; import jdk.jfr.Threshold; @@ -54,8 +56,8 @@ public final class MetadataRepository { private static final MetadataRepository instance = new MetadataRepository(); - private final List nativeEventTypes = new ArrayList<>(150); - private final List nativeControls = new ArrayList(nativeEventTypes.size()); + private final Map nativeEventTypes = LinkedHashMap.newHashMap(150); + private final Map nativeControls = LinkedHashMap.newHashMap(150); private final SettingsManager settingsManager = new SettingsManager(); private Constructor cachedEventConfigurationConstructor; private boolean staleMetadata = true; @@ -83,8 +85,9 @@ private void initializeJVMEventTypes() { PeriodicEvents.addJVMEvent(pEventType); } } - nativeControls.add(new EventControl(pEventType)); - nativeEventTypes.add(eventType); + String name = eventType.getName(); + nativeControls.put(name, new EventControl(pEventType)); + nativeEventTypes.put(name,eventType); } } } @@ -101,7 +104,7 @@ public synchronized List getRegisteredEventTypes() { eventTypes.add(ec.getEventType()); } } - for (EventType t : nativeEventTypes) { + for (EventType t : nativeEventTypes.values()) { if (PrivateAccess.getInstance().isVisible(t)) { eventTypes.add(t); } @@ -200,6 +203,32 @@ private EventConfiguration makeConfiguration(Class getEventControls() { List> eventClasses = JVM.getAllEventClasses(); ArrayList controls = new ArrayList<>(eventClasses.size() + nativeControls.size()); - controls.addAll(nativeControls); + controls.addAll(nativeControls.values()); for (Class clazz : eventClasses) { EventConfiguration eh = JVMSupport.getConfiguration(clazz); if (eh != null) { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java index 277b28505e6..bc949b8c7ff 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 @@ -222,6 +222,10 @@ public boolean isDefinedByJVM() { return id < JVM.RESERVED_CLASS_ID_LIMIT; } + public void setFields(List fields) { + this.fields = List.copyOf(fields); + } + public void add(ValueDescriptor valueDescriptor) { Objects.requireNonNull(valueDescriptor); fields.add(valueDescriptor); diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java index 4663ead6838..19c83b3dc1c 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 @@ -322,7 +322,7 @@ private static void addUserFields(Class clazz, Type type, List sanitizeNullFreeStringMap(Map return map; } + public static boolean compareLists(List a, List b, Comparator c) { + int size = a.size(); + if (size != b.size()) { + return false; + } + for (int i = 0; i < size; i++) { + if (c.compare(a.get(i), b.get(i)) != 0) { + return false; + } + } + return true; + } + public static List sanitizeNullFreeList(List elements, Class clazz) { List sanitized = new ArrayList<>(elements.size()); for (T element : elements) { From 742c776a922bc226a3beaa9e219ff0bd2baf7bc4 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Thu, 29 Feb 2024 20:20:46 +0000 Subject: [PATCH 10/86] 8322743: C2: prevent lock region elimination in OSR compilation Reviewed-by: epeter, dlong, vlivanov --- src/hotspot/share/opto/compile.cpp | 1 + src/hotspot/share/opto/parse1.cpp | 28 +++++++- .../jtreg/compiler/locks/TestLocksInOSR.java | 70 +++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp index 1e4c8fc51b7..338732b420f 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -4879,6 +4879,7 @@ void Compile::add_coarsened_locks(GrowableArray& locks) { // Locking regions (BoxLock) could be Unbalanced here: // - its coarsened locks were eliminated in earlier // macro nodes elimination followed by loop unroll + // - it is OSR locking region (no Lock node) // Preserve Unbalanced status in such cases. if (!this_box->is_unbalanced()) { this_box->set_coarsened(); diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp index 7c0f5cadeeb..97cc025b45b 100644 --- a/src/hotspot/share/opto/parse1.cpp +++ b/src/hotspot/share/opto/parse1.cpp @@ -224,11 +224,20 @@ void Parse::load_interpreter_state(Node* osr_buf) { Node *monitors_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals+mcnt*2-1)*wordSize); for (index = 0; index < mcnt; index++) { // Make a BoxLockNode for the monitor. - Node *box = new BoxLockNode(next_monitor()); + BoxLockNode* osr_box = new BoxLockNode(next_monitor()); // Check for bailout after new BoxLockNode if (failing()) { return; } - box = _gvn.transform(box); + // This OSR locking region is unbalanced because it does not have Lock node: + // locking was done in Interpreter. + // This is similar to Coarsened case when Lock node is eliminated + // and as result the region is marked as Unbalanced. + + // Emulate Coarsened state transition from Regular to Unbalanced. + osr_box->set_coarsened(); + osr_box->set_unbalanced(); + + Node* box = _gvn.transform(osr_box); // Displaced headers and locked objects are interleaved in the // temp OSR buffer. We only copy the locked objects out here. @@ -1805,11 +1814,24 @@ void Parse::merge_common(Parse::Block* target, int pnum) { const JVMState* jvms = map()->jvms(); if (EliminateNestedLocks && jvms->is_mon(j) && jvms->is_monitor_box(j)) { - // BoxLock nodes are not commoning. + // BoxLock nodes are not commoning when EliminateNestedLocks is on. // Use old BoxLock node as merged box. assert(newin->jvms()->is_monitor_box(j), "sanity"); // This assert also tests that nodes are BoxLock. assert(BoxLockNode::same_slot(n, m), "sanity"); + BoxLockNode* old_box = m->as_BoxLock(); + if (n->as_BoxLock()->is_unbalanced() && !old_box->is_unbalanced()) { + // Preserve Unbalanced status. + // + // `old_box` can have only Regular or Coarsened status + // because this code is executed only during Parse phase and + // Incremental Inlining before EA and Macro nodes elimination. + // + // Incremental Inlining is executed after IGVN optimizations + // during which BoxLock can be marked as Coarsened. + old_box->set_coarsened(); // Verifies state + old_box->set_unbalanced(); + } C->gvn_replace_by(n, m); } else if (!check_elide_phi || !target->can_elide_SEL_phi(j)) { phi = ensure_phi(j, nophi); diff --git a/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java b/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java new file mode 100644 index 00000000000..3516e62e46f --- /dev/null +++ b/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2024, 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. + * + * 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. + */ + +/* + * @test + * @bug 8322743 + * @summary EA incorrectly marks locks for elimination for escaped object which comes from Interpreter in OSR compilation. + * @run main/othervm -XX:-TieredCompilation -Xcomp -XX:CompileCommand=compileonly,TestLocksInOSR*::* -XX:CompileCommand=quiet TestLocksInOSR + * @run main TestLocksInOSR + */ + +public class TestLocksInOSR { + + public static void main(String[] args) throws Exception { + // Triggers assert(this->held_monitor_count() == this->jni_monitor_count()) failed: held monitor count should be equal to jni: 1 != 0 + test1(); + + // Triggers assert(current->held_monitor_count() == 0) failed: Should not be possible + test2(); + } + + static void test1() throws Exception { + Thread writeThread = new Thread(new Runnable() { + @Override + public void run() { + for (int i = 0; i < 2; ++i) { + synchronized (new Object()) { + // Trigger OSR compilation + for (int j = 0; j < 100_000; ++j) { + // We still have safepoint left in code + } + } + } + } + }); + writeThread.start(); + writeThread.join(); + } + + static void test2() { + for (int i = 0; i < 2; ++i) { + synchronized (new Object()) { + // Trigger OSR compilation + for (int j = 0; j < 100_000; ++j) { + // We still have safepoint left in code + } + } + } + } +} From 43af12039f13b884ab632ab403691530996e961c Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Thu, 29 Feb 2024 22:11:05 +0000 Subject: [PATCH 11/86] 8326959: Improve JVMCI option help Reviewed-by: never --- .../vm/ci/hotspot/HotSpotJVMCIRuntime.java | 77 +++++++++++++------ .../jvmci/TestJVMCIPrintProperties.java | 4 +- 2 files changed, 54 insertions(+), 27 deletions(-) diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java index d6a91a7a9c0..87cd10b400f 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java @@ -221,35 +221,60 @@ static String[] exceptionToString(Throwable o, boolean toString, boolean stackTr */ static final Map options = new HashMap<>(); + /** + * Sentinel help value to denote options that are not printed by -XX:+JVMCIPrintProperties. + * Javadoc is used instead to document these options. + */ + private static final String[] NO_HELP = null; + /** * A list of all supported JVMCI options. */ public enum Option { // @formatter:off - Compiler(String.class, null, "Selects the system compiler. This must match the getCompilerName() value returned " + - "by a jdk.vm.ci.runtime.JVMCICompilerFactory provider. " + - "An empty string or the value \"null\" selects a compiler " + - "that will raise an exception upon receiving a compilation request."), - // Note: The following one is not used (see InitTimer.ENABLED). It is added here - // so that -XX:+JVMCIPrintProperties shows the option. - InitTimer(Boolean.class, false, "Specifies if initialization timing is enabled."), - CodeSerializationTypeInfo(Boolean.class, false, "Prepend the size and label of each element to the stream when " + - "serializing HotSpotCompiledCode to verify both ends of the protocol agree on the format. " + - "Defaults to true in non-product builds."), - DumpSerializedCode(String.class, null, "Dump serialized code during code installation for code whose simple " + - "name (a stub) or fully qualified name (an nmethod) contains this option's value as a substring."), - ForceTranslateFailure(String.class, null, "Forces HotSpotJVMCIRuntime.translate to throw an exception in the context " + - "of the peer runtime. The value is a filter that can restrict the forced failure to matching translated " + - "objects. See HotSpotJVMCIRuntime.postTranslation for more details. This option exists solely to test " + - "correct handling of translation failures."), - PrintConfig(Boolean.class, false, "Prints VM configuration available via JVMCI."), - AuditHandles(Boolean.class, false, "Record stack trace along with scoped foreign object reference wrappers " + - "to debug issue with a wrapper being used after its scope has closed."), - TraceMethodDataFilter(String.class, null, - "Enables tracing of profiling info when read by JVMCI.", - "Empty value: trace all methods", - "Non-empty value: trace methods whose fully qualified name contains the value."), - UseProfilingInformation(Boolean.class, true, ""); + Compiler(String.class, null, + "Selects the system compiler. This must match the getCompilerName() value", + "returned by a jdk.vm.ci.runtime.JVMCICompilerFactory provider. ", + "An empty string or the value \"null\" selects a compiler ", + "that raises an exception upon receiving a compilation request."), + + PrintConfig(Boolean.class, false, "Prints VM values (e.g. flags, constants, field offsets etc) exposed to JVMCI."), + + InitTimer(Boolean.class, false, NO_HELP), + + /** + * Prepends the size and label of each element to the stream when serializing {@link HotSpotCompiledCode} + * to verify both ends of the protocol agree on the format. Defaults to true in non-product builds. + */ + CodeSerializationTypeInfo(Boolean.class, false, NO_HELP), + + /** + * Dumps serialized code during code installation for code whose qualified form (e.g. + * {@code java.lang.String.hashCode()}) contains this option's value as a substring. + */ + DumpSerializedCode(String.class, null, NO_HELP), + + /** + * Forces {@link #translate} to throw an exception in the context of the peer runtime for + * translated objects that match this value. See {@link #postTranslation} for more details. + * This option exists solely to test correct handling of translation failures. + */ + ForceTranslateFailure(String.class, null, NO_HELP), + + /** + * Captures a stack trace along with scoped foreign object reference wrappers + * to debug an issue with a wrapper being used after its scope has closed. + */ + AuditHandles(Boolean.class, false, NO_HELP), + + /** + * Enables tracing of profiling info when read by JVMCI. + * Empty value: trace all methods + * Non-empty value: trace methods whose fully qualified name contains the value + */ + TraceMethodDataFilter(String.class, null, NO_HELP), + + UseProfilingInformation(Boolean.class, true, NO_HELP); // @formatter:on /** @@ -343,6 +368,9 @@ public static void printProperties(PrintStream out) { out.println("[JVMCI properties]"); Option[] values = values(); for (Option option : values) { + if (option.helpLines == null) { + continue; + } Object value = option.getValue(); if (value instanceof String) { value = '"' + String.valueOf(value) + '"'; @@ -362,6 +390,7 @@ public static void printProperties(PrintStream out) { for (String line : option.helpLines) { out.printf("%" + PROPERTY_HELP_INDENT + "s%s%n", "", line); } + out.println(); } } diff --git a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java index 4e4a013db40..d6de659eea4 100644 --- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java +++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java @@ -24,7 +24,7 @@ /* * @test TestBasicLogOutput * @bug 8203370 - * @summary Ensure -XX:-JVMCIPrintProperties can be enabled and successfully prints expected output to stdout. + * @summary Ensure -XX:+JVMCIPrintProperties successfully prints expected output to stdout. * @requires vm.flagless * @requires vm.jvmci * @library /test/lib @@ -49,9 +49,7 @@ static void test(String enableFlag) throws Exception { OutputAnalyzer output = new OutputAnalyzer(pb.start()); output.shouldContain("[JVMCI properties]"); // expected message output.shouldContain("jvmci.Compiler := \"null\""); // expected message - output.shouldContain("jvmci.InitTimer = false"); // expected message output.shouldContain("jvmci.PrintConfig = false"); // expected message - output.shouldContain("jvmci.TraceMethodDataFilter = null"); // expected message output.shouldHaveExitValue(0); } } From 8d6f7849ff870e87c088ba38c21a8207d6883a2f Mon Sep 17 00:00:00 2001 From: Denghui Dong Date: Thu, 29 Feb 2024 23:46:42 +0000 Subject: [PATCH 12/86] 8327056: Remove unused static char array in JvmtiAgentList::lookup Reviewed-by: amenkov, sspitsyn --- src/hotspot/share/prims/jvmtiAgentList.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hotspot/share/prims/jvmtiAgentList.cpp b/src/hotspot/share/prims/jvmtiAgentList.cpp index 2a0f7172888..75f9ba63d3d 100644 --- a/src/hotspot/share/prims/jvmtiAgentList.cpp +++ b/src/hotspot/share/prims/jvmtiAgentList.cpp @@ -258,7 +258,6 @@ static bool match(JvmtiEnv* env, const JvmtiAgent* agent, const void* os_module_ JvmtiAgent* JvmtiAgentList::lookup(JvmtiEnv* env, void* f_ptr) { assert(env != nullptr, "invariant"); assert(f_ptr != nullptr, "invariant"); - static char ebuf[1024]; static char buffer[JVM_MAXPATHLEN]; int offset; if (!os::dll_address_to_library_name(reinterpret_cast

(f_ptr), &buffer[0], JVM_MAXPATHLEN, &offset)) { From 0d354503620eb7f6da7b1b8aa6143ba18ced8f12 Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Fri, 1 Mar 2024 03:09:54 +0000 Subject: [PATCH 13/86] 8327040: Problemlist ActionListenerCalledTwiceTest.java test failing in macos14 Reviewed-by: prr, gli --- test/jdk/ProblemList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 9ae69adacf1..9aa6449ead6 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -689,6 +689,7 @@ javax/swing/JComboBox/TestComboBoxComponentRendering.java 8309734 linux-all # This test fails on macOS 14 javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all +javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 8316151 macosx-all ############################################################################ From 12404a5efb3c45f72f54fda3238c72d5d15a30ee Mon Sep 17 00:00:00 2001 From: Joshua Cao Date: Fri, 1 Mar 2024 05:35:33 +0000 Subject: [PATCH 14/86] 8324790: ifnode::fold_compares_helper cleanup Reviewed-by: chagedorn, epeter --- src/hotspot/share/opto/ifnode.cpp | 80 ++++++++++++++----------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp index 91e1c40076e..0e21933b6de 100644 --- a/src/hotspot/share/opto/ifnode.cpp +++ b/src/hotspot/share/opto/ifnode.cpp @@ -1031,7 +1031,7 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f const TypeInt* type2 = filtered_int_type(igvn, n, fail); if (type2 != nullptr) { failtype = failtype->join(type2)->is_int(); - if (failtype->_lo > failtype->_hi) { + if (failtype->empty()) { // previous if determines the result of this if so // replace Bool with constant igvn->replace_input_of(this, 1, igvn->intcon(success->_con)); @@ -1039,55 +1039,49 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f } } } - lo = nullptr; - hi = nullptr; + return false; + } + + assert(lo != nullptr && hi != nullptr, "sanity"); + Node* hook = new Node(lo); // Add a use to lo to prevent him from dying + // Merge the two compares into a single unsigned compare by building (CmpU (n - lo) (hi - lo)) + Node* adjusted_val = igvn->transform(new SubINode(n, lo)); + if (adjusted_lim == nullptr) { + adjusted_lim = igvn->transform(new SubINode(hi, lo)); } + hook->destruct(igvn); - if (lo && hi) { - Node* hook = new Node(1); - hook->init_req(0, lo); // Add a use to lo to prevent him from dying - // Merge the two compares into a single unsigned compare by building (CmpU (n - lo) (hi - lo)) - Node* adjusted_val = igvn->transform(new SubINode(n, lo)); - if (adjusted_lim == nullptr) { - adjusted_lim = igvn->transform(new SubINode(hi, lo)); + if (igvn->type(adjusted_lim)->is_int()->_lo < 0 && + !igvn->C->post_loop_opts_phase()) { + // If range check elimination applies to this comparison, it includes code to protect from overflows that may + // cause the main loop to be skipped entirely. Delay this transformation. + // Example: + // for (int i = 0; i < limit; i++) { + // if (i < max_jint && i > min_jint) {... + // } + // Comparisons folded as: + // i - min_jint - 1 outcnt() == 0) { + igvn->remove_dead_node(adjusted_val); } - hook->destruct(igvn); - - int lo = igvn->type(adjusted_lim)->is_int()->_lo; - if (lo < 0) { - // If range check elimination applies to this comparison, it includes code to protect from overflows that may - // cause the main loop to be skipped entirely. Delay this transformation. - // Example: - // for (int i = 0; i < limit; i++) { - // if (i < max_jint && i > min_jint) {... - // } - // Comparisons folded as: - // i - min_jint - 1 C->post_loop_opts_phase()) { - if (adjusted_val->outcnt() == 0) { - igvn->remove_dead_node(adjusted_val); - } - if (adjusted_lim->outcnt() == 0) { - igvn->remove_dead_node(adjusted_lim); - } - igvn->C->record_for_post_loop_opts_igvn(this); - return false; - } + if (adjusted_lim->outcnt() == 0) { + igvn->remove_dead_node(adjusted_lim); } + igvn->C->record_for_post_loop_opts_igvn(this); + return false; + } - Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); - Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); + Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); + Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); - igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con)); - igvn->replace_input_of(this, 1, newbool); + igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con)); + igvn->replace_input_of(this, 1, newbool); - return true; - } - return false; + return true; } // Merge the branches that trap for this If and the dominating If into From 0899b3b5e5c949e4eef2cc20ae38ab136fccb5bb Mon Sep 17 00:00:00 2001 From: Richard Reingruber Date: Fri, 1 Mar 2024 07:12:05 +0000 Subject: [PATCH 15/86] 8326612: Parallel: remove redundant assertion from ScavengeRootsTask Reviewed-by: tschatzl, ayang --- src/hotspot/share/gc/parallel/psScavenge.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp index c864ded21c5..926006a8a0e 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.cpp +++ b/src/hotspot/share/gc/parallel/psScavenge.cpp @@ -298,8 +298,6 @@ class ScavengeRootsTask : public WorkerTask { _active_workers(active_workers), _is_old_gen_empty(old_gen->object_space()->is_empty()), _terminator(active_workers, PSPromotionManager::vm_thread_promotion_manager()->stack_array_depth()) { - assert(_old_gen != nullptr, "Sanity"); - if (!_is_old_gen_empty) { PSCardTable* card_table = ParallelScavengeHeap::heap()->card_table(); card_table->pre_scavenge(active_workers); From a065eba56de01f4492123c6663ec0c3108d907a1 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Fri, 1 Mar 2024 07:37:43 +0000 Subject: [PATCH 16/86] 8326496: [test] checkHsErrFileContent support printing hserr in error case Reviewed-by: clanger, lucy --- .../runtime/ErrorHandling/HsErrFileUtils.java | 65 +++++++++++++++++-- .../ErrorHandling/SecondaryErrorTest.java | 6 +- 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java b/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java index 306ab44d18d..d2ca4c9ff55 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2022 SAP SE. All rights reserved. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 SAP SE. 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 @@ -68,7 +68,7 @@ public static File openHsErrFileFromOutput(OutputAnalyzer output) { * @throws RuntimeException, {@link IOException} */ public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean verbose) throws IOException { - checkHsErrFileContent(f, patterns, null, true, verbose); + checkHsErrFileContent(f, patterns, null, true, verbose, false); } /** @@ -80,11 +80,43 @@ public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean ver * Order is irrelevant. * @param checkEndMarker If true, we check for the final "END" in an hs-err file; if it is missing it indicates * that hs-err file printing did not complete successfully. - * @param verbose If true, the content of the hs-err file is printed while matching. If false, only important - * information are printed. + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. * @throws RuntimeException, {@link IOException} */ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pattern[] negativePatterns, boolean checkEndMarker, boolean verbose) throws IOException { + checkHsErrFileContent(f, positivePatterns, negativePatterns, checkEndMarker, verbose, false); + } + + /** + * Given an open hs-err file, read it line by line and check for existence of a set of patterns. Will fail + * if patterns are missing, or if the END marker is missing. + * @param f Input file + * @param patterns An array of patterns that need to match, in that order + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. + * @param printHserrOnError If true, the content of the hs-err file is printed in case of a failing check + * @throws RuntimeException, {@link IOException} + */ + public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean verbose, boolean printHserrOnError) throws IOException { + checkHsErrFileContent(f, patterns, null, true, verbose, printHserrOnError); + } + + /** + * Given an open hs-err file, read it line by line and check for various conditions. + * @param f input file + * @param positivePatterns Optional array of patterns that need to appear, in given order, in the file. Missing + * patterns cause the test to fail. + * @param negativePatterns Optional array of patterns that must not appear in the file; test fails if they do. + * Order is irrelevant. + * @param checkEndMarker If true, we check for the final "END" in an hs-err file; if it is missing it indicates + * that hs-err file printing did not complete successfully. + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. + * @param printHserrOnError If true, the content of the hs-err file is printed in case of a failing check + * @throws RuntimeException, {@link IOException} + */ + public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pattern[] negativePatterns, boolean checkEndMarker, boolean verbose, boolean printHserrOnError) throws IOException { try ( FileInputStream fis = new FileInputStream(f); BufferedReader br = new BufferedReader(new InputStreamReader(fis)); @@ -123,6 +155,9 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat System.out.println(line); } System.out.println("^^^ Forbidden pattern found at line " + lineNo + ": " + negativePattern + "^^^"); + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("Forbidden pattern found at line " + lineNo + ": " + negativePattern); } } @@ -132,13 +167,33 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat } // If the current pattern is not null then it didn't match if (currentPositivePattern != null) { + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPositivePattern.pattern() + ")"); } if (checkEndMarker && !lastLine.equals("END.")) { + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("hs-err file incomplete (missing END marker.)"); } System.out.println("hs-err file " + f.getAbsolutePath() + " scanned successfully."); } } + private static void printHsErrFile(File f) throws IOException { + try ( + FileInputStream fis = new FileInputStream(f); + BufferedReader br = new BufferedReader(new InputStreamReader(fis)); + ) { + String line; + System.out.println("------------------------ hs-err file ------------------------"); + while ((line = br.readLine()) != null) { + System.out.println(line); + } + System.out.println("-------------------------------------------------------------"); + } + } + } diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java index 012d5a5c16d..5b28e2a1d8b 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2014, 2022 SAP SE. All rights reserved. - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024 SAP SE. All rights reserved. + * Copyright (c) 2014, 2024, 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 @@ -122,7 +122,7 @@ public static void main(String[] args) throws Exception { } Pattern[] pattern = patternlist.toArray(new Pattern[] {}); - HsErrFileUtils.checkHsErrFileContent(hs_err_file, pattern, false); + HsErrFileUtils.checkHsErrFileContent(hs_err_file, pattern, false, true); System.out.println("OK."); From 5b75199769c5af2c904f0ff4ef5288e90bab33db Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Fri, 1 Mar 2024 10:51:26 +0000 Subject: [PATCH 17/86] 8327022: Parallel: Remove experimental dense prefix calculation Reviewed-by: shade, ayang, gli --- .../share/gc/parallel/psParallelCompact.cpp | 145 ------------------ .../share/gc/parallel/psParallelCompact.hpp | 9 -- 2 files changed, 154 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 80dbe4cb73c..aafbdfaeb04 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -1044,142 +1044,6 @@ void PSParallelCompact::post_compact() Universe::heap()->record_whole_heap_examined_timestamp(); } -HeapWord* -PSParallelCompact::compute_dense_prefix_via_density(const SpaceId id, - bool maximum_compaction) -{ - const size_t region_size = ParallelCompactData::RegionSize; - const ParallelCompactData& sd = summary_data(); - - const MutableSpace* const space = _space_info[id].space(); - HeapWord* const top_aligned_up = sd.region_align_up(space->top()); - const RegionData* const beg_cp = sd.addr_to_region_ptr(space->bottom()); - const RegionData* const end_cp = sd.addr_to_region_ptr(top_aligned_up); - - // Skip full regions at the beginning of the space--they are necessarily part - // of the dense prefix. - size_t full_count = 0; - const RegionData* cp; - for (cp = beg_cp; cp < end_cp && cp->data_size() == region_size; ++cp) { - ++full_count; - } - - const uint total_invocations = ParallelScavengeHeap::heap()->total_full_collections(); - assert(total_invocations >= _maximum_compaction_gc_num, "sanity"); - const size_t gcs_since_max = total_invocations - _maximum_compaction_gc_num; - const bool interval_ended = gcs_since_max > HeapMaximumCompactionInterval; - if (maximum_compaction || cp == end_cp || interval_ended) { - _maximum_compaction_gc_num = total_invocations; - return sd.region_to_addr(cp); - } - - HeapWord* const new_top = _space_info[id].new_top(); - const size_t space_live = pointer_delta(new_top, space->bottom()); - const size_t space_used = space->used_in_words(); - const size_t space_capacity = space->capacity_in_words(); - - const double cur_density = double(space_live) / space_capacity; - const double deadwood_density = - (1.0 - cur_density) * (1.0 - cur_density) * cur_density * cur_density; - const size_t deadwood_goal = size_t(space_capacity * deadwood_density); - - log_develop_debug(gc, compaction)( - "cur_dens=%5.3f dw_dens=%5.3f dw_goal=" SIZE_FORMAT, - cur_density, deadwood_density, deadwood_goal); - log_develop_debug(gc, compaction)( - "space_live=" SIZE_FORMAT " space_used=" SIZE_FORMAT " " - "space_cap=" SIZE_FORMAT, - space_live, space_used, - space_capacity); - - // XXX - Use binary search? - HeapWord* dense_prefix = sd.region_to_addr(cp); - const RegionData* full_cp = cp; - const RegionData* const top_cp = sd.addr_to_region_ptr(space->top() - 1); - while (cp < end_cp) { - HeapWord* region_destination = cp->destination(); - const size_t cur_deadwood = pointer_delta(dense_prefix, region_destination); - - log_develop_trace(gc, compaction)( - "c#=" SIZE_FORMAT_W(4) " dst=" PTR_FORMAT " " - "dp=" PTR_FORMAT " cdw=" SIZE_FORMAT_W(8), - sd.region(cp), p2i(region_destination), - p2i(dense_prefix), cur_deadwood); - - if (cur_deadwood >= deadwood_goal) { - // Found the region that has the correct amount of deadwood to the left. - // This typically occurs after crossing a fairly sparse set of regions, so - // iterate backwards over those sparse regions, looking for the region - // that has the lowest density of live objects 'to the right.' - size_t space_to_left = sd.region(cp) * region_size; - size_t live_to_left = space_to_left - cur_deadwood; - size_t space_to_right = space_capacity - space_to_left; - size_t live_to_right = space_live - live_to_left; - double density_to_right = double(live_to_right) / space_to_right; - while (cp > full_cp) { - --cp; - const size_t prev_region_live_to_right = live_to_right - - cp->data_size(); - const size_t prev_region_space_to_right = space_to_right + region_size; - double prev_region_density_to_right = - double(prev_region_live_to_right) / prev_region_space_to_right; - if (density_to_right <= prev_region_density_to_right) { - return dense_prefix; - } - - log_develop_trace(gc, compaction)( - "backing up from c=" SIZE_FORMAT_W(4) " d2r=%10.8f " - "pc_d2r=%10.8f", - sd.region(cp), density_to_right, - prev_region_density_to_right); - - dense_prefix -= region_size; - live_to_right = prev_region_live_to_right; - space_to_right = prev_region_space_to_right; - density_to_right = prev_region_density_to_right; - } - return dense_prefix; - } - - dense_prefix += region_size; - ++cp; - } - - return dense_prefix; -} - -#ifndef PRODUCT -void PSParallelCompact::print_dense_prefix_stats(const char* const algorithm, - const SpaceId id, - const bool maximum_compaction, - HeapWord* const addr) -{ - const size_t region_idx = summary_data().addr_to_region_idx(addr); - RegionData* const cp = summary_data().region(region_idx); - const MutableSpace* const space = _space_info[id].space(); - HeapWord* const new_top = _space_info[id].new_top(); - - const size_t space_live = pointer_delta(new_top, space->bottom()); - const size_t dead_to_left = pointer_delta(addr, cp->destination()); - const size_t space_cap = space->capacity_in_words(); - const double dead_to_left_pct = double(dead_to_left) / space_cap; - const size_t live_to_right = new_top - cp->destination(); - const size_t dead_to_right = space->top() - addr - live_to_right; - - log_develop_debug(gc, compaction)( - "%s=" PTR_FORMAT " dpc=" SIZE_FORMAT_W(5) " " - "spl=" SIZE_FORMAT " " - "d2l=" SIZE_FORMAT " d2l%%=%6.4f " - "d2r=" SIZE_FORMAT " l2r=" SIZE_FORMAT " " - "ratio=%10.8f", - algorithm, p2i(addr), region_idx, - space_live, - dead_to_left, dead_to_left_pct, - dead_to_right, live_to_right, - double(dead_to_right) / live_to_right); -} -#endif // #ifndef PRODUCT - // Return a fraction indicating how much of the generation can be treated as // "dead wood" (i.e., not reclaimed). The function uses a normal distribution // based on the density of live objects in the generation to determine a limit, @@ -1507,15 +1371,6 @@ PSParallelCompact::summarize_space(SpaceId id, bool maximum_compaction) HeapWord* dense_prefix_end = compute_dense_prefix(id, maximum_compaction); _space_info[id].set_dense_prefix(dense_prefix_end); -#ifndef PRODUCT - if (log_is_enabled(Debug, gc, compaction)) { - print_dense_prefix_stats("ratio", id, maximum_compaction, - dense_prefix_end); - HeapWord* addr = compute_dense_prefix_via_density(id, maximum_compaction); - print_dense_prefix_stats("density", id, maximum_compaction, addr); - } -#endif // #ifndef PRODUCT - // Recompute the summary data, taking into account the dense prefix. If // every last byte will be reclaimed, then the existing summary data which // compacts everything can be left in place. diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 8012df325f0..b5efb52a245 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -975,11 +975,6 @@ class PSParallelCompact : AllStatic { // Mark live objects static void marking_phase(ParallelOldTracer *gc_tracer); - // Compute the dense prefix for the designated space. This is an experimental - // implementation currently not used in production. - static HeapWord* compute_dense_prefix_via_density(const SpaceId id, - bool maximum_compaction); - // Methods used to compute the dense prefix. // Compute the value of the normal distribution at x = density. The mean and @@ -1170,10 +1165,6 @@ class PSParallelCompact : AllStatic { // Debugging support. static const char* space_names[last_space_id]; static void print_region_ranges(); - static void print_dense_prefix_stats(const char* const algorithm, - const SpaceId id, - const bool maximum_compaction, - HeapWord* const addr); static void summary_phase_msg(SpaceId dst_space_id, HeapWord* dst_beg, HeapWord* dst_end, SpaceId src_space_id, From e85265abc2426ff30031b1528cf1c6b4ecb5e11b Mon Sep 17 00:00:00 2001 From: Korov Date: Fri, 1 Mar 2024 10:58:59 +0000 Subject: [PATCH 18/86] 8325361: Make sun.net.www.MessageHeader final Reviewed-by: dfuchs --- .../share/classes/sun/net/www/MessageHeader.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/java.base/share/classes/sun/net/www/MessageHeader.java b/src/java.base/share/classes/sun/net/www/MessageHeader.java index 4192d8920f7..6af23e43ad2 100644 --- a/src/java.base/share/classes/sun/net/www/MessageHeader.java +++ b/src/java.base/share/classes/sun/net/www/MessageHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2024, 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 @@ -40,17 +40,15 @@ the header that don't have a valid key, but do have a value (this isn't legal according to the standard, but lines like this are everywhere). */ -public -class MessageHeader { - private String keys[]; - private String values[]; +public final class MessageHeader { + private String[] keys; + private String[] values; private int nkeys; public MessageHeader () { grow(); } - @SuppressWarnings("this-escape") public MessageHeader (InputStream is) throws java.io.IOException { parseHeader(is); } From 437cf354e2d1f7df79fa32265ccf86a0e84257b5 Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Fri, 1 Mar 2024 12:23:17 +0000 Subject: [PATCH 19/86] 8319648: java/lang/SecurityManager tests ignore vm flags Reviewed-by: mullan --- .../modules/CustomSecurityManagerTest.java | 4 ++-- test/jdk/java/lang/System/SecurityManagerWarnings.java | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java b/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java index 92b9e44f892..cd9201a3c22 100644 --- a/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java +++ b/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -64,7 +64,7 @@ public Object[][] testCases() { @Test(dataProvider = "testCases") public void testProvider(List args) throws Throwable { - ProcessBuilder processBuilder = ProcessTools.createLimitedTestJavaProcessBuilder(args); + ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(args); OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder); outputAnalyzer.shouldHaveExitValue(0); } diff --git a/test/jdk/java/lang/System/SecurityManagerWarnings.java b/test/jdk/java/lang/System/SecurityManagerWarnings.java index c3e3e9a8517..6456f69c2f3 100644 --- a/test/jdk/java/lang/System/SecurityManagerWarnings.java +++ b/test/jdk/java/lang/System/SecurityManagerWarnings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, 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 @@ * @library /test/lib */ -import jdk.test.lib.JDKToolFinder; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.util.JarUtils; @@ -51,6 +50,7 @@ public static void main(String args[]) throws Exception { }; """); + System.setProperty("test.noclasspath", "true"); String testClasses = System.getProperty("test.classes"); disallowTest(null, testClasses); @@ -131,13 +131,11 @@ static OutputAnalyzer checkInstallMessage(OutputAnalyzer oa, String cp) { static OutputAnalyzer run(String prop, String cp) throws Exception { ProcessBuilder pb; if (prop == null) { - pb = new ProcessBuilder( - JDKToolFinder.getJDKTool("java"), + pb = ProcessTools.createTestJavaProcessBuilder( "-cp", cp, "SecurityManagerWarnings", "run"); } else { - pb = new ProcessBuilder( - JDKToolFinder.getJDKTool("java"), + pb = ProcessTools.createTestJavaProcessBuilder( "-cp", cp, "-Djava.security.manager=" + prop, "-Djava.security.policy=policy", From b972997af76a506ffd79ee8c6043e7a8db836b33 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Fri, 1 Mar 2024 12:39:22 +0000 Subject: [PATCH 20/86] 8326974: ODR violation in macroAssembler_aarch64.cpp Reviewed-by: adinn, shade, gli --- src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp index e88e7ff1f62..369a50cc01f 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp @@ -392,13 +392,13 @@ static bool offset_for(uint32_t insn1, uint32_t insn2, ptrdiff_t &byte_offset) { return false; } -class Decoder : public RelocActions { - virtual reloc_insn adrpMem() { return &Decoder::adrpMem_impl; } - virtual reloc_insn adrpAdd() { return &Decoder::adrpAdd_impl; } - virtual reloc_insn adrpMovk() { return &Decoder::adrpMovk_impl; } +class AArch64Decoder : public RelocActions { + virtual reloc_insn adrpMem() { return &AArch64Decoder::adrpMem_impl; } + virtual reloc_insn adrpAdd() { return &AArch64Decoder::adrpAdd_impl; } + virtual reloc_insn adrpMovk() { return &AArch64Decoder::adrpMovk_impl; } public: - Decoder(address insn_addr, uint32_t insn) : RelocActions(insn_addr, insn) {} + AArch64Decoder(address insn_addr, uint32_t insn) : RelocActions(insn_addr, insn) {} virtual int loadStore(address insn_addr, address &target) { intptr_t offset = Instruction_aarch64::sextract(_insn, 23, 5); @@ -494,7 +494,7 @@ class Decoder : public RelocActions { }; address MacroAssembler::target_addr_for_insn(address insn_addr, uint32_t insn) { - Decoder decoder(insn_addr, insn); + AArch64Decoder decoder(insn_addr, insn); address target; decoder.run(insn_addr, target); return target; From c02e7f4bb5ebd4765f0b58586932d75cba1144b4 Mon Sep 17 00:00:00 2001 From: Hamlin Li Date: Fri, 1 Mar 2024 13:33:01 +0000 Subject: [PATCH 21/86] 8327058: RISC-V: make Zcb experimental Reviewed-by: fyang, gli --- src/hotspot/cpu/riscv/assembler_riscv.hpp | 2 +- src/hotspot/cpu/riscv/globals_riscv.hpp | 1 + src/hotspot/cpu/riscv/vm_version_riscv.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp index 4a01a9c2ae4..38804ff2ed6 100644 --- a/src/hotspot/cpu/riscv/assembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp @@ -2656,7 +2656,7 @@ enum Nf { } bool do_compress_zcb(Register reg1 = noreg, Register reg2 = noreg) const { - return do_compress() && VM_Version::ext_Zcb.enabled() && + return do_compress() && UseZcb && (reg1 == noreg || reg1->is_compressed_valid()) && (reg2 == noreg || reg2->is_compressed_valid()); } diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp index 01cd2296d9e..8461948752b 100644 --- a/src/hotspot/cpu/riscv/globals_riscv.hpp +++ b/src/hotspot/cpu/riscv/globals_riscv.hpp @@ -107,6 +107,7 @@ define_pd_global(intx, InlineSmallCode, 1000); product(bool, UseZbs, false, "Use Zbs instructions") \ product(bool, UseZfh, false, "Use Zfh instructions") \ product(bool, UseZacas, false, EXPERIMENTAL, "Use Zacas instructions") \ + product(bool, UseZcb, false, EXPERIMENTAL, "Use Zcb instructions") \ product(bool, UseZic64b, false, EXPERIMENTAL, "Use Zic64b instructions") \ product(bool, UseZicbom, false, EXPERIMENTAL, "Use Zicbom instructions") \ product(bool, UseZicbop, false, EXPERIMENTAL, "Use Zicbop instructions") \ diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp index de85fb166f8..b63238cbe31 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp @@ -144,7 +144,7 @@ class VM_Version : public Abstract_VM_Version { decl(ext_Zbb , "Zbb" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbb)) \ decl(ext_Zbc , "Zbc" , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT) \ decl(ext_Zbs , "Zbs" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbs)) \ - decl(ext_Zcb , "Zcb" , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT) \ + decl(ext_Zcb , "Zcb" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZcb)) \ decl(ext_Zfh , "Zfh" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfh)) \ decl(ext_Zicsr , "Zicsr" , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT) \ decl(ext_Zifencei , "Zifencei" , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT) \ From 98434d61051ddc5a6aa0ed94a6c5dd5b718f812a Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Fri, 1 Mar 2024 13:45:57 +0000 Subject: [PATCH 22/86] 8322170: Update deprecated/obsolete/expired flags table for GC Co-authored-by: Lei Zaakjyu Reviewed-by: dholmes, tschatzl --- src/hotspot/share/runtime/arguments.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index dfd5eec6b4f..7b593b8c093 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -507,18 +507,19 @@ static SpecialFlag const special_jvm_flags[] = { // -------------- Obsolete Flags - sorted by expired_in -------------- - { "G1ConcRefinementGreenZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - { "G1ConcRefinementYellowZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - { "G1ConcRefinementRedZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - { "G1ConcRefinementThresholdStep", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - { "G1UseAdaptiveConcRefinement", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - { "G1ConcRefinementServiceIntervalMillis", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::undefined() }, - - { "G1ConcRSLogCacheSize", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() }, - { "G1ConcRSHotCardLimit", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() }, - { "RefDiscoveryPolicy", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() }, { "MetaspaceReclaimPolicy", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() }, + { "G1ConcRefinementGreenZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + { "G1ConcRefinementYellowZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + { "G1ConcRefinementRedZone", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + { "G1ConcRefinementThresholdStep", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + { "G1UseAdaptiveConcRefinement", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + { "G1ConcRefinementServiceIntervalMillis", JDK_Version::undefined(), JDK_Version::jdk(20), JDK_Version::jdk(24) }, + + { "G1ConcRSLogCacheSize", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::jdk(24) }, + { "G1ConcRSHotCardLimit", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::jdk(24) }, + { "RefDiscoveryPolicy", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::jdk(24) }, + { "AdaptiveSizePolicyCollectionCostMargin", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "MaxRAMFraction", JDK_Version::jdk(10), JDK_Version::jdk(23), JDK_Version::jdk(24) }, From 012411ad8dced3cd1f4ec6e002ebd2d84d2461f5 Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Fri, 1 Mar 2024 13:48:50 +0000 Subject: [PATCH 23/86] 8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order Reviewed-by: alanb, gli --- .../share/classes/java/nio/file/Files.java | 24 ++++++++++--------- test/jdk/java/nio/file/Files/StreamTest.java | 6 ++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java index cc35012fa0a..c1eba232359 100644 --- a/src/java.base/share/classes/java/nio/file/Files.java +++ b/src/java.base/share/classes/java/nio/file/Files.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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 @@ -3743,7 +3743,7 @@ public static Path writeString(Path path, CharSequence csq, Charset cs, OpenOpti // -- Stream APIs -- /** - * Return a lazily populated {@code Stream}, the elements of + * Returns a lazily populated {@code Stream}, the elements of * which are the entries in the directory. The listing is not recursive. * *

The elements of the stream are {@link Path} objects that are @@ -3834,11 +3834,12 @@ public Path next() { } /** - * Return a {@code Stream} that is lazily populated with {@code + * Returns a {@code Stream} that is lazily populated with {@code * Path} by walking the file tree rooted at a given starting file. The - * file tree is traversed depth-first, the elements in the stream - * are {@link Path} objects that are obtained as if by {@link - * Path#resolve(Path) resolving} the relative path against {@code start}. + * file tree is traversed depth-first with a directory visited + * before the entries in that directory. The elements in the stream are + * {@link Path} objects that are obtained as if by {@link Path#resolve(Path) + * resolving} the relative path against {@code start}. * *

The {@code stream} walks the file tree as elements are consumed. * The {@code Stream} returned is guaranteed to have at least one @@ -3933,11 +3934,12 @@ public static Stream walk(Path start, } /** - * Return a {@code Stream} that is lazily populated with {@code + * Returns a {@code Stream} that is lazily populated with {@code * Path} by walking the file tree rooted at a given starting file. The - * file tree is traversed depth-first, the elements in the stream - * are {@link Path} objects that are obtained as if by {@link - * Path#resolve(Path) resolving} the relative path against {@code start}. + * file tree is traversed depth-first with a directory visited + * before the entries in that directory. The elements in the stream are + * {@link Path} objects that are obtained as if by {@link Path#resolve(Path) + * resolving} the relative path against {@code start}. * *

This method works as if invoking it were equivalent to evaluating the * expression: @@ -3978,7 +3980,7 @@ public static Stream walk(Path start, FileVisitOption... options) throws I } /** - * Return a {@code Stream} that is lazily populated with {@code + * Returns a {@code Stream} that is lazily populated with {@code * Path} by searching for files in a file tree rooted at a given starting * file. * diff --git a/test/jdk/java/nio/file/Files/StreamTest.java b/test/jdk/java/nio/file/Files/StreamTest.java index cc4aa1b1e5c..275201eec42 100644 --- a/test/jdk/java/nio/file/Files/StreamTest.java +++ b/test/jdk/java/nio/file/Files/StreamTest.java @@ -75,7 +75,7 @@ public class StreamTest { static boolean supportsSymbolicLinks; static Path[] level1; static Path[] all; - static Path[] all_folowLinks; + static Path[] allFollowLinks; @BeforeClass void setupTestFolder() throws IOException { @@ -130,7 +130,7 @@ void setupTestFolder() throws IOException { tmp = tmp.resolve("lnDir2"); set.add(tmp); } - all_folowLinks = set.toArray(new Path[0]); + allFollowLinks = set.toArray(new Path[0]); } @AfterClass @@ -179,7 +179,7 @@ public void testWalkFollowLink() { // We still want to test the behavior with FOLLOW_LINKS option. try (Stream s = Files.walk(testFolder, FileVisitOption.FOLLOW_LINKS)) { Object[] actual = s.sorted().toArray(); - assertEquals(actual, all_folowLinks); + assertEquals(actual, allFollowLinks); } catch (IOException ioe) { fail("Unexpected IOException"); } From acc0a7436f5345dddff0b14f0098a5423b85e614 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Fri, 1 Mar 2024 14:28:02 +0000 Subject: [PATCH 24/86] 8327126: Parallel: Remove unused ParMarkBitMapClosure::_initial_words_remaining Reviewed-by: tschatzl --- src/hotspot/share/gc/parallel/psParallelCompact.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index b5efb52a245..55d434bdcde 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -744,7 +744,6 @@ class ParMarkBitMapClosure: public StackObj { private: ParMarkBitMap* const _bitmap; ParCompactionManager* const _compaction_manager; - DEBUG_ONLY(const size_t _initial_words_remaining;) // Useful in debugger. size_t _words_remaining; // Words left to copy. protected: @@ -756,9 +755,6 @@ ParMarkBitMapClosure::ParMarkBitMapClosure(ParMarkBitMap* bitmap, ParCompactionManager* cm, size_t words): _bitmap(bitmap), _compaction_manager(cm) -#ifdef ASSERT - , _initial_words_remaining(words) -#endif { _words_remaining = words; _source = nullptr; From b38a6c5780611f02d02215c65340b725e4c18929 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Fri, 1 Mar 2024 15:09:03 +0000 Subject: [PATCH 25/86] 8327049: Only export debug.cpp functions on Windows Reviewed-by: jwaters, dholmes, epeter --- src/hotspot/share/utilities/debug.cpp | 63 ++++++++++++++------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp index 9a15a5bdba6..9f839fc1a13 100644 --- a/src/hotspot/share/utilities/debug.cpp +++ b/src/hotspot/share/utilities/debug.cpp @@ -67,6 +67,9 @@ #include #include +// These functions needs to be exported on Windows only +#define DEBUGEXPORT WINDOWS_ONLY(JNIEXPORT) + // Support for showing register content on asserts/guarantees. #ifdef CAN_SHOW_REGISTERS_ON_ASSERT static char g_dummy; @@ -303,20 +306,20 @@ class Command : public StackObj { int Command::level = 0; -extern "C" JNIEXPORT void blob(CodeBlob* cb) { +extern "C" DEBUGEXPORT void blob(CodeBlob* cb) { Command c("blob"); cb->print(); } -extern "C" JNIEXPORT void dump_vtable(address p) { +extern "C" DEBUGEXPORT void dump_vtable(address p) { Command c("dump_vtable"); Klass* k = (Klass*)p; k->vtable().print(); } -extern "C" JNIEXPORT void nm(intptr_t p) { +extern "C" DEBUGEXPORT void nm(intptr_t p) { // Actually we look through all CodeBlobs (the nm name has been kept for backwards compatibility) Command c("nm"); CodeBlob* cb = CodeCache::find_blob((address)p); @@ -328,7 +331,7 @@ extern "C" JNIEXPORT void nm(intptr_t p) { } -extern "C" JNIEXPORT void disnm(intptr_t p) { +extern "C" DEBUGEXPORT void disnm(intptr_t p) { Command c("disnm"); CodeBlob* cb = CodeCache::find_blob((address) p); if (cb != nullptr) { @@ -343,7 +346,7 @@ extern "C" JNIEXPORT void disnm(intptr_t p) { } -extern "C" JNIEXPORT void printnm(intptr_t p) { +extern "C" DEBUGEXPORT void printnm(intptr_t p) { char buffer[256]; os::snprintf_checked(buffer, sizeof(buffer), "printnm: " INTPTR_FORMAT, p); Command c(buffer); @@ -357,13 +360,13 @@ extern "C" JNIEXPORT void printnm(intptr_t p) { } -extern "C" JNIEXPORT void universe() { +extern "C" DEBUGEXPORT void universe() { Command c("universe"); Universe::print_on(tty); } -extern "C" JNIEXPORT void verify() { +extern "C" DEBUGEXPORT void verify() { // try to run a verify on the entire system // note: this may not be safe if we're not at a safepoint; for debugging, // this manipulates the safepoint settings to avoid assertion failures @@ -380,7 +383,7 @@ extern "C" JNIEXPORT void verify() { } -extern "C" JNIEXPORT void pp(void* p) { +extern "C" DEBUGEXPORT void pp(void* p) { Command c("pp"); FlagSetting fl(DisplayVMOutput, true); if (p == nullptr) { @@ -405,9 +408,9 @@ extern "C" JNIEXPORT void pp(void* p) { } -extern "C" JNIEXPORT void findpc(intptr_t x); +extern "C" DEBUGEXPORT void findpc(intptr_t x); -extern "C" JNIEXPORT void ps() { // print stack +extern "C" DEBUGEXPORT void ps() { // print stack if (Thread::current_or_null() == nullptr) return; Command c("ps"); @@ -436,7 +439,7 @@ extern "C" JNIEXPORT void ps() { // print stack } } -extern "C" JNIEXPORT void pfl() { +extern "C" DEBUGEXPORT void pfl() { // print frame layout Command c("pfl"); JavaThread* p = JavaThread::active(); @@ -448,7 +451,7 @@ extern "C" JNIEXPORT void pfl() { } } -extern "C" JNIEXPORT void psf() { // print stack frames +extern "C" DEBUGEXPORT void psf() { // print stack frames { Command c("psf"); JavaThread* p = JavaThread::active(); @@ -462,19 +465,19 @@ extern "C" JNIEXPORT void psf() { // print stack frames } -extern "C" JNIEXPORT void threads() { +extern "C" DEBUGEXPORT void threads() { Command c("threads"); Threads::print(false, true); } -extern "C" JNIEXPORT void psd() { +extern "C" DEBUGEXPORT void psd() { Command c("psd"); SystemDictionary::print(); } -extern "C" JNIEXPORT void pss() { // print all stacks +extern "C" DEBUGEXPORT void pss() { // print all stacks if (Thread::current_or_null() == nullptr) return; Command c("pss"); Threads::print(true, PRODUCT_ONLY(false) NOT_PRODUCT(true)); @@ -482,7 +485,7 @@ extern "C" JNIEXPORT void pss() { // print all stacks // #ifndef PRODUCT -extern "C" JNIEXPORT void debug() { // to set things up for compiler debugging +extern "C" DEBUGEXPORT void debug() { // to set things up for compiler debugging Command c("debug"); NOT_PRODUCT(WizardMode = true;) PrintCompilation = true; @@ -491,7 +494,7 @@ extern "C" JNIEXPORT void debug() { // to set things up for compil } -extern "C" JNIEXPORT void ndebug() { // undo debug() +extern "C" DEBUGEXPORT void ndebug() { // undo debug() Command c("ndebug"); PrintCompilation = false; PrintInlining = PrintAssembly = false; @@ -499,35 +502,35 @@ extern "C" JNIEXPORT void ndebug() { // undo debug() } -extern "C" JNIEXPORT void flush() { +extern "C" DEBUGEXPORT void flush() { Command c("flush"); tty->flush(); } -extern "C" JNIEXPORT void events() { +extern "C" DEBUGEXPORT void events() { Command c("events"); Events::print(); } -extern "C" JNIEXPORT Method* findm(intptr_t pc) { +extern "C" DEBUGEXPORT Method* findm(intptr_t pc) { Command c("findm"); nmethod* nm = CodeCache::find_nmethod((address)pc); return (nm == nullptr) ? (Method*)nullptr : nm->method(); } -extern "C" JNIEXPORT nmethod* findnm(intptr_t addr) { +extern "C" DEBUGEXPORT nmethod* findnm(intptr_t addr) { Command c("findnm"); return CodeCache::find_nmethod((address)addr); } -extern "C" JNIEXPORT void find(intptr_t x) { +extern "C" DEBUGEXPORT void find(intptr_t x) { Command c("find"); os::print_location(tty, x, false); } -extern "C" JNIEXPORT void findpc(intptr_t x) { +extern "C" DEBUGEXPORT void findpc(intptr_t x) { Command c("findpc"); os::print_location(tty, x, true); } @@ -538,13 +541,13 @@ extern "C" JNIEXPORT void findpc(intptr_t x) { // call findclass("java/lang/Object", 0x3) -> find j.l.Object and disasm all of its methods // call findmethod("*ang/Object*", "wait", 0xff) -> detailed disasm of all "wait" methods in j.l.Object // call findmethod("*ang/Object*", "wait:(*J*)V", 0x1) -> list all "wait" methods in j.l.Object that have a long parameter -extern "C" JNIEXPORT void findclass(const char* class_name_pattern, int flags) { +extern "C" DEBUGEXPORT void findclass(const char* class_name_pattern, int flags) { Command c("findclass"); ClassPrinter::print_flags_help(tty); ClassPrinter::print_classes(class_name_pattern, flags, tty); } -extern "C" JNIEXPORT void findmethod(const char* class_name_pattern, +extern "C" DEBUGEXPORT void findmethod(const char* class_name_pattern, const char* method_pattern, int flags) { Command c("findmethod"); ClassPrinter::print_flags_help(tty); @@ -552,7 +555,7 @@ extern "C" JNIEXPORT void findmethod(const char* class_name_pattern, } // Need method pointer to find bcp -extern "C" JNIEXPORT void findbcp(intptr_t method, intptr_t bcp) { +extern "C" DEBUGEXPORT void findbcp(intptr_t method, intptr_t bcp) { Command c("findbcp"); Method* mh = (Method*)method; if (!mh->is_native()) { @@ -563,7 +566,7 @@ extern "C" JNIEXPORT void findbcp(intptr_t method, intptr_t bcp) { } // check and decode a single u5 value -extern "C" JNIEXPORT u4 u5decode(intptr_t addr) { +extern "C" DEBUGEXPORT u4 u5decode(intptr_t addr) { Command c("u5decode"); u1* arr = (u1*)addr; size_t off = 0, lim = 5; @@ -580,7 +583,7 @@ extern "C" JNIEXPORT u4 u5decode(intptr_t addr) { // there is no limit on the count of items printed; the // printing stops when an null is printed or at limit. // See documentation for UNSIGNED5::Reader::print(count). -extern "C" JNIEXPORT intptr_t u5p(intptr_t addr, +extern "C" DEBUGEXPORT intptr_t u5p(intptr_t addr, intptr_t limit, int count) { Command c("u5p"); @@ -630,7 +633,7 @@ void help() { } #ifndef PRODUCT -extern "C" JNIEXPORT void pns(void* sp, void* fp, void* pc) { // print native stack +extern "C" DEBUGEXPORT void pns(void* sp, void* fp, void* pc) { // print native stack Command c("pns"); static char buf[O_BUFLEN]; Thread* t = Thread::current_or_null(); @@ -647,7 +650,7 @@ extern "C" JNIEXPORT void pns(void* sp, void* fp, void* pc) { // print native st // WARNING: Only intended for use when debugging. Do not leave calls to // pns2() in committed source (product or debug). // -extern "C" JNIEXPORT void pns2() { // print native stack +extern "C" DEBUGEXPORT void pns2() { // print native stack Command c("pns2"); static char buf[O_BUFLEN]; address lastpc = nullptr; From 8f0fb27decec28f32e4d88341237189ba4a340fb Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Fri, 1 Mar 2024 18:54:50 +0000 Subject: [PATCH 26/86] 8327136: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java fails on libgraal Reviewed-by: never, kevinw --- .../remote/mandatory/notif/NotifReconnectDeadlockTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java index 3f16ed00369..72ae5766307 100644 --- a/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java +++ b/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java @@ -176,7 +176,7 @@ public void handleNotification(Notification n, Object hb) { // serverTimeout increased to avoid occasional problems with initial connect. // Not using Utils.adjustTimeout to avoid accidentally making it too long. - private static final long serverTimeout = 2000; + private static final long serverTimeout = 3000; private static final long listenerSleep = serverTimeout*6; private volatile static String clientState = null; From 7f02f07f754c942735ba15d70858cd1661a658c0 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Fri, 1 Mar 2024 19:30:35 +0000 Subject: [PATCH 27/86] 8316708: Augment WorstCaseTests with more cases Reviewed-by: rgiulietti --- test/jdk/java/lang/Math/Tests.java | 10 +- test/jdk/java/lang/Math/WorstCaseTests.java | 151 +++++++++++++++++- test/jdk/java/lang/StrictMath/Atan2Tests.java | 21 ++- .../java/lang/StrictMath/CubeRootTests.java | 15 +- test/jdk/java/lang/StrictMath/ExpTests.java | 10 +- test/jdk/java/lang/StrictMath/Expm1Tests.java | 10 +- .../java/lang/StrictMath/HyperbolicTests.java | 17 +- test/jdk/java/lang/StrictMath/HypotTests.java | 7 +- .../lang/StrictMath/InverseTrigTests.java | 55 ++++++- test/jdk/java/lang/StrictMath/Log10Tests.java | 9 +- test/jdk/java/lang/StrictMath/Log1pTests.java | 11 +- test/jdk/java/lang/StrictMath/LogTests.java | 6 +- test/jdk/java/lang/StrictMath/TrigTests.java | 17 +- 13 files changed, 307 insertions(+), 32 deletions(-) diff --git a/test/jdk/java/lang/Math/Tests.java b/test/jdk/java/lang/Math/Tests.java index 60981e318e2..23b7098131b 100644 --- a/test/jdk/java/lang/Math/Tests.java +++ b/test/jdk/java/lang/Math/Tests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -88,10 +88,10 @@ public static String toHexString(double d) { * Return the floating-point value next larger in magnitude. */ public static double nextOut(double d) { - if (d > 0.0) - return Math.nextUp(d); + if (d != 0.0) + return (d > 0.0) ? Math.nextUp(d) : Math.nextDown(d); else - return -Math.nextUp(-d); + return Math.copySign(Double.MIN_VALUE, d); } /** @@ -108,7 +108,7 @@ public static double nextOut(double d) { *

  • If the argument is zero, then the result is -(228). * * - * @param f floating-point number whose exponent is to be extracted + * @param d floating-point number whose exponent is to be extracted * @return unbiased exponent of the argument. */ public static int ilogb(double d) { diff --git a/test/jdk/java/lang/Math/WorstCaseTests.java b/test/jdk/java/lang/Math/WorstCaseTests.java index 2cffa8fabfc..32e39479b4b 100644 --- a/test/jdk/java/lang/Math/WorstCaseTests.java +++ b/test/jdk/java/lang/Math/WorstCaseTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4900206 + * @bug 4900206 8316708 * @summary Test worst case behavior of exp, log, sin, cos, etc. * @build Tests * @build WorstCaseTests @@ -32,11 +32,22 @@ */ /** - * Use "Table Maker's Dilemma" results from Jean-Michel Muller and - * Vincent Lefèvre, to test the math library. See - * http://perso.ens-lyon.fr/jean-michel.muller/TMD.html for original + * This test contains two distinct kinds of worst-case inputs: + * + * 1) Exact numerical results that are nearly half-way between + * representable numbers or very close to a representable + * number. (Half-way cases are hardest for round to nearest even; + * close to a representable number cases are hard for directed + * roundings.) + * + * 2) Worst-case errors as observed empirically across different + * implementations that are not correctly rounded. + * + * For the first category, the "Table Maker's Dilemma" results from + * Jean-Michel Muller and Vincent Lefèvre, are used. + * See https://perso.ens-lyon.fr/jean-michel.muller/TMD.html for original * test vectors from 2000 and see - * http://perso.ens-lyon.fr/jean-michel.muller/TMDworstcases.pdf with + * https://perso.ens-lyon.fr/jean-michel.muller/TMDworstcases.pdf with * additional test vectors from 2003. The latter link also contains * some information about the methodology used to produce the test * vectors. @@ -52,6 +63,17 @@ * JDK implementation complies with a 1 ulp bound on the worst-case * values. Therefore, no addition leeway is afforded when testing * sinh and cosh. + * + * For the second category, worst-case observed error inputs for the + * FDLIBM-derived OpenLibm 0.8.1 and other math libraries are added + * from "Accuracy of Mathematical Functions in Single, Double, Double + * Extended, and Quadruple Precision" by Brian Gladman, Vincenzo + * Innocente and Paul Zimmermann. + * + * From https://openlibm.org/, "The OpenLibm code derives from the + * FreeBSD msun and OpenBSD libm implementations, which in turn derive + * from FDLIBM 5.3." Java's StrictMath libraries use the FDLIBM 5.3 + * algorithms. */ public class WorstCaseTests { private WorstCaseTests() {throw new AssertionError("No instances for you.");} @@ -77,6 +99,9 @@ public static void main(String... args) { } } + /* + * 1 ulp stated error bound + */ private static int testWorstExp() { int failures = 0; double [][] testCases = { @@ -113,6 +138,17 @@ private static int testWorstExp() { {+0x1.A8EAD058BC6B8p3, 0x1.1D71965F516ADp19}, {+0x1.1D5C2DAEBE367p4, 0x1.A8C02E974C314p25}, {+0x1.C44CE0D716A1Ap4, 0x1.B890CA8637AE1p40}, + + // Worst-case observed error for OpenLibm + {+0x1.2e8f20cf3cbe7p+8, 0x1.6a2a59cc78bf7p436}, + // Other worst-case observed errors + {-0x1.49f33ad2c1c58p+9, 0x1.f3ccc815431b5p-953}, + {+0x1.fce66609f7428p+5, 0x1.b59724cb0bc4cp91}, + {+0x1.b97dc8345c55p+5, 0x1.88ab482dafdd7p79}, + {-0x1.18209ecd19a8cp+6, 0x1.f3dcee4c90df9p-102}, + {-0x1.4133f4fd79c1cp-13, 0x1.ffebed256fadp-1}, + {-0x1.74046dfefd9d1p+9, 0x0.0000000000001p-1022}, + {-0x1.49f33ad2c1c58p+9, 0x1.f3ccc815431b5p-953}, }; for(double[] testCase: testCases) { @@ -130,6 +166,9 @@ private static int testExpCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstLog() { int failures = 0; double [][] testCases = { @@ -145,6 +184,19 @@ private static int testWorstLog() { {+0x17.F3825778AAAFp0, +0x3.2D0F907F5E00Cp+0}, {+0x1AC.50B409C8AEEp0, +0x6.0F52F37AECFCCp+0}, {+0x1.DE7CD6751029Ap16, +0x1.76E7E5D7B6EABp+3}, + + // Worst-case observed error for OpenLibm + {+0x1.48ae5a67204f5p+0, 0x1.ffd10abffc3fep-3}, + // Other worst-case observed errors + {+0x1.1211bef8f68e9p+0, +0x1.175caeca67f84p-4}, + {+0x1.008000db2e8bep+0, +0x1.ff83959f5cc1fp-10}, + {+0x1.0ffea3878db6bp+0, +0x1.f07a0cca521efp-5}, + {+0x1.dc0b586f2b26p-1, -0x1.2a3eaaa6e8d72p-4}, + {+0x1.490af72a25a81p-1, -0x1.c4bf7ae48f078p-2}, + {+0x1.5b6e7e4e96f86p+2, +0x1.b11240cba290dp0}, + {+0x1.0ffc349469a2fp+0, +0x1.f030c2507cd81p-5}, + {+0x1.69e7aa6da2df5p-1, -0x1.634508c9adfp-2}, + {+0x1.5556123e8a2bp-1, -0x1.9f300810f7d7cp-2}, }; for(double[] testCase: testCases) { @@ -162,6 +214,9 @@ private static int testLogCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstSin() { int failures = 0; double [][] testCases = { @@ -178,6 +233,19 @@ private static int testWorstSin() { {+0x1.921FB54442D18p-0, +0x1.FFFFFFFFFFFFFp-1}, {+0x1.6756745770A51p+1, +0x1.4FF350E412821p-2}, + + // Worst-case observed error for OpenLibm + {+0x1.4d84db080b9fdp+21, +0x1.6e21c4ff6aec3p-1}, + // Other worst-case observed errors + {-0x1.f8b791cafcdefp+4, -0x1.073ca87470df9p-3 }, + {-0x1.0e16eb809a35dp+944, +0x1.b5e361ed01dacp-2}, + {-0x1.85e624577c23ep-1, -0x1.614ac15b6df5ap-1}, + {-0x1.842d8ec8f752fp+21, -0x1.6ce864edeaffdp-1}, + {-0x1.07e4c92b5349dp+4, +0x1.6a096375ffb23p-1}, + {-0x1.13a5ccd87c9bbp+1008, -0x1.27b3964185d8dp-1}, + {-0x1.11b624b546894p+9, -0x1.6a35f2416aba8p-1}, + {-0x1.1c49ad613ff3bp+19, -0x1.fffe203cfabe1p-2}, + {-0x1.f05e952d81b89p+5, +0x1.6a2319a85a544p-1}, }; for(double[] testCase: testCases) { @@ -195,6 +263,9 @@ private static int testSinCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstAsin() { int failures = 0; double [][] testCases = { @@ -210,6 +281,18 @@ private static int testWorstAsin() { {+0x1.1ED06D50F7E88p-1, +0x1.30706F699466Dp-1}, {+0x1.D5B05A89D3E77p-1, +0x1.29517AB4C132Ap+0}, {+0x1.E264357EA0E29p-1, +0x1.3AA301F6EBB1Dp+0}, + + // Worst-case observed error for OpenLibm + {-0x1.004d1c5a9400bp-1, -0x1.0c6e322e8a28bp-1}, + // Other worst-case observed errors + {-0x1.0000045b2c904p-3, -0x1.00abe5252746cp-3}, + {+0x1.6c042a6378102p-1, +0x1.94eda53f72c5ap-1}, + {-0x1.00d44cccfa99p-1, -0x1.0d0a6a0e79e15p-1}, + {+0x1.eae75e3d82b6fp-2, +0x1.fff7d74b1ea4fp-2}, + {-0x1.0239000439deep-1, -0x1.0ea71ea2a7cd7p-1}, + {+0x1.0479b37d95e5cp-1, +0x1.1143fafdc5b2cp-1}, + {-0x1.2ef2481799c7cp-1, -0x1.442d10aa50906p-1}, + {+0x1.df27e1c764802p-2, +0x1.f2a0f0c96deefp-2}, }; for(double[] testCase: testCases) { @@ -227,6 +310,9 @@ private static int testAsinCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstCos() { int failures = 0; double [][] testCases = { @@ -243,6 +329,19 @@ private static int testWorstCos() { {+0x1.7CB7648526F99p-1, +0x1.78DAF01036D0Cp-1}, {+0x1.C65A170474549p-1, +0x1.434A3645BE208p-1}, {+0x1.6B8A6273D7C21p+0, +0x1.337FC5B072C52p-3}, + + // Worst-case observed error for OpenLibm + {-0x1.34e729fd08086p+21, +0x1.6a6a0d6a17f0fp-1}, + // Other worst-case observed errors + {-0x1.7120161c92674p+0, +0x1.0741fb7683849p-3}, + {-0x1.d19ebc5567dcdp+311, -0x1.b5d2f45f68958p-2}, + {+0x1.91e60af551108p-1, +0x1.6a32aaa34b118p-1}, + {-0x1.4ae182c1ab422p+21, -0x1.6c9c3831b6e3bp-1}, + {-0x1.34e729fd08086p+21, +0x1.6a6a0d6a17f0fp-1}, + {+0x1.2f29eb4e99fa2p+7, +0x1.6a0751dc5d2bbp-1}, + {-0x1.9200634d4471fp-1, +0x1.6a200b493230cp-1}, + {+0x1.25133ca3904dfp+20, -0x1.fb399cd6fe563p-3}, + {+0x1.2a33ae49ab15dp+1, -0x1.60524e89bbcb2p-1}, }; for(double[] testCase: testCases) { @@ -260,6 +359,9 @@ private static int testCosCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstAcos() { int failures = 0; double [][] testCases = { @@ -267,6 +369,18 @@ private static int testWorstAcos() { {+0x1.4182199998587p-1, +0x1.C8A538AE83D1Fp-1}, {+0x1.E45A1C93651ECp-1, +0x1.520DC553F6B23p-2}, {+0x1.F10FC61E2C78Fp-1, +0x1.EFEEF61D39AC1p-3}, + + // Worst-case observed error for OpenLibm + {-0x1.0068b067c6feep-1, +0x1.0c335e2f0726fp1}, + // Other worst-case observed errors + {+0x1.dffffb3488a4p-1, 0x1.6bf3a4a4f4dcbp-2}, + {+0x1.6c05eb219ec46p-1, 0x1.8f4f472807261p-1}, + {+0x1.35b03e336a82bp-1, 0x1.d7a84ec2f6707p-1}, + {-0x1.8d313198a2e03p-53, 0x1.921fb54442d19p0}, + {-0x1.010fd0ad6aa41p-1, 0x1.0c63a8cd23beep1}, + {+0x1.251869c3f7881p-1, 0x1.ec2ff0c102683p-1}, + {+0x1.266637a3d2bbcp-1, 0x1.ea98637533648p-1}, + {-0x1.36b1482765f6dp-1, 0x1.1c8666ca1cab1p1}, }; for(double[] testCase: testCases) { @@ -284,6 +398,9 @@ private static int testAcosCase(double input, double expected) { return failures; } + /* + * 1.25 ulp stated error bound + */ private static int testWorstTan() { int failures = 0; double [][] testCases = { @@ -296,6 +413,9 @@ private static int testWorstTan() { {+0x1.D696BFA988DB9p-2, +0x1.FAC71CD34EEA6p-2}, {+0x1.46AC372243536p-1, +0x1.7BA49F739829Ep-1}, {+0x0.A3561B9121A9Bp+0, +0x0.BDD24FB9CC14Fp+0}, + + // Worst-case observed error for OpenLibm, outside of 1 ulp error + // {0x1.3f9605aaeb51bp+21, -0x1.9678ee5d64934p-1}, // 1.02 }; for(double[] testCase: testCases) { @@ -313,6 +433,9 @@ private static int testTanCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstAtan() { int failures = 0; double [][] testCases = { @@ -328,6 +451,19 @@ private static int testWorstAtan() { {+0x1.7BA49F739829Fp-1, +0x1.46AC372243536p-1}, {+0x0.BDD24FB9CC14F8p+0, +0x0.A3561B9121A9Bp+0}, + + // Worst-case observed error + {0x1.62ff6a1682c25p-1, +0x1.3666b15c8756ap-1}, + // Other worst-case observed errors + {+0x1.f9004c4fef9eap-4, 0x1.f67727f5618f2p-4}, + {-0x1.ffff8020d3d1dp-7, -0x1.fff4d5e4886c7p-7}, + {+0x1.0103fc4ebaaa8p+1, 0x1.1bd5c375c97b5p0}, + {+0x1.01e0be37af68fp+1, 0x1.1c2d45ec82765p0}, + {-0x1.60370d15396b7p-1, -0x1.348461c347fd9p-1}, + {+0x1.032b4811f3dc5p+0, 0x1.9545fd233ee14p-1}, + {+0x1.52184b1b9bd9bp+0, 0x1.d86de33c93814p-1}, + {-0x1.0684fa9fa7481p+0, -0x1.988f9da70b11ap-1}, + }; for(double[] testCase: testCases) { @@ -345,6 +481,9 @@ private static int testAtanCase(double input, double expected) { return failures; } + /* + * 1 ulp stated error bound + */ private static int testWorstPow2() { int failures = 0; double [][] testCases = { diff --git a/test/jdk/java/lang/StrictMath/Atan2Tests.java b/test/jdk/java/lang/StrictMath/Atan2Tests.java index 4ef76b5ed66..c125119fee4 100644 --- a/test/jdk/java/lang/StrictMath/Atan2Tests.java +++ b/test/jdk/java/lang/StrictMath/Atan2Tests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -53,6 +53,7 @@ private Atan2Tests(){} public static void main(String... args) { int failures = 0; + failures += testAtan2(); failures += testAgainstTranslit(); if (failures > 0) { @@ -62,6 +63,24 @@ public static void main(String... args) { } } + private static int testAtan2() { + int failures = 0; + + // Empirical worst-case points in other libraries with larger + // worst-case errors than FDLIBM + double[][] testCases = { + {-0x0.00000000039a2p-1022, 0x0.000fdf02p-1022, -0x1.d0ce6fac85de9p-27}, + { 0x1.9173ea8221453p+842, 0x1.8c6f1b4b72f3ap+842, 0x1.9558272cbbdf9p-1}, + { 0x1.9cde4ff190e45p+931, 0x1.37d91467e558bp+931, 0x1.d909432d6f9c8p-1}, + { 0x1.401ec07d65549p+888, 0x1.3c3976605bb0cp+888, 0x1.95421cda9c65bp-1}, + }; + + for (double[] testCase : testCases) { + failures += testAtan2Case(testCase[0], testCase[1], testCase[2]); + } + return failures; + } + // Initialize shared random number generator private static java.util.Random random = RandomFactory.getRandom(); diff --git a/test/jdk/java/lang/StrictMath/CubeRootTests.java b/test/jdk/java/lang/StrictMath/CubeRootTests.java index 0423f1ff087..474a7760984 100644 --- a/test/jdk/java/lang/StrictMath/CubeRootTests.java +++ b/test/jdk/java/lang/StrictMath/CubeRootTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -50,7 +50,7 @@ public class CubeRootTests { private CubeRootTests(){} - public static void main(String [] argv) { + public static void main(String... args) { int failures = 0; failures += testCubeRoot(); @@ -470,7 +470,16 @@ static int testCubeRoot() { {0x0.0000000ffffffp-1022, 0x1.ffffff5555552p-351}, {0x0.0000ffffffap-1022, 0x1.ffffffcp-347}, {0x0.0000ffffffff8p-1022, 0x1.ffffffffaaaabp-347}, - {0x0.0fffffffffffbp-1022, 0x1.fffffffffffcbp-343} + {0x0.0fffffffffffbp-1022, 0x1.fffffffffffcbp-343}, + + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + { 0x1.7a337e1ba1ec2p-257, 0x1.6f59116ea884dp-86}, + { 0x0.7ffffffffffffp-1022, 0x1.fffffffffffffp-342}, + {-0x1.00ddafe7d9deep-885, -0x1.0049d002f249fp-295}, + { 0x1.fed1fe9f1122dp+11, 0x1.ff9b410e1f8b4p3}, + {-0x1.55cd285f321f6p-64, -0x1.bf7a40bced214p-22}, + { 0x1.fffb101d89c1dp-332, 0x1.965e9bf0fb7fbp-111}, }; for(double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/ExpTests.java b/test/jdk/java/lang/StrictMath/ExpTests.java index 45e1816da59..9f7d2d1ffd0 100644 --- a/test/jdk/java/lang/StrictMath/ExpTests.java +++ b/test/jdk/java/lang/StrictMath/ExpTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -79,6 +79,14 @@ static int testExp() { {Math.nextUp(EXP_OVERFLOW_THRESH), Double.POSITIVE_INFINITY}, {Math.nextDown(EXP_UNDERFLOW_THRESH), +0.0}, {EXP_UNDERFLOW_THRESH, +Double.MIN_VALUE}, + + // FDLIBM exp(1.0) does *not* return Math.E + {1.0, Math.nextUp(Math.E)}, + // Cases observed to differ between FDLIBM and other implementations. + {+0x1.2e8f20cf3cbe7p+8, 0x1.6a2a59cc78bf8p436}, + {-0x1.49f33ad2c1c58p+9, 0x1.f3ccc815431b6p-953}, + {+0x1.fce66609f7428p+5, 0x1.b59724cb0bc4cp91}, + {-0x1.49f33ad2c1c58p+9, 0x1.f3ccc815431b6p-953}, }; for(double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/Expm1Tests.java b/test/jdk/java/lang/StrictMath/Expm1Tests.java index fc2c5bbc813..7e5e9c8de67 100644 --- a/test/jdk/java/lang/StrictMath/Expm1Tests.java +++ b/test/jdk/java/lang/StrictMath/Expm1Tests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -863,6 +863,14 @@ private static int testExpm1() { {0x1.619ffffffdccep9, 0x1.45663d67095d1p1020}, {0x1.621ffffffdccep9, 0x1.ba437b80a6915p1021}, {0x1.629ffffffdccep9, 0x1.2c8c9d8cda0c8p1023}, + + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + { 0x1.63be411e096ep-2, 0x1.a95c1f32ed8d5p-2}, + {-0x1.62d7c116d2e32p-1, -0x1.fff3910089df7p-2}, + { 0x1.633f993a730c9p-2, 0x1.a8a8e5d1e41ccp-2}, + { 0x1.a0e95d59498e9p-2, 0x1.01499d91804bdp-1}, + { 0x1.632cfb1033275p-2, 0x1.a88e8f5550a34p-2}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/HyperbolicTests.java b/test/jdk/java/lang/StrictMath/HyperbolicTests.java index 0314abace7b..68e6a27124c 100644 --- a/test/jdk/java/lang/StrictMath/HyperbolicTests.java +++ b/test/jdk/java/lang/StrictMath/HyperbolicTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -340,6 +340,11 @@ private static int testSinh() { {0x1.fffffffffff68p4, 0x1.1f43fcc4b5b83p45}, {0x1.fffffffffffd4p4, 0x1.1f43fcc4b6316p45}, {0x1.0p5, 0x1.1f43fcc4b662cp45}, + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {-0x1.633c654fee2bap+9, -0x1.fdf25fc26e7cp1023}, + {-0x1.633cae1335f26p+9, -0x1.ff149489e50a1p1023}, + { 0x1.9fcba01feb507p-2, 0x1.ab50d8e4d8c56p-2}, }; for (double[] testCase: testCases) @@ -381,6 +386,13 @@ private static int testCosh() { {0x1.0p4, 0x1.0f2ebd0a8005cp22}, {0x1.fffffffffffd4p4, 0x1.1f43fcc4b6316p45}, {0x1.0p5, 0x1.1f43fcc4b662cp45}, + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {-0x1.633c654fee2bap+9, 0x1.fdf25fc26e7cp1023}, + { 0x1.ff76fb3f476d5p+0, 0x1.e0976c8f0ebdfp1}, + { 0x1.633cc2ae1c934p+9, 0x1.ff66e0de4dc6fp1023}, + {-0x1.1ff088806d82ep+3, 0x1.f97ccb0aef314p11}, + {-0x1.628af341989dap+9, 0x1.fdf28623ef923p1021}, }; for (double[] testCase: testCases) @@ -450,6 +462,9 @@ private static int testTanh() { {0x1.fffffffffffe1p0, 0x1.ed9505e1bc3cfp-1}, {0x1.ffffffffffed8p1, 0x1.ffa81708a0b4p-1}, {0x1.fffffffffff92p1, 0x1.ffa81708a0b41p-1}, + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {-0x1.c41e527b70f43p-3, -0x1.bcea047cc736cp-3}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/HypotTests.java b/test/jdk/java/lang/StrictMath/HypotTests.java index c714dcf1499..bc7d44102a2 100644 --- a/test/jdk/java/lang/StrictMath/HypotTests.java +++ b/test/jdk/java/lang/StrictMath/HypotTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -705,6 +705,11 @@ static int testHypot() { {0x0.0000000000001p-1022, 0x0.0000000000001p-1022, 0x0.0000000000001p-1022}, {0x0.0000000000002p-1022, 0x0.0000000000001p-1022, 0x0.0000000000002p-1022}, {0x0.0000000000003p-1022, 0x0.0000000000002p-1022, 0x0.0000000000004p-1022}, + + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {0x0.fffffffffffffp-1022, 0x0.0000000000001p-1022, 0x0.fffffffffffffp-1022}, + {0x1.41fcfeeb2e246p+420, 0x1.8d4d41eacdeccp+420, 0x1.ff65325de5517p420}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/InverseTrigTests.java b/test/jdk/java/lang/StrictMath/InverseTrigTests.java index ca5bc59d2c9..9f92cae6bc4 100644 --- a/test/jdk/java/lang/StrictMath/InverseTrigTests.java +++ b/test/jdk/java/lang/StrictMath/InverseTrigTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -56,9 +56,9 @@ public static void main(String... args) { failures += testAgainstTranslitCommon(); - failures += testAgainstTranslitAsin(); - failures += testAgainstTranslitAcos(); - failures += testAgainstTranslitAtan(); + failures += testAsin(); + failures += testAcos(); + failures += testAtan(); if (failures > 0) { System.err.println("Testing the inverse trig functions incurred " @@ -113,7 +113,7 @@ private static int testAgainstTranslitCommon() { /** * Test StrictMath.asin against transliteration port of asin. */ - private static int testAgainstTranslitAsin() { + private static int testAsin() { int failures = 0; // Probe near decision points in the FDLIBM algorithm. @@ -132,13 +132,25 @@ private static int testAgainstTranslitAsin() { failures += testRangeMidpoint(testPoint, Math.ulp(testPoint), 1000, InverseTrigTest.ASIN); } + // Empirical worst-case points in other libraries with larger + // worst-case error than FDLIBM + double [][] testCases = { + {-0x1.00d44cccfa99p-1, -0x1.0d0a6a0e79e15p-1}, + {-0x1.0239000439deep-1, -0x1.0ea71ea2a7cd7p-1}, + {+0x1.0479b37d95e5cp-1, 0x1.1143fafdc5b2cp-1}, + {-0x1.2ef2481799c7cp-1, -0x1.442d10aa50906p-1}, + }; + for (double[] testCase : testCases) { + failures += testAsinCase(testCase[0], testCase[1]); + } + return failures; } /** * Test StrictMath.acos against transliteration port of acos. */ - private static int testAgainstTranslitAcos() { + private static int testAcos() { int failures = 0; // Probe near decision points in the FDLIBM algorithm. @@ -154,13 +166,26 @@ private static int testAgainstTranslitAcos() { failures += testRangeMidpoint(testPoint, Math.ulp(testPoint), 1000, InverseTrigTest.ACOS); } + // Empirical worst-case points in other libraries with larger + // worst-case error than FDLIBM + double [][] testCases = { + {+0x1.35b03e336a82bp-1, 0x1.d7a84ec2f6707p-1}, + {-0x1.8d313198a2e03p-53, 0x1.921fb54442d19p0}, + {-0x1.010fd0ad6aa41p-1, 0x1.0c63a8cd23befp1}, + {+0x1.251869c3f7881p-1, 0x1.ec2ff0c102684p-1}, + {+0x1.266637a3d2bbcp-1, 0x1.ea98637533648p-1}, + }; + for (double[] testCase : testCases) { + failures += testAcosCase(testCase[0], testCase[1]); + } + return failures; } /** * Test StrictMath.atan against transliteration port of atan */ - private static int testAgainstTranslitAtan() { + private static int testAtan() { int failures = 0; // Probe near decision points in the FDLIBM algorithm. @@ -177,7 +202,21 @@ private static int testAgainstTranslitAtan() { }; for (double testPoint : decisionPoints) { - failures += testRangeMidpoint(testPoint, Math.ulp(testPoint), 1000, InverseTrigTest.ATAN); + failures += testRangeMidpoint(testPoint, Math.ulp(testPoint), 1000, InverseTrigTest.ATAN); + } + + // Empirical worst-case points in other libraries with larger + // worst-case error than FDLIBM + double [][] testCases = { + {+0x1.0103fc4ebaaa8p+1, 0x1.1bd5c375c97b5p0}, + {+0x1.01e0be37af68fp+1, 0x1.1c2d45ec82765p0}, + {-0x1.60370d15396b7p-1, -0x1.348461c347fd9p-1}, + {+0x1.032b4811f3dc5p+0, 0x1.9545fd233ee14p-1}, + {+0x1.52184b1b9bd9bp+0, 0x1.d86de33c93814p-1}, + {-0x1.0684fa9fa7481p+0, -0x1.988f9da70b11ap-1}, + }; + for (double[] testCase : testCases) { + failures += testAtanCase(testCase[0], testCase[1]); } return failures; diff --git a/test/jdk/java/lang/StrictMath/Log10Tests.java b/test/jdk/java/lang/StrictMath/Log10Tests.java index 33aec723ec8..6cd8427c438 100644 --- a/test/jdk/java/lang/StrictMath/Log10Tests.java +++ b/test/jdk/java/lang/StrictMath/Log10Tests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -721,6 +721,13 @@ static int testLog10() { {0x1.3fffffffffadfp25, 0x1.e7d9a8edb474dp2}, {0x1.3fffffffffebdp25, 0x1.e7d9a8edb47a2p2}, {0x1.4p25, 0x1.e7d9a8edb47bfp2}, + + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {0x1.de02157073b31p-1, -0x1.e8cfabf160ec6p-6}, + {0x1.10fdf4211fd45p+0, 0x1.c946e0d48c148p-6}, + {0x1.55535a0140a21p+0, 0x1.ffb56ebe85597p-4}, + {0x1.803dea263187fp-1, -0x1.fea1086f5a316p-4}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/Log1pTests.java b/test/jdk/java/lang/StrictMath/Log1pTests.java index 4f987b4af16..b8a8592812f 100644 --- a/test/jdk/java/lang/StrictMath/Log1pTests.java +++ b/test/jdk/java/lang/StrictMath/Log1pTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -209,6 +209,15 @@ static int testLog1p() { {0x1.7688bb5394bd3p325, 0x1.c34e8276daa48p7}, {0x1.d42aea2878b45p328, 0x1.c7e96ee5c7f87p7}, {0x1.249ad2594989p332, 0x1.cc845b54b54a6p7}, + + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {-0x1.2bf183e0344b2p-2, -0x1.62ebb44459d79p-2}, + {-0x1.2bf32aaf122e2p-2, -0x1.62ee0a3a4baf9p-2}, + {-0x1.8000000000000p-53, -0x1.8000000000001p-53}, + {-0x1.2e496d25897ecp-2, -0x1.663d81cb08f56p-2}, + {-0x1.ffffffbaefe27p-2, -0x1.62e42faa93817p-1}, + {-0x1.5efad5491a79bp-1022, -0x1.5efad5491a79bp-1022}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/LogTests.java b/test/jdk/java/lang/StrictMath/LogTests.java index a3e29b5cd08..05b91c60c14 100644 --- a/test/jdk/java/lang/StrictMath/LogTests.java +++ b/test/jdk/java/lang/StrictMath/LogTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -68,6 +68,10 @@ static int testLog() { {0x1.0000000744b3ap632, 0x1.b611ab2bd53cep8}, {0x1.000000037d81fp766, 0x1.0979b1dbc4a42p9}, {0x1.000000024028p991, 0x1.577455642bb92p9}, + // Empirical worst-case points + {0x1.0ffea3878db6bp+0, 0x1.f07a0cca521fp-5}, + {0x1.490af72a25a81p-1, -0x1.c4bf7ae48f078p-2}, + {0x1.69e7aa6da2df5p-1, -0x1.634508c9adfp-2}, }; for (double[] testCase: testCases) diff --git a/test/jdk/java/lang/StrictMath/TrigTests.java b/test/jdk/java/lang/StrictMath/TrigTests.java index 369b1c2aef9..c4f7dab547f 100644 --- a/test/jdk/java/lang/StrictMath/TrigTests.java +++ b/test/jdk/java/lang/StrictMath/TrigTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -164,6 +164,11 @@ private static int testAgainstTranslitSin() { {0x1.00000000000fcp299, 0x1.78ad2fd7aef78p-1}, {0x1.0000000000002p300, -0x1.1adaf3550facp-1}, {0x1.00000000001afp1023, 0x1.d1c804ef2eeccp-1}, + // Empirical worst-case points + {-0x1.f8b791cafcdefp+4, -0x1.073ca87470dfap-3}, + {-0x1.0e16eb809a35dp+944, 0x1.b5e361ed01dadp-2}, + {-0x1.842d8ec8f752fp+21, -0x1.6ce864edeaffep-1}, + {-0x1.1c49ad613ff3bp+19, -0x1.fffe203cfabe1p-2}, }; for (double[] testCase: testCases) { @@ -265,7 +270,15 @@ private static int testAgainstTranslitTan() { {0x1.000000000011cp299, 0x1.8a6f42eaa3d1fp0}, {0x1.000000000001cp300, -0x1.b30fc9f73002cp-1}, {0x1.0000000000013p500, -0x1.c4e46751be12cp-1}, - {0x1.00000000000ep1023, -0x1.d52c4ec04f108p-2} + {0x1.00000000000ep1023, -0x1.d52c4ec04f108p-2}, + // Empirical worst-case points in other libraries with + // larger worst-case errors than FDLIBM + {+0x1.371a47b7e4eb2p+11, 0x1.9ded57c9ff46ap-1}, + {-0x1.a81d98fc58537p+6 , 0x1.ffd83332326fdp-1}, + {-0x1.13a5ccd87c9bbp+1008, -0x1.6a3815320e5cfp-1}, + {-0x1.4d7c8b8320237p+11, -0x1.9dec1f1b36ecdp-1}, + {+0x1.da7a85a88bbecp+11, 0x1.ff7ae7631230ep-1}, + {-0x1.66af736e8555p+18, -0x1.fc3d1cb02536bp-1}, }; for (double[] testCase: testCases) { From a9c17a22ca8e64d12e28e272e3f4845297290854 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Sat, 2 Mar 2024 01:44:25 +0000 Subject: [PATCH 28/86] 8327108: compiler.lib.ir_framework.shared.TestFrameworkSocket should listen on loopback address only Reviewed-by: chagedorn, kvn --- .../lib/ir_framework/shared/TestFrameworkSocket.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java index 988df309718..c59f432f5ff 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, 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 @@ -29,6 +29,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.util.concurrent.ExecutionException; @@ -47,7 +49,6 @@ public class TestFrameworkSocket implements AutoCloseable { private static final int SERVER_PORT = Integer.getInteger(SERVER_PORT_PROPERTY, -1); private static final boolean REPRODUCE = Boolean.getBoolean("Reproduce"); - private static final String HOSTNAME = null; private static Socket clientSocket = null; private static PrintWriter clientWriter = null; @@ -58,7 +59,8 @@ public class TestFrameworkSocket implements AutoCloseable { public TestFrameworkSocket() { try { - serverSocket = new ServerSocket(0); + serverSocket = new ServerSocket(); + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); } catch (IOException e) { throw new TestFrameworkException("Failed to create TestFramework server socket", e); } @@ -132,7 +134,7 @@ public static void write(String msg, String tag, boolean stdout) { try { // Keep the client socket open until the test VM terminates (calls closeClientSocket before exiting main()). if (clientSocket == null) { - clientSocket = new Socket(HOSTNAME, SERVER_PORT); + clientSocket = new Socket(InetAddress.getLoopbackAddress(), SERVER_PORT); clientWriter = new PrintWriter(clientSocket.getOutputStream(), true); } if (stdout) { From f68a4b9fc4b0add186754465bbeb908b8362be8d Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Sat, 2 Mar 2024 01:45:36 +0000 Subject: [PATCH 29/86] 8327105: compiler.compilercontrol.share.scenario.Executor should listen on loopback address only Reviewed-by: chagedorn, kvn --- .../compiler/compilercontrol/share/actions/BaseAction.java | 4 ++-- .../compiler/compilercontrol/share/scenario/Executor.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java b/test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java index 424e7e80ad0..67e4263d3ae 100644 --- a/test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java +++ b/test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -87,7 +87,7 @@ protected void communicate(String[] args) { System.out.println("INFO: Client connection port = " + port); List lines; try ( - Socket socket = new Socket(InetAddress.getLocalHost(), port); + Socket socket = new Socket(InetAddress.getLoopbackAddress(), port); BufferedReader in = new BufferedReader( new InputStreamReader(socket.getInputStream())); PrintWriter out = new PrintWriter( diff --git a/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java index 799fabf9509..9b5b68b98c7 100644 --- a/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java +++ b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -36,6 +36,8 @@ import java.io.InputStreamReader; import java.io.PrintWriter; import java.lang.reflect.Executable; +import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; @@ -80,8 +82,9 @@ public List execute() { // Add class name that would be executed in a separate VM vmOptions.add(execClass); OutputAnalyzer output; - try (ServerSocket serverSocket = new ServerSocket(0)) { + try (ServerSocket serverSocket = new ServerSocket()) { { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); // Get port test VM will connect to int port = serverSocket.getLocalPort(); if (port == -1) { From f62f2adbc3ec3cf8a9a59d3d766c60d11ebd77e2 Mon Sep 17 00:00:00 2001 From: "Y. Srinivas Ramakrishna" Date: Sat, 2 Mar 2024 02:02:09 +0000 Subject: [PATCH 30/86] 8325671: Shenandoah: Introduce a ShenandoahGenerationType and templatize certain marking closures with it In support of eventually supporting a generational version of Shenandoah, we introduce a ShenandoahGenerationType enum which currently has a single NON_GEN value for Shenandoah. The generational extension of Shenandoah will introduce additional enum values when GenShen is integrated. These will be used to specialize certain marking closures via templatization, such that suitable variations of the marking (and in the future other) closures can be used for the generational and non-generational variants of the collector while minimizing interference between the two variants while maximizing code-sharing without affecting correctness or performance. This ticket introduces the new enum type and templatizes certain existing marking closures. In effect, this should be semantically a no-op for current (non-generational) Shenandoah and ideally completely performance-neutral (to be established via measurements). **Testing:** - [x] jtreg hotspot_gc - [x] github actions - [ ] codepipeline perf & stress: in progress **Performance:** - [ ] specjbb w/shenandoah - [ ] codepipeline perf: in progress Reviewed-by: kdnilsen, shade --- .../shenandoah/shenandoahConcurrentMark.cpp | 27 ++++++------ .../shenandoah/shenandoahConcurrentMark.hpp | 7 +++- .../shenandoah/shenandoahGenerationType.hpp | 42 +++++++++++++++++++ .../share/gc/shenandoah/shenandoahMark.cpp | 39 ++++++++++------- .../share/gc/shenandoah/shenandoahMark.hpp | 15 ++++--- .../gc/shenandoah/shenandoahMark.inline.hpp | 10 +++-- .../gc/shenandoah/shenandoahOopClosures.hpp | 11 +++-- .../shenandoahOopClosures.inline.hpp | 8 ++-- .../share/gc/shenandoah/shenandoahSTWMark.cpp | 15 ++++--- 9 files changed, 121 insertions(+), 53 deletions(-) create mode 100644 src/hotspot/share/gc/shenandoah/shenandoahGenerationType.hpp diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp index f3c72dfc0b1..fa37fcbcfd3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp @@ -44,6 +44,7 @@ #include "runtime/continuation.hpp" #include "runtime/threads.hpp" +template class ShenandoahConcurrentMarkingTask : public WorkerTask { private: ShenandoahConcurrentMark* const _cm; @@ -61,8 +62,7 @@ class ShenandoahConcurrentMarkingTask : public WorkerTask { ShenandoahReferenceProcessor* rp = heap->ref_processor(); assert(rp != nullptr, "need reference processor"); StringDedup::Requests requests; - _cm->mark_loop(worker_id, _terminator, rp, - true /*cancellable*/, + _cm->mark_loop(worker_id, _terminator, rp, GENERATION, true /*cancellable*/, ShenandoahStringDedup::is_enabled() ? ENQUEUE_DEDUP : NO_DEDUP, &requests); } @@ -90,6 +90,7 @@ class ShenandoahSATBAndRemarkThreadsClosure : public ThreadClosure { } }; +template class ShenandoahFinalMarkingTask : public WorkerTask { private: ShenandoahConcurrentMark* _cm; @@ -112,18 +113,17 @@ class ShenandoahFinalMarkingTask : public WorkerTask { { ShenandoahObjToScanQueue* q = _cm->get_queue(worker_id); - ShenandoahSATBBufferClosure cl(q); + ShenandoahSATBBufferClosure cl(q); SATBMarkQueueSet& satb_mq_set = ShenandoahBarrierSet::satb_mark_queue_set(); while (satb_mq_set.apply_closure_to_completed_buffer(&cl)) {} assert(!heap->has_forwarded_objects(), "Not expected"); - ShenandoahMarkRefsClosure mark_cl(q, rp); + ShenandoahMarkRefsClosure mark_cl(q, rp); ShenandoahSATBAndRemarkThreadsClosure tc(satb_mq_set, ShenandoahIUBarrier ? &mark_cl : nullptr); Threads::possibly_parallel_threads_do(true /* is_par */, &tc); } - _cm->mark_loop(worker_id, _terminator, rp, - false /*not cancellable*/, + _cm->mark_loop(worker_id, _terminator, rp, GENERATION, false /*not cancellable*/, _dedup_string ? ENQUEUE_DEDUP : NO_DEDUP, &requests); assert(_cm->task_queues()->is_empty(), "Should be empty"); @@ -134,6 +134,7 @@ ShenandoahConcurrentMark::ShenandoahConcurrentMark() : ShenandoahMark() {} // Mark concurrent roots during concurrent phases +template class ShenandoahMarkConcurrentRootsTask : public WorkerTask { private: SuspendibleThreadSetJoiner _sts_joiner; @@ -149,7 +150,8 @@ class ShenandoahMarkConcurrentRootsTask : public WorkerTask { void work(uint worker_id); }; -ShenandoahMarkConcurrentRootsTask::ShenandoahMarkConcurrentRootsTask(ShenandoahObjToScanQueueSet* qs, +template +ShenandoahMarkConcurrentRootsTask::ShenandoahMarkConcurrentRootsTask(ShenandoahObjToScanQueueSet* qs, ShenandoahReferenceProcessor* rp, ShenandoahPhaseTimings::Phase phase, uint nworkers) : @@ -160,10 +162,11 @@ ShenandoahMarkConcurrentRootsTask::ShenandoahMarkConcurrentRootsTask(ShenandoahO assert(!ShenandoahHeap::heap()->has_forwarded_objects(), "Not expected"); } -void ShenandoahMarkConcurrentRootsTask::work(uint worker_id) { +template +void ShenandoahMarkConcurrentRootsTask::work(uint worker_id) { ShenandoahConcurrentWorkerSession worker_session(worker_id); ShenandoahObjToScanQueue* q = _queue_set->queue(worker_id); - ShenandoahMarkRefsClosure cl(q, _rp); + ShenandoahMarkRefsClosure cl(q, _rp); _root_scanner.roots_do(&cl, worker_id); } @@ -176,7 +179,7 @@ void ShenandoahConcurrentMark::mark_concurrent_roots() { WorkerThreads* workers = heap->workers(); ShenandoahReferenceProcessor* rp = heap->ref_processor(); task_queues()->reserve(workers->active_workers()); - ShenandoahMarkConcurrentRootsTask task(task_queues(), rp, ShenandoahPhaseTimings::conc_mark_roots, workers->active_workers()); + ShenandoahMarkConcurrentRootsTask task(task_queues(), rp, ShenandoahPhaseTimings::conc_mark_roots, workers->active_workers()); workers->run_task(&task); } @@ -204,7 +207,7 @@ void ShenandoahConcurrentMark::concurrent_mark() { ShenandoahFlushSATBHandshakeClosure flush_satb(qset); for (uint flushes = 0; flushes < ShenandoahMaxSATBBufferFlushes; flushes++) { TaskTerminator terminator(nworkers, task_queues()); - ShenandoahConcurrentMarkingTask task(this, &terminator); + ShenandoahConcurrentMarkingTask task(this, &terminator); workers->run_task(&task); if (heap->cancelled_gc()) { @@ -254,7 +257,7 @@ void ShenandoahConcurrentMark::finish_mark_work() { StrongRootsScope scope(nworkers); TaskTerminator terminator(nworkers, task_queues()); - ShenandoahFinalMarkingTask task(this, &terminator, ShenandoahStringDedup::is_enabled()); + ShenandoahFinalMarkingTask task(this, &terminator, ShenandoahStringDedup::is_enabled()); heap->workers()->run_task(&task); assert(task_queues()->is_empty(), "Should be empty"); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp index fbcd075117a..b658e42dfb8 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp @@ -25,14 +25,17 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP +#include "gc/shenandoah/shenandoahGenerationType.hpp" #include "gc/shenandoah/shenandoahMark.hpp" +template class ShenandoahConcurrentMarkingTask; +template class ShenandoahFinalMarkingTask; class ShenandoahConcurrentMark: public ShenandoahMark { - friend class ShenandoahConcurrentMarkingTask; - friend class ShenandoahFinalMarkingTask; + template friend class ShenandoahConcurrentMarkingTask; + template friend class ShenandoahFinalMarkingTask; public: ShenandoahConcurrentMark(); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationType.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationType.hpp new file mode 100644 index 00000000000..1132fd5eb4d --- /dev/null +++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationType.hpp @@ -0,0 +1,42 @@ +/* + * Copyright Amazon.com Inc. 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. + * + * 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. + * + */ + +#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONTYPE_HPP +#define SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONTYPE_HPP + +enum ShenandoahGenerationType { + NON_GEN // non-generational +}; + +inline const char* shenandoah_generation_name(ShenandoahGenerationType mode) { + switch (mode) { + case NON_GEN: + return "Non-Generational"; + default: + ShouldNotReachHere(); + return "Unknown"; + } +} + +#endif // SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONTYPE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp index 4725b8c3dfa..4c45f4a7659 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp @@ -66,7 +66,7 @@ void ShenandoahMark::clear() { ShenandoahBarrierSet::satb_mark_queue_set().abandon_partial_marking(); } -template +template void ShenandoahMark::mark_loop_prework(uint w, TaskTerminator *t, ShenandoahReferenceProcessor *rp, StringDedup::Requests* const req) { ShenandoahObjToScanQueue* q = get_queue(w); @@ -76,48 +76,55 @@ void ShenandoahMark::mark_loop_prework(uint w, TaskTerminator *t, ShenandoahRefe // TODO: We can clean up this if we figure out how to do templated oop closures that // play nice with specialized_oop_iterators. if (heap->has_forwarded_objects()) { - using Closure = ShenandoahMarkUpdateRefsClosure; + using Closure = ShenandoahMarkUpdateRefsClosure; Closure cl(q, rp); - mark_loop_work(&cl, ld, w, t, req); + mark_loop_work(&cl, ld, w, t, req); } else { - using Closure = ShenandoahMarkRefsClosure; + using Closure = ShenandoahMarkRefsClosure; Closure cl(q, rp); - mark_loop_work(&cl, ld, w, t, req); + mark_loop_work(&cl, ld, w, t, req); } heap->flush_liveness_cache(w); } +template void ShenandoahMark::mark_loop(uint worker_id, TaskTerminator* terminator, ShenandoahReferenceProcessor *rp, - bool cancellable, StringDedupMode dedup_mode, StringDedup::Requests* const req) { + ShenandoahGenerationType generation, StringDedup::Requests* const req) { + mark_loop_prework(worker_id, terminator, rp, req); +} + +void ShenandoahMark::mark_loop(uint worker_id, TaskTerminator* terminator, ShenandoahReferenceProcessor *rp, + ShenandoahGenerationType generation, bool cancellable, StringDedupMode dedup_mode, + StringDedup::Requests* const req) { if (cancellable) { switch(dedup_mode) { case NO_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; case ENQUEUE_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; case ALWAYS_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; } } else { switch(dedup_mode) { case NO_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; case ENQUEUE_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; case ALWAYS_DEDUP: - mark_loop_prework(worker_id, terminator, rp, req); + mark_loop(worker_id, terminator, rp, generation, req); break; } } } -template +template void ShenandoahMark::mark_loop_work(T* cl, ShenandoahLiveData* live_data, uint worker_id, TaskTerminator *terminator, StringDedup::Requests* const req) { uintx stride = ShenandoahMarkLoopStride; @@ -146,7 +153,7 @@ void ShenandoahMark::mark_loop_work(T* cl, ShenandoahLiveData* live_data, uint w for (uint i = 0; i < stride; i++) { if (q->pop(t)) { - do_task(q, cl, live_data, req, &t); + do_task(q, cl, live_data, req, &t); } else { assert(q->is_empty(), "Must be empty"); q = queues->claim_next(); @@ -156,7 +163,7 @@ void ShenandoahMark::mark_loop_work(T* cl, ShenandoahLiveData* live_data, uint w } q = get_queue(worker_id); - ShenandoahSATBBufferClosure drain_satb(q); + ShenandoahSATBBufferClosure drain_satb(q); SATBMarkQueueSet& satb_mq_set = ShenandoahBarrierSet::satb_mark_queue_set(); /* @@ -175,7 +182,7 @@ void ShenandoahMark::mark_loop_work(T* cl, ShenandoahLiveData* live_data, uint w for (uint i = 0; i < stride; i++) { if (q->pop(t) || queues->steal(worker_id, t)) { - do_task(q, cl, live_data, req, &t); + do_task(q, cl, live_data, req, &t); work++; } else { break; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp index 8731aa7a068..fab913bfd94 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp @@ -27,6 +27,7 @@ #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shared/taskTerminator.hpp" +#include "gc/shenandoah/shenandoahGenerationType.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahTaskqueue.hpp" @@ -50,7 +51,7 @@ class ShenandoahMark: public StackObj { ShenandoahMark(); public: - template + template static inline void mark_through_ref(T* p, ShenandoahObjToScanQueue* q, ShenandoahMarkingContext* const mark_context, bool weak); static void clear(); @@ -65,7 +66,7 @@ class ShenandoahMark: public StackObj { // ---------- Marking loop and tasks private: - template + template inline void do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, StringDedup::Requests* const req, ShenandoahMarkTask* task); template @@ -74,19 +75,23 @@ class ShenandoahMark: public StackObj { template inline void do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, oop array, int chunk, int pow, bool weak); + template inline void count_liveness(ShenandoahLiveData* live_data, oop obj); - template + template void mark_loop_work(T* cl, ShenandoahLiveData* live_data, uint worker_id, TaskTerminator *t, StringDedup::Requests* const req); - template + template void mark_loop_prework(uint worker_id, TaskTerminator *terminator, ShenandoahReferenceProcessor *rp, StringDedup::Requests* const req); template inline void dedup_string(oop obj, StringDedup::Requests* const req); protected: + template void mark_loop(uint worker_id, TaskTerminator* terminator, ShenandoahReferenceProcessor *rp, - bool cancellable, StringDedupMode dedup_mode, StringDedup::Requests* const req); + ShenandoahGenerationType generation, StringDedup::Requests* const req); + void mark_loop(uint worker_id, TaskTerminator* terminator, ShenandoahReferenceProcessor *rp, + ShenandoahGenerationType generation, bool cancellable, StringDedupMode dedup_mode, StringDedup::Requests* const req); }; #endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARK_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp index 9ca7272815f..99995c469eb 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp @@ -57,7 +57,7 @@ void ShenandoahMark::dedup_string(oop obj, StringDedup::Requests* const req) { } } -template +template void ShenandoahMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, StringDedup::Requests* const req, ShenandoahMarkTask* task) { oop obj = task->obj(); @@ -95,7 +95,7 @@ void ShenandoahMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveD // Avoid double-counting objects that are visited twice due to upgrade // from final- to strong mark. if (task->count_liveness()) { - count_liveness(live_data, obj); + count_liveness(live_data, obj); } } else { // Case 4: Array chunk, has sensible chunk id. Process it. @@ -103,6 +103,7 @@ void ShenandoahMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveD } } +template inline void ShenandoahMark::count_liveness(ShenandoahLiveData* live_data, oop obj) { ShenandoahHeap* const heap = ShenandoahHeap::heap(); size_t region_idx = heap->heap_region_index_containing(obj); @@ -230,6 +231,7 @@ inline void ShenandoahMark::do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, array->oop_iterate_range(cl, from, to); } +template class ShenandoahSATBBufferClosure : public SATBBufferClosure { private: ShenandoahObjToScanQueue* _queue; @@ -247,12 +249,12 @@ class ShenandoahSATBBufferClosure : public SATBBufferClosure { assert(size == 0 || !_heap->has_forwarded_objects(), "Forwarded objects are not expected here"); for (size_t i = 0; i < size; ++i) { oop *p = (oop *) &buffer[i]; - ShenandoahMark::mark_through_ref(p, _queue, _mark_context, false); + ShenandoahMark::mark_through_ref(p, _queue, _mark_context, false); } } }; -template +template inline void ShenandoahMark::mark_through_ref(T* p, ShenandoahObjToScanQueue* q, ShenandoahMarkingContext* const mark_context, bool weak) { T o = RawAccess<>::oop_load(p); if (!CompressedOops::is_null(o)) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp index d8aad6ab6f0..e433c2910c8 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp @@ -27,6 +27,7 @@ #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shenandoah/shenandoahClosures.inline.hpp" +#include "gc/shenandoah/shenandoahGenerationType.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" @@ -40,7 +41,7 @@ class ShenandoahMarkRefsSuperClosure : public MetadataVisitingOopIterateClosure bool _weak; protected: - template + template void work(T *p); public: @@ -64,7 +65,7 @@ class ShenandoahMarkUpdateRefsSuperClosure : public ShenandoahMarkRefsSuperClosu protected: ShenandoahHeap* const _heap; - template + template inline void work(T* p); public: @@ -75,10 +76,11 @@ class ShenandoahMarkUpdateRefsSuperClosure : public ShenandoahMarkRefsSuperClosu }; }; +template class ShenandoahMarkUpdateRefsClosure : public ShenandoahMarkUpdateRefsSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahMarkUpdateRefsClosure(ShenandoahObjToScanQueue* q, ShenandoahReferenceProcessor* rp) : @@ -88,10 +90,11 @@ class ShenandoahMarkUpdateRefsClosure : public ShenandoahMarkUpdateRefsSuperClos virtual void do_oop(oop* p) { do_oop_work(p); } }; +template class ShenandoahMarkRefsClosure : public ShenandoahMarkRefsSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahMarkRefsClosure(ShenandoahObjToScanQueue* q, ShenandoahReferenceProcessor* rp) : diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp index 1812b4e8f05..70d7e94fb50 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp @@ -30,18 +30,18 @@ #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahMark.inline.hpp" -template +template inline void ShenandoahMarkRefsSuperClosure::work(T* p) { - ShenandoahMark::mark_through_ref(p, _queue, _mark_context, _weak); + ShenandoahMark::mark_through_ref(p, _queue, _mark_context, _weak); } -template +template inline void ShenandoahMarkUpdateRefsSuperClosure::work(T* p) { // Update the location _heap->update_with_forwarded(p); // ...then do the usual thing - ShenandoahMarkRefsSuperClosure::work(p); + ShenandoahMarkRefsSuperClosure::work(p); } template diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp index d9ca5e0a042..05cd8ef66b9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp @@ -29,6 +29,7 @@ #include "gc/shared/taskTerminator.hpp" #include "gc/shared/workerThread.hpp" #include "gc/shenandoah/shenandoahClosures.inline.hpp" +#include "gc/shenandoah/shenandoahGenerationType.hpp" #include "gc/shenandoah/shenandoahMark.inline.hpp" #include "gc/shenandoah/shenandoahOopClosures.inline.hpp" #include "gc/shenandoah/shenandoahReferenceProcessor.hpp" @@ -36,6 +37,7 @@ #include "gc/shenandoah/shenandoahSTWMark.hpp" #include "gc/shenandoah/shenandoahVerifier.hpp" +template class ShenandoahInitMarkRootsClosure : public OopClosure { private: ShenandoahObjToScanQueue* const _queue; @@ -50,14 +52,16 @@ class ShenandoahInitMarkRootsClosure : public OopClosure { void do_oop(oop* p) { do_oop_work(p); } }; -ShenandoahInitMarkRootsClosure::ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q) : +template +ShenandoahInitMarkRootsClosure::ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q) : _queue(q), _mark_context(ShenandoahHeap::heap()->marking_context()) { } +template template -void ShenandoahInitMarkRootsClosure::do_oop_work(T* p) { - ShenandoahMark::mark_through_ref(p, _queue, _mark_context, false); +void ShenandoahInitMarkRootsClosure::do_oop_work(T* p) { + ShenandoahMark::mark_through_ref(p, _queue, _mark_context, false); } class ShenandoahSTWMarkTask : public WorkerTask { @@ -134,7 +138,7 @@ void ShenandoahSTWMark::mark() { } void ShenandoahSTWMark::mark_roots(uint worker_id) { - ShenandoahInitMarkRootsClosure init_mark(task_queues()->queue(worker_id)); + ShenandoahInitMarkRootsClosure init_mark(task_queues()->queue(worker_id)); _root_scanner.roots_do(&init_mark, worker_id); } @@ -144,7 +148,6 @@ void ShenandoahSTWMark::finish_mark(uint worker_id) { ShenandoahReferenceProcessor* rp = ShenandoahHeap::heap()->ref_processor(); StringDedup::Requests requests; - mark_loop(worker_id, &_terminator, rp, - false /* not cancellable */, + mark_loop(worker_id, &_terminator, rp, NON_GEN, false /* not cancellable */, ShenandoahStringDedup::is_enabled() ? ALWAYS_DEDUP : NO_DEDUP, &requests); } From a3d51d2027c18e88703022d1c65a3048b9f2967e Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Sat, 2 Mar 2024 04:46:03 +0000 Subject: [PATCH 31/86] 8326915: NPE when a validating parser is restricted Reviewed-by: lancea, naoto --- .../internal/impl/XMLEntityManager.java | 23 +++++-- .../jdk/xml/internal/SecuritySupport.java | 17 ++--- .../unittest/sbd/test/ExternalRefTest.java | 68 +++++++++++++++++++ .../unittest/sbd/test/ExternalRefTest.xml | 8 +++ .../unittest/sbd/test/ExternalRefTest.xsd | 15 ++++ 5 files changed, 116 insertions(+), 15 deletions(-) create mode 100644 test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.java create mode 100644 test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xml create mode 100644 test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xsd diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java index f922849d5fa..455e2b5446f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java @@ -94,7 +94,7 @@ * @author K.Venugopal SUN Microsystems * @author Neeraj Bajaj SUN Microsystems * @author Sunitha Reddy SUN Microsystems - * @LastModified: Jan 2024 + * @LastModified: Feb 2024 */ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { @@ -1118,8 +1118,9 @@ private InputSource resolveWithCatalog(CatalogResolver cr, String cFile, * this method attempts to resolve the resource as an EntityResolver first * and then URIResolver if no match is found. */ - private XMLInputSource resolveEntityOrURI(CatalogResolver cr, String publicId, String systemId, String base) { - XMLInputSource xis = resolveEntity(cr, publicId, systemId, base); + private XMLInputSource resolveEntityOrURI(String catalogName, CatalogResolver cr, + String publicId, String systemId, String base) { + XMLInputSource xis = resolveEntity(catalogName, cr, publicId, systemId, base); if (xis != null) { return xis; @@ -1137,13 +1138,21 @@ private XMLInputSource resolveEntityOrURI(CatalogResolver cr, String publicId, S return null; } - private XMLInputSource resolveEntity(CatalogResolver cr, String publicId, String systemId, String base) { + private XMLInputSource resolveEntity(String catalogName, CatalogResolver cr, + String publicId, String systemId, String base) { InputSource is = null; try { if (publicId != null || systemId != null) { is = cr.resolveEntity(publicId, systemId); } - } catch (CatalogException e) {} + } catch (CatalogException e) { + //Note: XSDHandler does not set ErrorReporter on EntityManager + if (fErrorReporter != null) { + fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"CatalogException", + new Object[]{SecuritySupport.sanitizePath(catalogName)}, + XMLErrorReporter.SEVERITY_FATAL_ERROR, e ); + } + } if (is != null && !is.isEmpty()) { return new XMLInputSource(is, true); @@ -1216,7 +1225,7 @@ public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) th fCatalogResolver = CatalogManager.catalogResolver(fCatalogFeatures); } String pid = (publicId != null? publicId : resourceIdentifier.getNamespace()); - xmlInputSource = resolveEntityOrURI(fCatalogResolver, pid, literalSystemId, baseSystemId); + xmlInputSource = resolveEntityOrURI(fCatalogFile, fCatalogResolver, pid, literalSystemId, baseSystemId); } // Step 3: use the default JDK Catalog Resolver if Step 2's resolve is continue @@ -1225,7 +1234,7 @@ public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) th && JdkXmlUtils.isResolveContinue(fCatalogFeatures)) { initJdkCatalogResolver(); // unlike a custom catalog, the JDK Catalog only contains entity references - xmlInputSource = resolveEntity(fDefCR, publicId, literalSystemId, baseSystemId); + xmlInputSource = resolveEntity("JDKCatalog", fDefCR, publicId, literalSystemId, baseSystemId); } // Step 4: default resolution if not resolved by a resolver and the RESOLVE diff --git a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java index cfb2a264f7b..071676703e1 100644 --- a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java +++ b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -387,20 +387,21 @@ static long getLastModified(final File f) { } /** - * Strip off path from an URI + * Strips off path from a URI or file path. * - * @param uri an URI with full path + * @param input a URI or file path * @return the file name only */ - public static String sanitizePath(String uri) { - if (uri == null) { + public static String sanitizePath(String input) { + if (input == null) { return ""; } - int i = uri.lastIndexOf("/"); + input = input.replace('\\', '/'); + int i = input.lastIndexOf('/'); if (i > 0) { - return uri.substring(i+1, uri.length()); + return input.substring(i+1); } - return ""; + return input; } /** diff --git a/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.java b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.java new file mode 100644 index 00000000000..0b9daed0d83 --- /dev/null +++ b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2024, 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. + * + * 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 sbd.test; + +import java.io.File; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import org.testng.Assert; +import org.testng.annotations.Test; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +/* + * @test + * @bug 8326915 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm sbd.test.ExternalRefTest + * @summary Part of the Secure-By-Default (SBD) project. This test verifies issues + * and error message improvements related to external references. + */ +public class ExternalRefTest { + /** + * @bug 8326915 + * Verifies that SAXParseException rather than NPE is thrown when a validating + * parser is restricted from processing external references. + * @throws Exception if the test fails + */ + @Test + public void testValidatingParser() throws Exception { + Assert.assertThrows(SAXParseException.class, () -> validateWithParser()); + } + + private void validateWithParser() throws Exception { + SAXParserFactory spf = SAXParserFactory.newInstance(); + + spf.setNamespaceAware(true); + spf.setValidating(true); + + SAXParser parser = spf.newSAXParser(); + parser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", + "http://www.w3.org/2001/XMLSchema"); + + parser.setProperty("jdk.xml.jdkcatalog.resolve", "strict"); + File xmlFile = new File(getClass().getResource("ExternalRefTest.xml").getPath()); + + parser.parse(xmlFile, new DefaultHandler()); + } +} diff --git a/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xml b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xml new file mode 100644 index 00000000000..0e691f67446 --- /dev/null +++ b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xml @@ -0,0 +1,8 @@ + + +1 +2 + diff --git a/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xsd b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xsd new file mode 100644 index 00000000000..09a434fe792 --- /dev/null +++ b/test/jaxp/javax/xml/jaxp/unittest/sbd/test/ExternalRefTest.xsd @@ -0,0 +1,15 @@ + + + + + + + + + + + + From 37e01efb7831e29068f834fe0629595cb721b90d Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Sat, 2 Mar 2024 08:13:07 +0000 Subject: [PATCH 32/86] 8326586: Improve Speed of System.map Reviewed-by: jsjolen, gziemski --- src/hotspot/share/nmt/memMapPrinter.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp index a112ae6f862..0de7582e968 100644 --- a/src/hotspot/share/nmt/memMapPrinter.cpp +++ b/src/hotspot/share/nmt/memMapPrinter.cpp @@ -88,7 +88,7 @@ class CachedNMTInformation : public VirtualMemoryWalker { // of them fit into a cache line. Range* _ranges; MEMFLAGS* _flags; - uintx _count, _capacity; + size_t _count, _capacity; public: CachedNMTInformation() : _ranges(nullptr), _flags(nullptr), _count(0), _capacity(0) {} @@ -107,12 +107,12 @@ class CachedNMTInformation : public VirtualMemoryWalker { } if (_count == _capacity) { // Enlarge if needed - const uintx new_capacity = MAX2((uintx)4096, 2 * _capacity); + const size_t new_capacity = MAX2((size_t)4096, 2 * _capacity); // Unfortunately, we need to allocate manually, raw, since we must prevent NMT deadlocks (ThreadCritical). ALLOW_C_FUNCTION(realloc, _ranges = (Range*)::realloc(_ranges, new_capacity * sizeof(Range));) ALLOW_C_FUNCTION(realloc, _flags = (MEMFLAGS*)::realloc(_flags, new_capacity * sizeof(MEMFLAGS));) if (_ranges == nullptr || _flags == nullptr) { - // In case of OOM lets make no fuzz. Just return. + // In case of OOM lets make no fuss. Just return. return false; } _capacity = new_capacity; @@ -127,11 +127,21 @@ class CachedNMTInformation : public VirtualMemoryWalker { // Given a vma [from, to), find all regions that intersect with this vma and // return their collective flags. MemFlagBitmap lookup(const void* from, const void* to) const { + assert(from <= to, "Sanity"); + // We optimize for sequential lookups. Since this class is used when a list + // of OS mappings is scanned (VirtualQuery, /proc/pid/maps), and these lists + // are usually sorted in order of addresses, ascending. + static uintx last = 0; + if (to <= _ranges[last].from) { + // the range is to the right of the given section, we need to re-start the search + last = 0; + } MemFlagBitmap bm; - for(uintx i = 0; i < _count; i++) { + for(uintx i = last; i < _count; i++) { if (range_intersects(from, to, _ranges[i].from, _ranges[i].to)) { bm.set_flag(_flags[i]); - } else if (from < _ranges[i].to) { + } else if (to <= _ranges[i].from) { + last = i; break; } } From 31ac8714e0593f2feaa8e9ebaf32bab904ba6d11 Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Sun, 3 Mar 2024 11:05:33 +0000 Subject: [PATCH 33/86] 8326692: JVMCI Local.endBci is off-by-one Reviewed-by: dnsimon, never, gli --- .../HotSpotResolvedJavaMethodImpl.java | 4 ++-- .../share/classes/jdk/vm/ci/meta/Local.java | 11 +++++++++- .../runtime/test/TestResolvedJavaMethod.java | 21 ++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java index 6b9381df1ec..4c9dc509ce1 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2024, 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 @@ -632,7 +632,7 @@ public LocalVariableTable getLocalVariableTable() { for (int i = 0; i < localVariableTableLength; i++) { final int startBci = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementStartBciOffset); - final int endBci = startBci + UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementLengthOffset); + final int endBci = startBci + UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementLengthOffset) - 1; final int nameCpIndex = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementNameCpIndexOffset); final int typeCpIndex = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementDescriptorCpIndexOffset); final int slot = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementSlotOffset); diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/Local.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/Local.java index ff444ffe094..c68ce13d811 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/Local.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/Local.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2024, 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 @@ -41,10 +41,19 @@ public Local(String name, JavaType type, int startBci, int endBci, int slot) { this.type = type; } + /** + * Returns the first BCI at which this local has a value (inclusive). + */ public int getStartBCI() { return startBci; } + + /** + * Returns the last BCI at which this local has a value (inclusive). + * If the value returned is less than {@link #getStartBCI}, this object denotes a local + * variable that is never live. + */ public int getEndBCI() { return endBci; } diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java index d12148b1983..ae077b3b3f4 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java @@ -95,6 +95,8 @@ import jdk.vm.ci.meta.ConstantPool; import jdk.vm.ci.meta.ExceptionHandler; +import jdk.vm.ci.meta.Local; +import jdk.vm.ci.meta.LocalVariableTable; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod.Parameter; import jdk.vm.ci.meta.ResolvedJavaType; @@ -734,6 +736,24 @@ public void getOopMapAtTest() throws Exception { Assert.assertTrue(processedMethodWithManyArgs[0]); } + @Test + public void getLocalVariableTableTest() { + for (ResolvedJavaMethod m : methods.values()) { + LocalVariableTable table = m.getLocalVariableTable(); + if (table == null) { + continue; + } + for (Local l : table.getLocals()) { + if (l.getStartBCI() < 0) { + throw new AssertionError(m.format("%H.%n(%p)") + " local " + l.getName() + " starts at " + l.getStartBCI()); + } + if (l.getEndBCI() >= m.getCodeSize()) { + throw new AssertionError(m.format("%H.%n(%p)") + " (" + m.getCodeSize() + "bytes) local " + l.getName() + " ends at " + l.getEndBCI()); + } + } + } + } + private Method findTestMethod(Method apiMethod) { String testName = apiMethod.getName() + "Test"; for (Method m : getClass().getDeclaredMethods()) { @@ -756,7 +776,6 @@ private Method findTestMethod(Method apiMethod) { "canBeInlined", "shouldBeInlined", "getLineNumberTable", - "getLocalVariableTable", "isInVirtualMethodTable", "toParameterTypes", "getParameterAnnotation", From f3b15abcb7dcd00158df84818965fc1282dcc1d9 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Mon, 4 Mar 2024 07:40:01 +0000 Subject: [PATCH 34/86] 8327059: os::Linux::print_proc_sys_info add swappiness information Reviewed-by: mdoerr, dholmes --- src/hotspot/os/linux/os_linux.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index c51aeb0ae17..119f98c6874 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -2270,6 +2270,8 @@ void os::Linux::print_proc_sys_info(outputStream* st) { "/proc/sys/kernel/threads-max", st); _print_ascii_file_h("/proc/sys/vm/max_map_count (maximum number of memory map areas a process may have)", "/proc/sys/vm/max_map_count", st); + _print_ascii_file_h("/proc/sys/vm/swappiness (control to define how aggressively the kernel swaps out anonymous memory)", + "/proc/sys/vm/swappiness", st); _print_ascii_file_h("/proc/sys/kernel/pid_max (system-wide limit on number of process identifiers)", "/proc/sys/kernel/pid_max", st); } From 97dc0edde01454041df41988538abbd53ad6503d Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Mon, 4 Mar 2024 08:06:20 +0000 Subject: [PATCH 35/86] 8327171: Fix more NULL usage backsliding Reviewed-by: gli, jwaters, dholmes --- src/hotspot/os/aix/os_aix.cpp | 4 ++-- src/hotspot/os/bsd/os_bsd.cpp | 4 ++-- test/hotspot/gtest/runtime/test_os_linux.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp index 0c1c0dbc6dc..f6312f2f882 100644 --- a/src/hotspot/os/aix/os_aix.cpp +++ b/src/hotspot/os/aix/os_aix.cpp @@ -278,7 +278,7 @@ julong os::Aix::available_memory() { jlong os::total_swap_space() { perfstat_memory_total_t memory_info; - if (libperfstat::perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) { + if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) { return -1; } return (jlong)(memory_info.pgsp_total * 4 * K); @@ -286,7 +286,7 @@ jlong os::total_swap_space() { jlong os::free_swap_space() { perfstat_memory_total_t memory_info; - if (libperfstat::perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) { + if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) { return -1; } return (jlong)(memory_info.pgsp_free * 4 * K); diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp index 0e67228de7b..86d81a59f0d 100644 --- a/src/hotspot/os/bsd/os_bsd.cpp +++ b/src/hotspot/os/bsd/os_bsd.cpp @@ -184,7 +184,7 @@ jlong os::total_swap_space() { #if defined(__APPLE__) struct xsw_usage vmusage; size_t size = sizeof(vmusage); - if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) { + if (sysctlbyname("vm.swapusage", &vmusage, &size, nullptr, 0) != 0) { return -1; } return (jlong)vmusage.xsu_total; @@ -197,7 +197,7 @@ jlong os::free_swap_space() { #if defined(__APPLE__) struct xsw_usage vmusage; size_t size = sizeof(vmusage); - if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) { + if (sysctlbyname("vm.swapusage", &vmusage, &size, nullptr, 0) != 0) { return -1; } return (jlong)vmusage.xsu_avail; diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp index 20a6257df04..69c3d991b2a 100644 --- a/test/hotspot/gtest/runtime/test_os_linux.cpp +++ b/test/hotspot/gtest/runtime/test_os_linux.cpp @@ -356,7 +356,7 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) { const bool useThp = UseTransparentHugePages; UseTransparentHugePages = true; char* const heap = os::reserve_memory(size, false, mtInternal); - EXPECT_NE(heap, (char*)NULL); + EXPECT_NE(heap, nullptr); EXPECT_TRUE(os::commit_memory(heap, size, false)); { From 7c71f188a3a98e47ee363c532bd75937e69869a7 Mon Sep 17 00:00:00 2001 From: Afshin Zafari Date: Mon, 4 Mar 2024 08:18:27 +0000 Subject: [PATCH 36/86] 8324829: Uniform use of synchronizations in NMT Reviewed-by: stuefe, jsjolen --- src/hotspot/os/posix/perfMemory_posix.cpp | 5 ++- src/hotspot/os/windows/perfMemory_windows.cpp | 4 +-- src/hotspot/share/gc/x/xPhysicalMemory.cpp | 8 ++--- src/hotspot/share/gc/z/zNMT.cpp | 6 ++-- src/hotspot/share/nmt/memTracker.cpp | 14 -------- src/hotspot/share/nmt/memTracker.hpp | 35 +++++++++---------- src/hotspot/share/runtime/os.cpp | 18 +++++----- 7 files changed, 33 insertions(+), 57 deletions(-) diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp index 8736e05bc62..4339a21ae4e 100644 --- a/src/hotspot/os/posix/perfMemory_posix.cpp +++ b/src/hotspot/os/posix/perfMemory_posix.cpp @@ -1086,11 +1086,10 @@ static char* mmap_create_shared(size_t size) { static void unmap_shared(char* addr, size_t bytes) { int res; if (MemTracker::enabled()) { - // Note: Tracker contains a ThreadCritical. - Tracker tkr(Tracker::release); + ThreadCritical tc; res = ::munmap(addr, bytes); if (res == 0) { - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_release((address)addr, bytes); } } else { res = ::munmap(addr, bytes); diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp index 5a4f95d044f..a71101731fb 100644 --- a/src/hotspot/os/windows/perfMemory_windows.cpp +++ b/src/hotspot/os/windows/perfMemory_windows.cpp @@ -1803,9 +1803,9 @@ void PerfMemory::detach(char* addr, size_t bytes) { if (MemTracker::enabled()) { // it does not go through os api, the operation has to record from here - Tracker tkr(Tracker::release); + ThreadCritical tc; remove_file_mapping(addr); - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_release((address)addr, bytes); } else { remove_file_mapping(addr); } diff --git a/src/hotspot/share/gc/x/xPhysicalMemory.cpp b/src/hotspot/share/gc/x/xPhysicalMemory.cpp index ca093f73d71..0269c64f0f1 100644 --- a/src/hotspot/share/gc/x/xPhysicalMemory.cpp +++ b/src/hotspot/share/gc/x/xPhysicalMemory.cpp @@ -283,11 +283,9 @@ void XPhysicalMemoryManager::nmt_commit(uintptr_t offset, size_t size) const { } void XPhysicalMemoryManager::nmt_uncommit(uintptr_t offset, size_t size) const { - if (MemTracker::enabled()) { - const uintptr_t addr = XAddress::marked0(offset); - Tracker tracker(Tracker::uncommit); - tracker.record((address)addr, size); - } + const uintptr_t addr = XAddress::marked0(offset); + ThreadCritical tc; + MemTracker::record_virtual_memory_uncommit((address)addr, size); } void XPhysicalMemoryManager::alloc(XPhysicalMemory& pmem, size_t size) { diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp index fa6c3cd6540..9a54c0f5963 100644 --- a/src/hotspot/share/gc/z/zNMT.cpp +++ b/src/hotspot/share/gc/z/zNMT.cpp @@ -73,10 +73,8 @@ void ZNMT::process_fake_mapping(zoffset offset, size_t size, bool commit) { if (commit) { MemTracker::record_virtual_memory_commit((void*)sub_range_addr, sub_range_size, CALLER_PC); } else { - if (MemTracker::enabled()) { - Tracker tracker(Tracker::uncommit); - tracker.record((address)sub_range_addr, sub_range_size); - } + ThreadCritical tc; + MemTracker::record_virtual_memory_uncommit((address)sub_range_addr, sub_range_size); } left_to_process -= sub_range_size; diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp index 192be9ecc1d..a63e754b9f5 100644 --- a/src/hotspot/share/nmt/memTracker.cpp +++ b/src/hotspot/share/nmt/memTracker.cpp @@ -95,20 +95,6 @@ void MemTracker::initialize() { } } -void Tracker::record(address addr, size_t size) { - if (MemTracker::tracking_level() < NMT_summary) return; - switch(_type) { - case uncommit: - VirtualMemoryTracker::remove_uncommitted_region(addr, size); - break; - case release: - VirtualMemoryTracker::remove_released_region(addr, size); - break; - default: - ShouldNotReachHere(); - } -} - // Report during error reporting. void MemTracker::error_report(outputStream* output) { if (enabled()) { diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp index c7fbda4713a..41a8f72b527 100644 --- a/src/hotspot/share/nmt/memTracker.hpp +++ b/src/hotspot/share/nmt/memTracker.hpp @@ -41,25 +41,6 @@ class MemBaseline; -// Tracker is used for guarding 'release' semantics of virtual memory operation, to avoid -// the other thread obtains and records the same region that is just 'released' by current -// thread but before it can record the operation. -class Tracker : public StackObj { - public: - enum TrackerType { - uncommit, - release - }; - - public: - Tracker(enum TrackerType type) : _type(type) { } - void record(address addr, size_t size); - private: - enum TrackerType _type; - // Virtual memory tracking data structures are protected by ThreadCritical lock. - ThreadCritical _tc; -}; - class MemTracker : AllStatic { friend class VirtualMemoryTrackerTest; @@ -148,6 +129,22 @@ class MemTracker : AllStatic { } } + static inline void record_virtual_memory_release(address addr, size_t size) { + assert_post_init(); + if (!enabled()) return; + if (addr != nullptr) { + VirtualMemoryTracker::remove_released_region((address)addr, size); + } + } + + static inline void record_virtual_memory_uncommit(address addr, size_t size) { + assert_post_init(); + if (!enabled()) return; + if (addr != nullptr) { + VirtualMemoryTracker::remove_uncommitted_region((address)addr, size); + } + } + static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag = mtNone) { assert_post_init(); diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index 5d6c1fa69ca..9b5bbfa772a 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -2062,10 +2062,10 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) { assert_nonempty_range(addr, bytes); bool res; if (MemTracker::enabled()) { - Tracker tkr(Tracker::uncommit); + ThreadCritical tc; res = pd_uncommit_memory(addr, bytes, executable); if (res) { - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_uncommit((address)addr, bytes); } } else { res = pd_uncommit_memory(addr, bytes, executable); @@ -2077,11 +2077,10 @@ bool os::release_memory(char* addr, size_t bytes) { assert_nonempty_range(addr, bytes); bool res; if (MemTracker::enabled()) { - // Note: Tracker contains a ThreadCritical. - Tracker tkr(Tracker::release); + ThreadCritical tc; res = pd_release_memory(addr, bytes); if (res) { - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_release((address)addr, bytes); } } else { res = pd_release_memory(addr, bytes); @@ -2161,10 +2160,10 @@ char* os::map_memory(int fd, const char* file_name, size_t file_offset, bool os::unmap_memory(char *addr, size_t bytes) { bool result; if (MemTracker::enabled()) { - Tracker tkr(Tracker::release); + ThreadCritical tc; result = pd_unmap_memory(addr, bytes); if (result) { - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_release((address)addr, bytes); } } else { result = pd_unmap_memory(addr, bytes); @@ -2197,11 +2196,10 @@ char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size bool os::release_memory_special(char* addr, size_t bytes) { bool res; if (MemTracker::enabled()) { - // Note: Tracker contains a ThreadCritical. - Tracker tkr(Tracker::release); + ThreadCritical tc; res = pd_release_memory_special(addr, bytes); if (res) { - tkr.record((address)addr, bytes); + MemTracker::record_virtual_memory_release((address)addr, bytes); } } else { res = pd_release_memory_special(addr, bytes); From e889b460c03b3887ec5477fa734c430d3c3a41c8 Mon Sep 17 00:00:00 2001 From: Arno Zeller Date: Mon, 4 Mar 2024 08:40:50 +0000 Subject: [PATCH 37/86] 8327071: [Testbug] g-tests for cgroup leave files in /tmp on linux Reviewed-by: mbaesken, gli, stuefe --- .../gtest/os/linux/test_cgroupSubsystem_linux.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp b/test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp index 3b8e6929730..463955fd401 100644 --- a/test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp +++ b/test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp @@ -61,7 +61,7 @@ static void delete_file(const char* filename) { class TestController : public CgroupController { public: char* subsystem_path() override { - // The real subsystem is in /tmp/, generaed by temp_file() + // The real subsystem is in /tmp/, generated by temp_file() return (char*)"/"; }; }; @@ -99,6 +99,9 @@ TEST(cgroupTest, SubSystemFileLineContentsMultipleLinesErrorCases) { fill_file(test_file, "foof bar"); err = subsystem_file_line_contents(&my_controller, test_file, "foo", "%s", &s); EXPECT_NE(err, 0) << "Key must be exact match"; + + // Cleanup + delete_file(test_file); } TEST(cgroupTest, SubSystemFileLineContentsMultipleLinesSuccessCases) { @@ -149,6 +152,9 @@ TEST(cgroupTest, SubSystemFileLineContentsMultipleLinesSuccessCases) { err = subsystem_file_line_contents(&my_controller, test_file, nullptr, "%*s %d", &x); EXPECT_EQ(err, 0); EXPECT_EQ(x, 10001); + + // Cleanup + delete_file(test_file); } TEST(cgroupTest, SubSystemFileLineContentsSingleLine) { @@ -190,6 +196,9 @@ TEST(cgroupTest, SubSystemFileLineContentsSingleLine) { err = subsystem_file_line_contents(&my_controller, test_file, nullptr, JULONG_FORMAT, &z); EXPECT_EQ(err, 0); EXPECT_EQ(z, (julong)1337) << "Wrong value for z"; + + // Cleanup + delete_file(test_file); } #endif // LINUX From b69d1b51c77ceda2fae3402418f4afcae2a735a8 Mon Sep 17 00:00:00 2001 From: Ivan Walulya Date: Mon, 4 Mar 2024 15:17:57 +0000 Subject: [PATCH 38/86] 8327042: G1: Parallelism used for redirty logged cards needs better control. Co-authored-by: Thomas Schatzl Reviewed-by: tschatzl, ayang --- .../share/gc/g1/g1ParScanThreadState.cpp | 17 ++++--- .../share/gc/g1/g1ParScanThreadState.hpp | 5 ++- .../share/gc/g1/g1RedirtyCardsQueue.cpp | 4 +- .../share/gc/g1/g1RedirtyCardsQueue.hpp | 4 +- .../gc/g1/g1YoungGCPostEvacuateTasks.cpp | 45 +++++++++++-------- 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp index 92aec50def6..3480e0ae994 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp @@ -113,15 +113,15 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, initialize_numa_stats(); } -size_t G1ParScanThreadState::flush_stats(size_t* surviving_young_words, uint num_workers) { - _rdc_local_qset.flush(); +size_t G1ParScanThreadState::flush_stats(size_t* surviving_young_words, uint num_workers, BufferNodeList* rdc_buffers) { + *rdc_buffers = _rdc_local_qset.flush(); flush_numa_stats(); // Update allocation statistics. _plab_allocator->flush_and_retire_stats(num_workers); _g1h->policy()->record_age_table(&_age_table); if (_evacuation_failed_info.has_failed()) { - _g1h->gc_tracer_stw()->report_evacuation_failed(_evacuation_failed_info); + _g1h->gc_tracer_stw()->report_evacuation_failed(_evacuation_failed_info); } size_t sum = 0; @@ -593,7 +593,6 @@ const size_t* G1ParScanThreadStateSet::surviving_young_words() const { void G1ParScanThreadStateSet::flush_stats() { assert(!_flushed, "thread local state from the per thread states should be flushed once"); - for (uint worker_id = 0; worker_id < _num_workers; ++worker_id) { G1ParScanThreadState* pss = _states[worker_id]; assert(pss != nullptr, "must be initialized"); @@ -604,7 +603,7 @@ void G1ParScanThreadStateSet::flush_stats() { // because it resets the PLAB allocator where we get this info from. size_t lab_waste_bytes = pss->lab_waste_words() * HeapWordSize; size_t lab_undo_waste_bytes = pss->lab_undo_waste_words() * HeapWordSize; - size_t copied_bytes = pss->flush_stats(_surviving_young_words_total, _num_workers) * HeapWordSize; + size_t copied_bytes = pss->flush_stats(_surviving_young_words_total, _num_workers, &_rdc_buffers[worker_id]) * HeapWordSize; size_t evac_fail_enqueued_cards = pss->evac_failure_enqueued_cards(); p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, copied_bytes, G1GCPhaseTimes::MergePSSCopiedBytes); @@ -615,6 +614,11 @@ void G1ParScanThreadStateSet::flush_stats() { delete pss; _states[worker_id] = nullptr; } + + G1DirtyCardQueueSet& dcq = G1BarrierSet::dirty_card_queue_set(); + dcq.merge_bufferlists(rdcqs()); + rdcqs()->verify_empty(); + _flushed = true; } @@ -706,6 +710,7 @@ G1ParScanThreadStateSet::G1ParScanThreadStateSet(G1CollectedHeap* g1h, _rdcqs(G1BarrierSet::dirty_card_queue_set().allocator()), _preserved_marks_set(true /* in_c_heap */), _states(NEW_C_HEAP_ARRAY(G1ParScanThreadState*, num_workers, mtGC)), + _rdc_buffers(NEW_C_HEAP_ARRAY(BufferNodeList, num_workers, mtGC)), _surviving_young_words_total(NEW_C_HEAP_ARRAY(size_t, collection_set->young_region_length() + 1, mtGC)), _num_workers(num_workers), _flushed(false), @@ -713,6 +718,7 @@ G1ParScanThreadStateSet::G1ParScanThreadStateSet(G1CollectedHeap* g1h, _preserved_marks_set.init(num_workers); for (uint i = 0; i < num_workers; ++i) { _states[i] = nullptr; + _rdc_buffers[i] = BufferNodeList(); } memset(_surviving_young_words_total, 0, (collection_set->young_region_length() + 1) * sizeof(size_t)); } @@ -721,5 +727,6 @@ G1ParScanThreadStateSet::~G1ParScanThreadStateSet() { assert(_flushed, "thread local state from the per thread states should have been flushed"); FREE_C_HEAP_ARRAY(G1ParScanThreadState*, _states); FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_total); + FREE_C_HEAP_ARRAY(BufferNodeList, _rdc_buffers); _preserved_marks_set.reclaim(); } diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp index 4f72e61f82b..72f7a0b84e7 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp @@ -166,7 +166,7 @@ class G1ParScanThreadState : public CHeapObj { // Pass locally gathered statistics to global state. Returns the total number of // HeapWords copied. - size_t flush_stats(size_t* surviving_young_words, uint num_workers); + size_t flush_stats(size_t* surviving_young_words, uint num_workers, BufferNodeList* buffer_log); private: void do_partial_array(PartialArrayScanTask task); @@ -247,6 +247,7 @@ class G1ParScanThreadStateSet : public StackObj { G1RedirtyCardsQueueSet _rdcqs; PreservedMarksSet _preserved_marks_set; G1ParScanThreadState** _states; + BufferNodeList* _rdc_buffers; size_t* _surviving_young_words_total; uint _num_workers; bool _flushed; @@ -260,12 +261,14 @@ class G1ParScanThreadStateSet : public StackObj { ~G1ParScanThreadStateSet(); G1RedirtyCardsQueueSet* rdcqs() { return &_rdcqs; } + BufferNodeList* rdc_buffers() { return _rdc_buffers; } PreservedMarksSet* preserved_marks_set() { return &_preserved_marks_set; } void flush_stats(); void record_unused_optional_region(HeapRegion* hr); G1ParScanThreadState* state_for_worker(uint worker_id); + uint num_workers() const { return _num_workers; } const size_t* surviving_young_words() const; }; diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp index a264fb436c6..35e80fb262e 100644 --- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp +++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp @@ -65,10 +65,12 @@ void G1RedirtyCardsLocalQueueSet::enqueue(void* value) { } } -void G1RedirtyCardsLocalQueueSet::flush() { +BufferNodeList G1RedirtyCardsLocalQueueSet::flush() { flush_queue(_queue); + BufferNodeList cur_buffers = _buffers; _shared_qset->add_bufferlist(_buffers); _buffers = BufferNodeList(); + return cur_buffers; } // G1RedirtyCardsLocalQueueSet::Queue diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp index 970cce1623e..ca0bc35fd04 100644 --- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp +++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp @@ -56,7 +56,9 @@ class G1RedirtyCardsLocalQueueSet : private PtrQueueSet { void enqueue(void* value); // Transfer all completed buffers to the shared qset. - void flush(); + // Returns the flushed BufferNodeList which is later used + // as a shortcut into the shared qset. + BufferNodeList flush(); }; // Card table entries to be redirtied and the cards reprocessed later. diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp index 653402b8275..18aa3819888 100644 --- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp +++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp @@ -590,23 +590,17 @@ class G1PostEvacuateCollectionSetCleanupTask2::ProcessEvacuationFailedRegionsTas }; class G1PostEvacuateCollectionSetCleanupTask2::RedirtyLoggedCardsTask : public G1AbstractSubTask { - G1RedirtyCardsQueueSet* _rdcqs; - BufferNode* volatile _nodes; + BufferNodeList* _rdc_buffers; + uint _num_buffer_lists; G1EvacFailureRegions* _evac_failure_regions; public: - RedirtyLoggedCardsTask(G1RedirtyCardsQueueSet* rdcqs, G1EvacFailureRegions* evac_failure_regions) : + RedirtyLoggedCardsTask(G1EvacFailureRegions* evac_failure_regions, BufferNodeList* rdc_buffers, uint num_buffer_lists) : G1AbstractSubTask(G1GCPhaseTimes::RedirtyCards), - _rdcqs(rdcqs), - _nodes(rdcqs->all_completed_buffers()), + _rdc_buffers(rdc_buffers), + _num_buffer_lists(num_buffer_lists), _evac_failure_regions(evac_failure_regions) { } - virtual ~RedirtyLoggedCardsTask() { - G1DirtyCardQueueSet& dcq = G1BarrierSet::dirty_card_queue_set(); - dcq.merge_bufferlists(_rdcqs); - _rdcqs->verify_empty(); - } - double worker_cost() const override { // Needs more investigation. return G1CollectedHeap::heap()->workers()->active_workers(); @@ -614,13 +608,23 @@ class G1PostEvacuateCollectionSetCleanupTask2::RedirtyLoggedCardsTask : public G void do_work(uint worker_id) override { RedirtyLoggedCardTableEntryClosure cl(G1CollectedHeap::heap(), _evac_failure_regions); - BufferNode* next = Atomic::load(&_nodes); - while (next != nullptr) { - BufferNode* node = next; - next = Atomic::cmpxchg(&_nodes, node, node->next()); - if (next == node) { - cl.apply_to_buffer(node, worker_id); - next = node->next(); + + uint start = worker_id; + for (uint i = 0; i < _num_buffer_lists; i++) { + uint index = (start + i) % _num_buffer_lists; + + BufferNode* next = Atomic::load(&_rdc_buffers[index]._head); + BufferNode* tail = Atomic::load(&_rdc_buffers[index]._tail); + + while (next != nullptr) { + BufferNode* node = next; + next = Atomic::cmpxchg(&_rdc_buffers[index]._head, node, (node != tail ) ? node->next() : nullptr); + if (next == node) { + cl.apply_to_buffer(node, worker_id); + next = (node != tail ) ? node->next() : nullptr; + } else { + break; // If there is contention, move to the next BufferNodeList + } } } record_work_item(worker_id, 0, cl.num_dirtied()); @@ -970,7 +974,10 @@ G1PostEvacuateCollectionSetCleanupTask2::G1PostEvacuateCollectionSetCleanupTask2 add_parallel_task(new RestorePreservedMarksTask(per_thread_states->preserved_marks_set())); add_parallel_task(new ProcessEvacuationFailedRegionsTask(evac_failure_regions)); } - add_parallel_task(new RedirtyLoggedCardsTask(per_thread_states->rdcqs(), evac_failure_regions)); + add_parallel_task(new RedirtyLoggedCardsTask(evac_failure_regions, + per_thread_states->rdc_buffers(), + per_thread_states->num_workers())); + if (UseTLAB && ResizeTLAB) { add_parallel_task(new ResizeTLABsTask()); } From 0583f7357480c0500daa82f490b2fcc05f2fb65a Mon Sep 17 00:00:00 2001 From: Adam Sotona Date: Mon, 4 Mar 2024 15:26:27 +0000 Subject: [PATCH 39/86] 8323183: ClassFile API performance improvements Reviewed-by: redestad --- .../classfile/impl/SplitConstantPool.java | 10 +++- .../internal/classfile/impl/StackCounter.java | 54 ++++++++----------- .../classfile/impl/StackMapDecoder.java | 3 +- ...StackMaps.java => CodeAttributeTools.java} | 43 +++++++++------ 4 files changed, 59 insertions(+), 51 deletions(-) rename test/micro/org/openjdk/bench/jdk/classfile/{GenerateStackMaps.java => CodeAttributeTools.java} (81%) diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java index eb5aab90bb0..db2b4f030a3 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java @@ -87,6 +87,7 @@ public SplitConstantPool(ClassReader parent) { this.bsmSize = parentBsmSize; this.myEntries = new PoolEntry[8]; this.myBsmEntries = new BootstrapMethodEntryImpl[8]; + this.doneFullScan = true; } @Override @@ -189,10 +190,15 @@ protected PoolEntry fetchElement(int index) { // So we inflate the map with whatever we've got from the parent, and // later, if we miss, we do a one-time full inflation before creating // a new entry. - for (int i=1; i map; + private final Queue targets; private final BitSet visited; private void jump(int targetBci) { if (!visited.get(targetBci)) { - map.put(targetBci, stack); + targets.add(new Target(targetBci, stack)); } } @@ -78,13 +78,11 @@ private void ensureLocalSlot(int index) { } private boolean next() { - var it = map.entrySet().iterator(); - while (it.hasNext()) { - var en = it.next(); - it.remove(); - if (!visited.get(en.getKey())) { - bcs.nextBci = en.getKey(); - stack = en.getValue(); + Target en; + while ((en = targets.poll()) != null) { + if (!visited.get(en.bci)) { + bcs.nextBci = en.bci; + stack = en.stack; return true; } } @@ -93,7 +91,6 @@ private boolean next() { } public StackCounter(LabelContext labelContext, - ClassDesc thisClass, String methodName, MethodTypeDesc methodDesc, boolean isStatic, @@ -103,16 +100,14 @@ public StackCounter(LabelContext labelContext, this.methodName = methodName; this.methodDesc = methodDesc; this.cp = cp; - map = new LinkedHashMap<>(); + targets = new ArrayDeque<>(); maxStack = stack = rets = 0; - for (var h : handlers) map.put(labelContext.labelToBci(h.handler), 1); + for (var h : handlers) targets.add(new Target(labelContext.labelToBci(h.handler), 1)); maxLocals = isStatic ? 0 : 1; - for (var cd : methodDesc.parameterList()) { - maxLocals += Util.slotSize(cd); - } + maxLocals += Util.parameterSlots(methodDesc); bcs = new RawBytecodeHelper(bytecode); visited = new BitSet(bcs.endBci); - map.put(0, 0); + targets.add(new Target(0, 0)); while (next()) { while (!bcs.isLastBytecode()) { bcs.rawNext(); @@ -307,14 +302,11 @@ public StackCounter(LabelContext labelContext, case INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE, INVOKEDYNAMIC -> { var cpe = cp.entryByIndex(bcs.getIndexU2()); var nameAndType = opcode == INVOKEDYNAMIC ? ((DynamicConstantPoolEntry)cpe).nameAndType() : ((MemberRefEntry)cpe).nameAndType(); - var mDesc = MethodTypeDesc.ofDescriptor(nameAndType.type().stringValue()); - for (var arg : mDesc.parameterList()) { - addStackSlot(-TypeKind.from(arg).slotSize()); - } + var mtd = Util.methodTypeSymbol(nameAndType); + addStackSlot(Util.slotSize(mtd.returnType()) - Util.parameterSlots(mtd)); if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) { addStackSlot(-1); } - addStackSlot(TypeKind.from(mDesc.returnType()).slotSize()); } case MULTIANEWARRAY -> addStackSlot (1 - bcs.getU1(bcs.bci + 3)); diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java index 0fdb3622d6b..75e9f7d817b 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java @@ -80,7 +80,8 @@ public static List initFrameLocals(ClassEntry thisClass, S } else { vtis = new VerificationTypeInfo[methodType.parameterCount()]; } - for(var arg : methodType.parameterList()) { + for (int pi = 0; pi < methodType.parameterCount(); pi++) { + var arg = methodType.parameterType(pi); vtis[i++] = switch (arg.descriptorString().charAt(0)) { case 'I', 'S', 'C' ,'B', 'Z' -> SimpleVerificationTypeInfo.ITEM_INTEGER; case 'J' -> SimpleVerificationTypeInfo.ITEM_LONG; diff --git a/test/micro/org/openjdk/bench/jdk/classfile/GenerateStackMaps.java b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java similarity index 81% rename from test/micro/org/openjdk/bench/jdk/classfile/GenerateStackMaps.java rename to test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java index 6fcf801c2cf..1a9d989c546 100644 --- a/test/micro/org/openjdk/bench/jdk/classfile/GenerateStackMaps.java +++ b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, 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 @@ -24,7 +24,6 @@ import java.io.IOException; import java.lang.constant.ClassDesc; -import java.lang.constant.MethodTypeDesc; import java.net.URI; import java.nio.ByteBuffer; import java.nio.file.FileSystems; @@ -34,12 +33,16 @@ import java.util.List; import java.lang.classfile.ClassFile; import java.lang.classfile.ClassReader; +import java.lang.classfile.MethodModel; +import java.lang.classfile.constantpool.ConstantPool; import java.lang.classfile.constantpool.ConstantPoolBuilder; +import java.lang.constant.MethodTypeDesc; import jdk.internal.classfile.impl.AbstractPseudoInstruction; import jdk.internal.classfile.impl.CodeImpl; import jdk.internal.classfile.impl.LabelContext; import jdk.internal.classfile.impl.ClassFileImpl; import jdk.internal.classfile.impl.SplitConstantPool; +import jdk.internal.classfile.impl.StackCounter; import jdk.internal.classfile.impl.StackMapGenerator; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -51,6 +54,7 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; @BenchmarkMode(Mode.Throughput) @State(Scope.Benchmark) @@ -58,8 +62,8 @@ "--enable-preview", "--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"}) @Warmup(iterations = 2) -@Measurement(iterations = 10) -public class GenerateStackMaps { +@Measurement(iterations = 8) +public class CodeAttributeTools { record GenData(LabelContext labelContext, ClassDesc thisClass, @@ -71,17 +75,13 @@ record GenData(LabelContext labelContext, List handlers) {} List data; - Iterator it; - GenData d; - ClassFile cc; - @Setup(Level.Trial) + @Setup(Level.Invocation) public void setup() throws IOException { - cc = ClassFile.of(); data = new ArrayList<>(); Files.walk(FileSystems.getFileSystem(URI.create("jrt:/")).getPath("modules/java.base/java")).forEach(p -> { if (Files.isRegularFile(p) && p.toString().endsWith(".class")) try { - var clm = cc.parse(p); + var clm = ClassFile.of().parse(p); var thisCls = clm.thisClass().asSymbol(); var cp = new SplitConstantPool((ClassReader)clm.constantPool()); for (var m : clm.methods()) { @@ -105,11 +105,8 @@ public void setup() throws IOException { } @Benchmark - public void benchmark() { - if (it == null || !it.hasNext()) - it = data.iterator(); - var d = it.next(); - new StackMapGenerator( + public void benchmarkStackMapsGenerator(Blackhole bh) { + for (var d : data) bh.consume(new StackMapGenerator( d.labelContext(), d.thisClass(), d.methodName(), @@ -117,7 +114,19 @@ public void benchmark() { d.isStatic(), d.bytecode().rewind(), (SplitConstantPool)d.constantPool(), - (ClassFileImpl)cc, - d.handlers()); + (ClassFileImpl)ClassFile.of(), + d.handlers())); + } + + @Benchmark + public void benchmarkStackCounter(Blackhole bh) { + for (var d : data) bh.consume(new StackCounter( + d.labelContext(), + d.methodName(), + d.methodDesc(), + d.isStatic(), + d.bytecode().rewind(), + (SplitConstantPool)d.constantPool(), + d.handlers())); } } From b5cd7efcebe0daaf8a85f0f32b65a3bd446674ef Mon Sep 17 00:00:00 2001 From: Axel Boldt-Christmas Date: Mon, 4 Mar 2024 16:01:08 +0000 Subject: [PATCH 40/86] 8319901: Recursive lightweight locking: ppc64le implementation Co-authored-by: Martin Doerr Reviewed-by: mdoerr, rrich --- src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp | 3 - src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp | 11 + src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp | 6 + src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp | 23 +- src/hotspot/cpu/ppc/macroAssembler_ppc.cpp | 441 +++++++++++++++--- src/hotspot/cpu/ppc/macroAssembler_ppc.hpp | 10 +- src/hotspot/cpu/ppc/ppc.ad | 34 ++ src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp | 15 +- src/hotspot/cpu/ppc/vm_version_ppc.hpp | 1 + 9 files changed, 444 insertions(+), 100 deletions(-) diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp index ba0187d0363..219aeaf316d 100644 --- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp @@ -155,9 +155,6 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb verify_oop(Roop, FILE_AND_LINE); if (LockingMode == LM_LIGHTWEIGHT) { - ld(Rmark, oopDesc::mark_offset_in_bytes(), Roop); - andi_(R0, Rmark, markWord::monitor_value); - bne(CCR0, slow_int); lightweight_unlock(Roop, Rmark, slow_int); } else if (LockingMode == LM_LEGACY) { // Check if it is still a light weight lock, this is is true if we see diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp index d504c71e2b8..cc69c0abe36 100644 --- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp @@ -36,6 +36,17 @@ #endif #define BIND(label) bind(label); BLOCK_COMMENT(#label ":") + +void C2_MacroAssembler::fast_lock_lightweight(ConditionRegister flag, Register obj, Register box, + Register tmp1, Register tmp2, Register tmp3) { + compiler_fast_lock_lightweight_object(flag, obj, tmp1, tmp2, tmp3); +} + +void C2_MacroAssembler::fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box, + Register tmp1, Register tmp2, Register tmp3) { + compiler_fast_unlock_lightweight_object(flag, obj, tmp1, tmp2, tmp3); +} + // Intrinsics for CompactStrings // Compress char[] to byte[] by compressing 16 bytes at once. diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp index ef4840b08a2..5096810ef91 100644 --- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp @@ -28,6 +28,12 @@ // C2_MacroAssembler contains high-level macros for C2 public: + // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file. + void fast_lock_lightweight(ConditionRegister flag, Register obj, Register box, + Register tmp1, Register tmp2, Register tmp3); + void fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box, + Register tmp1, Register tmp2, Register tmp3); + // Intrinsics for CompactStrings // Compress char[] to byte[] by compressing 16 bytes at once. void string_compress_16(Register src, Register dst, Register cnt, diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp index 54a31a16c8a..94ef1b3c9d2 100644 --- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp +++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp @@ -970,9 +970,6 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) { // markWord displaced_header = obj->mark().set_unlocked(); - // Load markWord from object into header. - ld(header, oopDesc::mark_offset_in_bytes(), object); - if (DiagnoseSyncOnValueBasedClasses != 0) { load_klass(tmp, object); lwz(tmp, in_bytes(Klass::access_flags_offset()), tmp); @@ -981,9 +978,11 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) { } if (LockingMode == LM_LIGHTWEIGHT) { - lightweight_lock(object, /* mark word */ header, tmp, slow_case); + lightweight_lock(object, header, tmp, slow_case); b(count_locking); } else if (LockingMode == LM_LEGACY) { + // Load markWord from object into header. + ld(header, oopDesc::mark_offset_in_bytes(), object); // Set displaced_header to be (markWord of object | UNLOCK_VALUE). ori(header, header, markWord::unlocked_value); @@ -1115,22 +1114,6 @@ void InterpreterMacroAssembler::unlock_object(Register monitor) { ld(object, in_bytes(BasicObjectLock::obj_offset()), monitor); if (LockingMode == LM_LIGHTWEIGHT) { - // Check for non-symmetric locking. This is allowed by the spec and the interpreter - // must handle it. - Register tmp = current_header; - // First check for lock-stack underflow. - lwz(tmp, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); - cmplwi(CCR0, tmp, (unsigned)LockStack::start_offset()); - ble(CCR0, slow_case); - // Then check if the top of the lock-stack matches the unlocked object. - addi(tmp, tmp, -oopSize); - ldx(tmp, tmp, R16_thread); - cmpd(CCR0, tmp, object); - bne(CCR0, slow_case); - - ld(header, oopDesc::mark_offset_in_bytes(), object); - andi_(R0, header, markWord::monitor_value); - bne(CCR0, slow_case); lightweight_unlock(object, header, slow_case); } else { addi(object_mark_addr, object, oopDesc::mark_offset_in_bytes()); diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp index fe19cf03500..b7b5936a58d 100644 --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp @@ -38,6 +38,7 @@ #include "oops/klass.inline.hpp" #include "oops/methodData.hpp" #include "prims/methodHandles.hpp" +#include "register_ppc.hpp" #include "runtime/icache.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/objectMonitor.hpp" @@ -2259,8 +2260,8 @@ address MacroAssembler::emit_trampoline_stub(int destination_toc_offset, // "The box" is the space on the stack where we copy the object mark. void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register oop, Register box, Register temp, Register displaced_header, Register current_header) { + assert(LockingMode != LM_LIGHTWEIGHT, "uses fast_lock_lightweight"); assert_different_registers(oop, box, temp, displaced_header, current_header); - assert(LockingMode != LM_LIGHTWEIGHT || flag == CCR0, "bad condition register"); Label object_has_monitor; Label cas_failed; Label success, failure; @@ -2284,7 +2285,8 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register // Set NE to indicate 'failure' -> take slow-path. crandc(flag, Assembler::equal, flag, Assembler::equal); b(failure); - } else if (LockingMode == LM_LEGACY) { + } else { + assert(LockingMode == LM_LEGACY, "must be"); // Set displaced_header to be (markWord of object | UNLOCK_VALUE). ori(displaced_header, displaced_header, markWord::unlocked_value); @@ -2328,10 +2330,6 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register } beq(CCR0, success); b(failure); - } else { - assert(LockingMode == LM_LIGHTWEIGHT, "must be"); - lightweight_lock(oop, displaced_header, temp, failure); - b(success); } // Handle existing monitor. @@ -2349,10 +2347,8 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register MacroAssembler::MemBarRel | MacroAssembler::MemBarAcq, MacroAssembler::cmpxchgx_hint_acquire_lock()); - if (LockingMode != LM_LIGHTWEIGHT) { - // Store a non-null value into the box. - std(box, BasicLock::displaced_header_offset_in_bytes(), box); - } + // Store a non-null value into the box. + std(box, BasicLock::displaced_header_offset_in_bytes(), box); beq(flag, success); // Check for recursive locking. @@ -2374,8 +2370,8 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Register oop, Register box, Register temp, Register displaced_header, Register current_header) { + assert(LockingMode != LM_LIGHTWEIGHT, "uses fast_unlock_lightweight"); assert_different_registers(oop, box, temp, displaced_header, current_header); - assert(LockingMode != LM_LIGHTWEIGHT || flag == CCR0, "bad condition register"); Label success, failure, object_has_monitor, notRecursive; if (LockingMode == LM_LEGACY) { @@ -2397,7 +2393,8 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe // Set NE to indicate 'failure' -> take slow-path. crandc(flag, Assembler::equal, flag, Assembler::equal); b(failure); - } else if (LockingMode == LM_LEGACY) { + } else { + assert(LockingMode == LM_LEGACY, "must be"); // Check if it is still a light weight lock, this is is true if we see // the stack address of the basicLock in the markWord of the object. // Cmpxchg sets flag to cmpd(current_header, box). @@ -2412,10 +2409,6 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe &failure); assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0"); b(success); - } else { - assert(LockingMode == LM_LIGHTWEIGHT, "must be"); - lightweight_unlock(oop, current_header, failure); - b(success); } // Handle existing monitor. @@ -2455,6 +2448,276 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe bind(failure); } +void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister flag, Register obj, Register tmp1, + Register tmp2, Register tmp3) { + assert_different_registers(obj, tmp1, tmp2, tmp3); + assert(flag == CCR0, "bad condition register"); + + // Handle inflated monitor. + Label inflated; + // Finish fast lock successfully. MUST reach to with flag == NE + Label locked; + // Finish fast lock unsuccessfully. MUST branch to with flag == EQ + Label slow_path; + + if (DiagnoseSyncOnValueBasedClasses != 0) { + load_klass(tmp1, obj); + lwz(tmp1, in_bytes(Klass::access_flags_offset()), tmp1); + testbitdi(flag, R0, tmp1, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS)); + bne(flag, slow_path); + } + + const Register mark = tmp1; + const Register t = tmp3; // Usage of R0 allowed! + + { // Lightweight locking + + // Push lock to the lock stack and finish successfully. MUST reach to with flag == EQ + Label push; + + const Register top = tmp2; + + // Check if lock-stack is full. + lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + cmplwi(flag, top, LockStack::end_offset() - 1); + bgt(flag, slow_path); + + // The underflow check is elided. The recursive check will always fail + // when the lock stack is empty because of the _bad_oop_sentinel field. + + // Check if recursive. + subi(t, top, oopSize); + ldx(t, R16_thread, t); + cmpd(flag, obj, t); + beq(flag, push); + + // Check for monitor (0b10) or locked (0b00). + ld(mark, oopDesc::mark_offset_in_bytes(), obj); + andi_(t, mark, markWord::lock_mask_in_place); + cmpldi(flag, t, markWord::unlocked_value); + bgt(flag, inflated); + bne(flag, slow_path); + + // Not inflated. + + // Try to lock. Transition lock bits 0b00 => 0b01 + assert(oopDesc::mark_offset_in_bytes() == 0, "required to avoid a lea"); + atomically_flip_locked_state(/* is_unlock */ false, obj, mark, slow_path, MacroAssembler::MemBarAcq); + + bind(push); + // After successful lock, push object on lock-stack. + stdx(obj, R16_thread, top); + addi(top, top, oopSize); + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + b(locked); + } + + { // Handle inflated monitor. + bind(inflated); + + // mark contains the tagged ObjectMonitor*. + const Register tagged_monitor = mark; + const uintptr_t monitor_tag = markWord::monitor_value; + const Register owner_addr = tmp2; + + // Compute owner address. + addi(owner_addr, tagged_monitor, in_bytes(ObjectMonitor::owner_offset()) - monitor_tag); + + // CAS owner (null => current thread). + cmpxchgd(/*flag=*/flag, + /*current_value=*/t, + /*compare_value=*/(intptr_t)0, + /*exchange_value=*/R16_thread, + /*where=*/owner_addr, + MacroAssembler::MemBarRel | MacroAssembler::MemBarAcq, + MacroAssembler::cmpxchgx_hint_acquire_lock()); + beq(flag, locked); + + // Check if recursive. + cmpd(flag, t, R16_thread); + bne(flag, slow_path); + + // Recursive. + ld(tmp1, in_bytes(ObjectMonitor::recursions_offset() - ObjectMonitor::owner_offset()), owner_addr); + addi(tmp1, tmp1, 1); + std(tmp1, in_bytes(ObjectMonitor::recursions_offset() - ObjectMonitor::owner_offset()), owner_addr); + } + + bind(locked); + inc_held_monitor_count(tmp1); + +#ifdef ASSERT + // Check that locked label is reached with flag == EQ. + Label flag_correct; + beq(flag, flag_correct); + stop("Fast Lock Flag != EQ"); +#endif + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag == NE. + bne(flag, flag_correct); + stop("Fast Lock Flag != NE"); + bind(flag_correct); +#endif + // C2 uses the value of flag (NE vs EQ) to determine the continuation. +} + +void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister flag, Register obj, Register tmp1, + Register tmp2, Register tmp3) { + assert_different_registers(obj, tmp1, tmp2, tmp3); + assert(flag == CCR0, "bad condition register"); + + // Handle inflated monitor. + Label inflated, inflated_load_monitor; + // Finish fast unlock successfully. MUST reach to with flag == EQ. + Label unlocked; + // Finish fast unlock unsuccessfully. MUST branch to with flag == NE. + Label slow_path; + + const Register mark = tmp1; + const Register top = tmp2; + const Register t = tmp3; + + { // Lightweight unlock + Label push_and_slow; + + // Check if obj is top of lock-stack. + lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + subi(top, top, oopSize); + ldx(t, R16_thread, top); + cmpd(flag, obj, t); + // Top of lock stack was not obj. Must be monitor. + bne(flag, inflated_load_monitor); + + // Pop lock-stack. + DEBUG_ONLY(li(t, 0);) + DEBUG_ONLY(stdx(t, R16_thread, top);) + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + + // The underflow check is elided. The recursive check will always fail + // when the lock stack is empty because of the _bad_oop_sentinel field. + + // Check if recursive. + subi(t, top, oopSize); + ldx(t, R16_thread, t); + cmpd(flag, obj, t); + beq(flag, unlocked); + + // Not recursive. + + // Check for monitor (0b10). + ld(mark, oopDesc::mark_offset_in_bytes(), obj); + andi_(t, mark, markWord::monitor_value); + bne(CCR0, inflated); + +#ifdef ASSERT + // Check header not unlocked (0b01). + Label not_unlocked; + andi_(t, mark, markWord::unlocked_value); + beq(CCR0, not_unlocked); + stop("lightweight_unlock already unlocked"); + bind(not_unlocked); +#endif + + // Try to unlock. Transition lock bits 0b00 => 0b01 + atomically_flip_locked_state(/* is_unlock */ true, obj, mark, push_and_slow, MacroAssembler::MemBarRel); + b(unlocked); + + bind(push_and_slow); + // Restore lock-stack and handle the unlock in runtime. + DEBUG_ONLY(stdx(obj, R16_thread, top);) + addi(top, top, oopSize); + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + b(slow_path); + } + + { // Handle inflated monitor. + bind(inflated_load_monitor); + ld(mark, oopDesc::mark_offset_in_bytes(), obj); +#ifdef ASSERT + andi_(t, mark, markWord::monitor_value); + bne(CCR0, inflated); + stop("Fast Unlock not monitor"); +#endif + + bind(inflated); + +#ifdef ASSERT + Label check_done; + subi(top, top, oopSize); + cmplwi(CCR0, top, in_bytes(JavaThread::lock_stack_base_offset())); + blt(CCR0, check_done); + ldx(t, R16_thread, top); + cmpd(flag, obj, t); + bne(flag, inflated); + stop("Fast Unlock lock on stack"); + bind(check_done); +#endif + + // mark contains the tagged ObjectMonitor*. + const Register monitor = mark; + const uintptr_t monitor_tag = markWord::monitor_value; + + // Untag the monitor. + subi(monitor, mark, monitor_tag); + + const Register recursions = tmp2; + Label not_recursive; + + // Check if recursive. + ld(recursions, in_bytes(ObjectMonitor::recursions_offset()), monitor); + addic_(recursions, recursions, -1); + blt(CCR0, not_recursive); + + // Recursive unlock. + std(recursions, in_bytes(ObjectMonitor::recursions_offset()), monitor); + crorc(CCR0, Assembler::equal, CCR0, Assembler::equal); + b(unlocked); + + bind(not_recursive); + + Label release_; + const Register t2 = tmp2; + + // Check if the entry lists are empty. + ld(t, in_bytes(ObjectMonitor::EntryList_offset()), monitor); + ld(t2, in_bytes(ObjectMonitor::cxq_offset()), monitor); + orr(t, t, t2); + cmpdi(flag, t, 0); + beq(flag, release_); + + // The owner may be anonymous and we removed the last obj entry in + // the lock-stack. This loses the information about the owner. + // Write the thread to the owner field so the runtime knows the owner. + std(R16_thread, in_bytes(ObjectMonitor::owner_offset()), monitor); + b(slow_path); + + bind(release_); + // Set owner to null. + release(); + // t contains 0 + std(t, in_bytes(ObjectMonitor::owner_offset()), monitor); + } + + bind(unlocked); + dec_held_monitor_count(t); + +#ifdef ASSERT + // Check that unlocked label is reached with flag == EQ. + Label flag_correct; + beq(flag, flag_correct); + stop("Fast Lock Flag != EQ"); +#endif + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag == NE. + bne(flag, flag_correct); + stop("Fast Lock Flag != NE"); + bind(flag_correct); +#endif + // C2 uses the value of flag (NE vs EQ) to determine the continuation. +} + void MacroAssembler::safepoint_poll(Label& slow_path, Register temp, bool at_return, bool in_nmethod) { ld(temp, in_bytes(JavaThread::polling_word_offset()), R16_thread); @@ -4074,58 +4337,57 @@ void MacroAssembler::atomically_flip_locked_state(bool is_unlock, Register obj, } // Implements lightweight-locking. -// Branches to slow upon failure to lock the object, with CCR0 NE. -// Falls through upon success with CCR0 EQ. // // - obj: the object to be locked -// - hdr: the header, already loaded from obj, will be destroyed -// - t1: temporary register -void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register t1, Label& slow) { +// - t1, t2: temporary register +void MacroAssembler::lightweight_lock(Register obj, Register t1, Register t2, Label& slow) { assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking"); - assert_different_registers(obj, hdr, t1); + assert_different_registers(obj, t1, t2); - // Check if we would have space on lock-stack for the object. - lwz(t1, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); - cmplwi(CCR0, t1, LockStack::end_offset() - 1); - bgt(CCR0, slow); + Label push; + const Register top = t1; + const Register mark = t2; + const Register t = R0; - // Quick check: Do not reserve cache line for atomic update if not unlocked. - // (Similar to contention_hint in cmpxchg solutions.) - xori(R0, hdr, markWord::unlocked_value); // flip unlocked bit - andi_(R0, R0, markWord::lock_mask_in_place); - bne(CCR0, slow); // failed if new header doesn't contain locked_value (which is 0) + // Check if the lock-stack is full. + lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + cmplwi(CCR0, top, LockStack::end_offset()); + bge(CCR0, slow); - // Note: We're not publishing anything (like the displaced header in LM_LEGACY) - // to other threads at this point. Hence, no release barrier, here. - // (The obj has been written to the BasicObjectLock at obj_offset() within the own thread stack.) - atomically_flip_locked_state(/* is_unlock */ false, obj, hdr, slow, MacroAssembler::MemBarAcq); + // The underflow check is elided. The recursive check will always fail + // when the lock stack is empty because of the _bad_oop_sentinel field. + // Check for recursion. + subi(t, top, oopSize); + ldx(t, R16_thread, t); + cmpd(CCR0, obj, t); + beq(CCR0, push); + + // Check header for monitor (0b10) or locked (0b00). + ld(mark, oopDesc::mark_offset_in_bytes(), obj); + xori(t, mark, markWord::unlocked_value); + andi_(t, t, markWord::lock_mask_in_place); + bne(CCR0, slow); + + // Try to lock. Transition lock bits 0b00 => 0b01 + atomically_flip_locked_state(/* is_unlock */ false, obj, mark, slow, MacroAssembler::MemBarAcq); + + bind(push); // After successful lock, push object on lock-stack - stdx(obj, t1, R16_thread); - addi(t1, t1, oopSize); - stw(t1, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + stdx(obj, R16_thread, top); + addi(top, top, oopSize); + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); } // Implements lightweight-unlocking. -// Branches to slow upon failure, with CCR0 NE. -// Falls through upon success, with CCR0 EQ. // // - obj: the object to be unlocked -// - hdr: the (pre-loaded) header of the object, will be destroyed -void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Label& slow) { +// - t1: temporary register +void MacroAssembler::lightweight_unlock(Register obj, Register t1, Label& slow) { assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking"); - assert_different_registers(obj, hdr); + assert_different_registers(obj, t1); #ifdef ASSERT - { - // Check that hdr is fast-locked. - Label hdr_ok; - andi_(R0, hdr, markWord::lock_mask_in_place); - beq(CCR0, hdr_ok); - stop("Header is not fast-locked"); - bind(hdr_ok); - } - Register t1 = hdr; // Reuse in debug build. { // The following checks rely on the fact that LockStack is only ever modified by // its owning thread, even if the lock got inflated concurrently; removal of LockStack @@ -4135,32 +4397,67 @@ void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Label& slow) Label stack_ok; lwz(t1, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); cmplwi(CCR0, t1, LockStack::start_offset()); - bgt(CCR0, stack_ok); + bge(CCR0, stack_ok); stop("Lock-stack underflow"); bind(stack_ok); } - { - // Check if the top of the lock-stack matches the unlocked object. - Label tos_ok; - addi(t1, t1, -oopSize); - ldx(t1, t1, R16_thread); - cmpd(CCR0, t1, obj); - beq(CCR0, tos_ok); - stop("Top of lock-stack does not match the unlocked object"); - bind(tos_ok); - } #endif - // Release the lock. - atomically_flip_locked_state(/* is_unlock */ true, obj, hdr, slow, MacroAssembler::MemBarRel); + Label unlocked, push_and_slow; + const Register top = t1; + const Register mark = R0; + Register t = R0; + + // Check if obj is top of lock-stack. + lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + subi(top, top, oopSize); + ldx(t, R16_thread, top); + cmpd(CCR0, obj, t); + bne(CCR0, slow); + + // Pop lock-stack. + DEBUG_ONLY(li(t, 0);) + DEBUG_ONLY(stdx(t, R16_thread, top);) + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + + // The underflow check is elided. The recursive check will always fail + // when the lock stack is empty because of the _bad_oop_sentinel field. + + // Check if recursive. + subi(t, top, oopSize); + ldx(t, R16_thread, t); + cmpd(CCR0, obj, t); + beq(CCR0, unlocked); + + // Use top as tmp + t = top; + + // Not recursive. Check header for monitor (0b10). + ld(mark, oopDesc::mark_offset_in_bytes(), obj); + andi_(t, mark, markWord::monitor_value); + bne(CCR0, push_and_slow); - // After successful unlock, pop object from lock-stack - Register t2 = hdr; - lwz(t2, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); - addi(t2, t2, -oopSize); #ifdef ASSERT - li(R0, 0); - stdx(R0, t2, R16_thread); + // Check header not unlocked (0b01). + Label not_unlocked; + andi_(t, mark, markWord::unlocked_value); + beq(CCR0, not_unlocked); + stop("lightweight_unlock already unlocked"); + bind(not_unlocked); #endif - stw(t2, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + + // Try to unlock. Transition lock bits 0b00 => 0b01 + atomically_flip_locked_state(/* is_unlock */ true, obj, t, push_and_slow, MacroAssembler::MemBarRel); + b(unlocked); + + bind(push_and_slow); + + // Restore lock-stack and handle the unlock in runtime. + lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + DEBUG_ONLY(stdx(obj, R16_thread, top);) + addi(top, top, oopSize); + stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread); + b(slow); + + bind(unlocked); } diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp index ec370a450ac..92db8a86b42 100644 --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp @@ -615,8 +615,8 @@ class MacroAssembler: public Assembler { void inc_held_monitor_count(Register tmp); void dec_held_monitor_count(Register tmp); void atomically_flip_locked_state(bool is_unlock, Register obj, Register tmp, Label& failed, int semantics); - void lightweight_lock(Register obj, Register hdr, Register t1, Label& slow); - void lightweight_unlock(Register obj, Register hdr, Label& slow); + void lightweight_lock(Register obj, Register t1, Register t2, Label& slow); + void lightweight_unlock(Register obj, Register t1, Label& slow); // allocation (for C1) void tlab_allocate( @@ -637,6 +637,12 @@ class MacroAssembler: public Assembler { void compiler_fast_unlock_object(ConditionRegister flag, Register oop, Register box, Register tmp1, Register tmp2, Register tmp3); + void compiler_fast_lock_lightweight_object(ConditionRegister flag, Register oop, Register tmp1, + Register tmp2, Register tmp3); + + void compiler_fast_unlock_lightweight_object(ConditionRegister flag, Register oop, Register tmp1, + Register tmp2, Register tmp3); + // Check if safepoint requested and if so branch void safepoint_poll(Label& slow_path, Register temp, bool at_return, bool in_nmethod); diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad index 110c6b9b668..1058ae35b76 100644 --- a/src/hotspot/cpu/ppc/ppc.ad +++ b/src/hotspot/cpu/ppc/ppc.ad @@ -12122,6 +12122,7 @@ instruct partialSubtypeCheck(iRegPdst result, iRegP_N2P subklass, iRegP_N2P supe // inlined locking and unlocking instruct cmpFastLock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2) %{ + predicate(LockingMode != LM_LIGHTWEIGHT); match(Set crx (FastLock oop box)); effect(TEMP tmp1, TEMP tmp2); @@ -12137,6 +12138,7 @@ instruct cmpFastLock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, %} instruct cmpFastUnlock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3) %{ + predicate(LockingMode != LM_LIGHTWEIGHT); match(Set crx (FastUnlock oop box)); effect(TEMP tmp1, TEMP tmp2, TEMP tmp3); @@ -12151,6 +12153,38 @@ instruct cmpFastUnlock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp ins_pipe(pipe_class_compare); %} +instruct cmpFastLockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2) %{ + predicate(LockingMode == LM_LIGHTWEIGHT); + match(Set crx (FastLock oop box)); + effect(TEMP tmp1, TEMP tmp2); + + format %{ "FASTLOCK $oop, $box, $tmp1, $tmp2" %} + ins_encode %{ + __ fast_lock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register, + $tmp1$$Register, $tmp2$$Register, /*tmp3*/ R0); + // If locking was successful, crx should indicate 'EQ'. + // The compiler generates a branch to the runtime call to + // _complete_monitor_locking_Java for the case where crx is 'NE'. + %} + ins_pipe(pipe_class_compare); +%} + +instruct cmpFastUnlockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3) %{ + predicate(LockingMode == LM_LIGHTWEIGHT); + match(Set crx (FastUnlock oop box)); + effect(TEMP tmp1, TEMP tmp2, TEMP tmp3); + + format %{ "FASTUNLOCK $oop, $box, $tmp1, $tmp2" %} + ins_encode %{ + __ fast_unlock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register, + $tmp1$$Register, $tmp2$$Register, $tmp3$$Register); + // If unlocking was successful, crx should indicate 'EQ'. + // The compiler generates a branch to the runtime call to + // _complete_monitor_unlocking_Java for the case where crx is 'NE'. + %} + ins_pipe(pipe_class_compare); +%} + // Align address. instruct align_addr(iRegPdst dst, iRegPsrc src, immLnegpow2 mask) %{ match(Set dst (CastX2P (AndL (CastP2X src) mask))); diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp index 5a080adc7a9..66b19794b05 100644 --- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp +++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp @@ -2356,8 +2356,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm, __ addi(r_box, R1_SP, lock_offset); // Try fastpath for locking. - // fast_lock kills r_temp_1, r_temp_2, r_temp_3. - __ compiler_fast_lock_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3); + if (LockingMode == LM_LIGHTWEIGHT) { + // fast_lock kills r_temp_1, r_temp_2, r_temp_3. + __ compiler_fast_lock_lightweight_object(CCR0, r_oop, r_temp_1, r_temp_2, r_temp_3); + } else { + // fast_lock kills r_temp_1, r_temp_2, r_temp_3. + __ compiler_fast_lock_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3); + } __ beq(CCR0, locked); // None of the above fast optimizations worked so we have to get into the @@ -2567,7 +2572,11 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm, __ addi(r_box, R1_SP, lock_offset); // Try fastpath for unlocking. - __ compiler_fast_unlock_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3); + if (LockingMode == LM_LIGHTWEIGHT) { + __ compiler_fast_unlock_lightweight_object(CCR0, r_oop, r_temp_1, r_temp_2, r_temp_3); + } else { + __ compiler_fast_unlock_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3); + } __ beq(CCR0, done); // Save and restore any potential method result value around the unlocking operation. diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp index a5831ef1590..0efde131277 100644 --- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp +++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp @@ -94,6 +94,7 @@ class VM_Version: public Abstract_VM_Version { // PPC64 supports fast class initialization checks static bool supports_fast_class_init_checks() { return true; } constexpr static bool supports_stack_watermark_barrier() { return true; } + constexpr static bool supports_recursive_lightweight_locking() { return true; } static bool is_determine_features_test_running() { return _is_determine_features_test_running; } // CPU instruction support From 43c6f0b5880899b797fab2f851bd35be1c342439 Mon Sep 17 00:00:00 2001 From: Christoph Langer Date: Mon, 4 Mar 2024 16:32:48 +0000 Subject: [PATCH 41/86] 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used Reviewed-by: mbaesken --- .../jdk/modules/etc/JmodExcludedFiles.java | 61 +++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/test/jdk/jdk/modules/etc/JmodExcludedFiles.java b/test/jdk/jdk/modules/etc/JmodExcludedFiles.java index c3ec4408232..6c338a25b4f 100644 --- a/test/jdk/jdk/modules/etc/JmodExcludedFiles.java +++ b/test/jdk/jdk/modules/etc/JmodExcludedFiles.java @@ -32,19 +32,22 @@ import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import jdk.internal.util.OperatingSystem; public class JmodExcludedFiles { + private static String javaHome = System.getProperty("java.home"); + public static void main(String[] args) throws Exception { - String javaHome = System.getProperty("java.home"); Path jmods = Path.of(javaHome, "jmods"); try (DirectoryStream stream = Files.newDirectoryStream(jmods, "*.jmod")) { for (Path jmodFile : stream) { try (ZipFile zip = new ZipFile(jmodFile.toFile())) { + JModSymbolFileMatcher jsfm = new JModSymbolFileMatcher(jmodFile.toString()); if (zip.stream().map(ZipEntry::getName) - .anyMatch(JmodExcludedFiles::isNativeDebugSymbol)) { + .anyMatch(jsfm::isNativeDebugSymbol)) { throw new RuntimeException(jmodFile + " is expected not to include native debug symbols"); } } @@ -52,25 +55,47 @@ public static void main(String[] args) throws Exception { } } - private static boolean isNativeDebugSymbol(String name) { - int index = name.indexOf("/"); - if (index < 0) { - throw new RuntimeException("unexpected entry name: " + name); + static class JModSymbolFileMatcher { + private String jmod; + + JModSymbolFileMatcher(String jmod) { + this.jmod = jmod; } - String section = name.substring(0, index); - if (section.equals("lib") || section.equals("bin")) { - if (OperatingSystem.isMacOS()) { - String n = name.substring(index+1); - int i = n.indexOf("/"); - if (i != -1) { - return n.substring(0, i).endsWith(".dSYM"); + + boolean isNativeDebugSymbol(String name) { + int index = name.indexOf("/"); + if (index < 0) { + throw new RuntimeException("unexpected entry name: " + name); + } + String section = name.substring(0, index); + if (section.equals("lib") || section.equals("bin")) { + if (OperatingSystem.isMacOS()) { + String n = name.substring(index + 1); + int i = n.indexOf("/"); + if (i != -1) { + if (n.substring(0, i).endsWith(".dSYM")) { + System.err.println("Found symbols in " + jmod + ": " + name); + return true; + } + } + } + if (OperatingSystem.isWindows() && name.endsWith(".pdb")) { + // on Windows we check if we should have public symbols through --with-external-symbols-in-bundles=public (JDK-8237192) + String strippedpdb = javaHome + "/bin/" + name.substring(index + 1, name.length() - 4) + ".stripped.pdb"; + if (!Files.exists(Paths.get(strippedpdb))) { + System.err.println("Found symbols in " + jmod + ": " + name + + ". No stripped pdb file " + strippedpdb + " exists."); + return true; + } + } + if (name.endsWith(".diz") + || name.endsWith(".debuginfo") + || name.endsWith(".map")) { + System.err.println("Found symbols in " + jmod + ": " + name); + return true; } } - return name.endsWith(".diz") - || name.endsWith(".debuginfo") - || name.endsWith(".map") - || name.endsWith(".pdb"); + return false; } - return false; } } From 59529a92ca33a59636cfc2175fb8ffeb1d67a29f Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 4 Mar 2024 16:47:14 +0000 Subject: [PATCH 42/86] 8326688: Parallel: Remove unnecessary BOT update in UpdateOnlyClosure::do_addr Reviewed-by: tschatzl, iwalulya --- src/hotspot/share/gc/parallel/psParallelCompact.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index aafbdfaeb04..77a8425ae46 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -2402,7 +2402,6 @@ void PSParallelCompact::verify_complete(SpaceId space_id) { #endif // #ifdef ASSERT inline void UpdateOnlyClosure::do_addr(HeapWord* addr) { - _start_array->update_for_block(addr, addr + cast_to_oop(addr)->size()); compaction_manager()->update_contents(cast_to_oop(addr)); } From 8cfacebd06da3a45d119b5378ce0c2dd591d2442 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 4 Mar 2024 17:50:42 +0000 Subject: [PATCH 43/86] 8327125: SpinYield.report should report microseconds Reviewed-by: gli, dholmes, shade --- src/hotspot/share/utilities/spinYield.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/utilities/spinYield.cpp b/src/hotspot/share/utilities/spinYield.cpp index 59fecc4677d..0b331a49784 100644 --- a/src/hotspot/share/utilities/spinYield.cpp +++ b/src/hotspot/share/utilities/spinYield.cpp @@ -66,7 +66,7 @@ void SpinYield::report(outputStream* s) const { if (_sleep_time.value() != 0) { // Report sleep duration, if slept. separator = print_separator(s, separator); s->print("sleep = " UINT64_FORMAT " usecs", - _sleep_time.milliseconds()); + _sleep_time.microseconds()); } if (separator == initial_separator) { s->print("no waiting"); From 6f8d351e8678be9183628f2691ae18e4016c6cb3 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 4 Mar 2024 17:54:45 +0000 Subject: [PATCH 44/86] 8325725: Parallel: Refactor PSParallelCompact::fill_dense_prefix_end Reviewed-by: tschatzl, iwalulya --- .../share/gc/parallel/psParallelCompact.cpp | 95 +++++++------------ .../share/gc/parallel/psParallelCompact.hpp | 10 +- .../gc/parallel/psParallelCompact.inline.hpp | 14 --- 3 files changed, 36 insertions(+), 83 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 77a8425ae46..d6cafe72401 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -1292,68 +1292,36 @@ void PSParallelCompact::summarize_spaces_quick() } } -void PSParallelCompact::fill_dense_prefix_end(SpaceId id) -{ +void PSParallelCompact::fill_dense_prefix_end(SpaceId id) { + // Since both markword and klass takes 1 heap word, the min-obj-size is 2 + // heap words. + // If min-fill-size decreases to 1, this whole method becomes redundant. + assert(CollectedHeap::min_fill_size() == 2, "inv"); +#ifndef _LP64 + // In 32-bit system, min-obj-alignment is >= 8 bytes, so the gap (if any) + // right before denses-prefix must be greater than min-fill-size; nothing to + // do. + return; +#endif HeapWord* const dense_prefix_end = dense_prefix(id); - const RegionData* region = _summary_data.addr_to_region_ptr(dense_prefix_end); - const idx_t dense_prefix_bit = _mark_bitmap.addr_to_bit(dense_prefix_end); - if (dead_space_crosses_boundary(region, dense_prefix_bit)) { - // Only enough dead space is filled so that any remaining dead space to the - // left is larger than the minimum filler object. (The remainder is filled - // during the copy/update phase.) - // - // The size of the dead space to the right of the boundary is not a - // concern, since compaction will be able to use whatever space is - // available. - // - // Here '||' is the boundary, 'x' represents a don't care bit and a box - // surrounds the space to be filled with an object. - // - // In the 32-bit VM, each bit represents two 32-bit words: - // +---+ - // a) beg_bits: ... x x x | 0 | || 0 x x ... - // end_bits: ... x x x | 0 | || 0 x x ... - // +---+ - // - // In the 64-bit VM, each bit represents one 64-bit word: - // +------------+ - // b) beg_bits: ... x x x | 0 || 0 | x x ... - // end_bits: ... x x 1 | 0 || 0 | x x ... - // +------------+ - // +-------+ - // c) beg_bits: ... x x | 0 0 | || 0 x x ... - // end_bits: ... x 1 | 0 0 | || 0 x x ... - // +-------+ - // +-----------+ - // d) beg_bits: ... x | 0 0 0 | || 0 x x ... - // end_bits: ... 1 | 0 0 0 | || 0 x x ... - // +-----------+ - // +-------+ - // e) beg_bits: ... 0 0 | 0 0 | || 0 x x ... - // end_bits: ... 0 0 | 0 0 | || 0 x x ... - // +-------+ - - // Initially assume case a, c or e will apply. - size_t obj_len = CollectedHeap::min_fill_size(); - HeapWord* obj_beg = dense_prefix_end - obj_len; - -#ifdef _LP64 - if (MinObjAlignment > 1) { // object alignment > heap word size - // Cases a, c or e. - } else if (_mark_bitmap.is_obj_end(dense_prefix_bit - 2)) { - // Case b above. - obj_beg = dense_prefix_end - 1; - } else if (!_mark_bitmap.is_obj_end(dense_prefix_bit - 3) && - _mark_bitmap.is_obj_end(dense_prefix_bit - 4)) { - // Case d above. - obj_beg = dense_prefix_end - 3; - obj_len = 3; - } -#endif // #ifdef _LP64 + RegionData* const region_after_dense_prefix = _summary_data.addr_to_region_ptr(dense_prefix_end); + idx_t const dense_prefix_bit = _mark_bitmap.addr_to_bit(dense_prefix_end); + + if (region_after_dense_prefix->partial_obj_size() != 0 || + _mark_bitmap.is_obj_beg(dense_prefix_bit)) { + // The region after the dense prefix starts with live bytes. + return; + } + if (_mark_bitmap.is_obj_end(dense_prefix_bit - 2)) { + // There is exactly one heap word gap right before the dense prefix end, so we need a filler object. + // The filler object will extend into the region after the last dense prefix region. + const size_t obj_len = 2; // min-fill-size + HeapWord* const obj_beg = dense_prefix_end - 1; CollectedHeap::fill_with_object(obj_beg, obj_len); _mark_bitmap.mark_obj(obj_beg, obj_len); - _summary_data.add_obj(obj_beg, obj_len); + _summary_data.addr_to_region_ptr(obj_beg)->add_live_obj(1); + region_after_dense_prefix->set_partial_obj_size(1); assert(start_array(id) != nullptr, "sanity"); start_array(id)->update_for_block(obj_beg, obj_beg + obj_len); } @@ -2426,8 +2394,10 @@ PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm, assert(sd.region(claim_region)->claim_unsafe(), "claim() failed"); } #endif // #ifdef ASSERT + HeapWord* const space_bottom = space(space_id)->bottom(); - if (beg_addr != space(space_id)->bottom()) { + // Check if it's the first region in this space. + if (beg_addr != space_bottom) { // Find the first live object or block of dead space that *starts* in this // range of regions. If a partial object crosses onto the region, skip it; // it will be marked for 'deferred update' when the object head is @@ -2439,8 +2409,11 @@ PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm, const RegionData* const cp = sd.region(beg_region); if (cp->partial_obj_size() != 0) { beg_addr = sd.partial_obj_end(beg_region); - } else if (dead_space_crosses_boundary(cp, mbm->addr_to_bit(beg_addr))) { - beg_addr = mbm->find_obj_beg(beg_addr, end_addr); + } else { + idx_t beg_bit = mbm->addr_to_bit(beg_addr); + if (!mbm->is_obj_beg(beg_bit) && !mbm->is_obj_end(beg_bit - 1)) { + beg_addr = mbm->find_obj_beg(beg_addr, end_addr); + } } } diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 55d434bdcde..6a158e1385e 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -1012,14 +1012,8 @@ class PSParallelCompact : AllStatic { static HeapWord* compute_dense_prefix(const SpaceId id, bool maximum_compaction); - // Return true if dead space crosses onto the specified Region; bit must be - // the bit index corresponding to the first word of the Region. - static inline bool dead_space_crosses_boundary(const RegionData* region, - idx_t bit); - - // Summary phase utility routine to fill dead space (if any) at the dense - // prefix boundary. Should only be called if the dense prefix is - // non-empty. + // Create a filler obj (if needed) right before the dense-prefix-boundary to + // make the heap parsable. static void fill_dense_prefix_end(SpaceId id); static void summarize_spaces_quick(); diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp index bec95c0e13c..12dbcab8959 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp @@ -46,20 +46,6 @@ inline double PSParallelCompact::normal_distribution(double density) { return _dwl_first_term * exp(-0.5 * squared_term * squared_term); } -inline bool PSParallelCompact::dead_space_crosses_boundary(const RegionData* region, - idx_t bit) { - assert(bit > 0, "cannot call this for the first bit/region"); - assert(_summary_data.region_to_addr(region) == _mark_bitmap.bit_to_addr(bit), - "sanity check"); - - // Dead space crosses the boundary if (1) a partial object does not extend - // onto the region, (2) an object does not start at the beginning of the - // region, and (3) an object does not end at the end of the prior region. - return region->partial_obj_size() == 0 && - !_mark_bitmap.is_obj_beg(bit) && - !_mark_bitmap.is_obj_end(bit - 1); -} - inline bool PSParallelCompact::is_in(HeapWord* p, HeapWord* beg_addr, HeapWord* end_addr) { return p >= beg_addr && p < end_addr; } From f615ac4bdf94750390d18aa954d41f72eb4ef4d2 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Mon, 4 Mar 2024 18:40:50 +0000 Subject: [PATCH 45/86] 8309622: Re-examine the cache mechanism in BaseLocale Reviewed-by: dfuchs, rriggs --- .../share/classes/java/util/Locale.java | 31 +-- .../classes/java/util/ResourceBundle.java | 189 ++++++++------- .../classes/sun/util/locale/BaseLocale.java | 222 +++++------------- .../sun/util/locale/LocaleObjectCache.java | 114 --------- 4 files changed, 166 insertions(+), 390 deletions(-) delete mode 100644 src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java index 88a49a94f9b..0dde196a784 100644 --- a/src/java.base/share/classes/java/util/Locale.java +++ b/src/java.base/share/classes/java/util/Locale.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, 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 @@ -51,6 +51,7 @@ import java.util.spi.LocaleNameProvider; import java.util.stream.Stream; +import jdk.internal.util.ReferencedKeyMap; import jdk.internal.util.StaticProperty; import jdk.internal.vm.annotation.Stable; @@ -60,7 +61,6 @@ import sun.util.locale.LanguageTag; import sun.util.locale.LocaleExtensions; import sun.util.locale.LocaleMatcher; -import sun.util.locale.LocaleObjectCache; import sun.util.locale.LocaleSyntaxException; import sun.util.locale.LocaleUtils; import sun.util.locale.ParseStatus; @@ -987,29 +987,20 @@ static Locale getInstance(BaseLocale baseloc, LocaleExtensions extensions) { if (locale != null) { return locale; } - return Cache.LOCALECACHE.get(baseloc); + return LOCALE_CACHE.computeIfAbsent(baseloc, Locale::createLocale); } else { LocaleKey key = new LocaleKey(baseloc, extensions); - return Cache.LOCALECACHE.get(key); + return LOCALE_CACHE.computeIfAbsent(key, Locale::createLocale); } } - private static class Cache extends LocaleObjectCache { - - private static final Cache LOCALECACHE = new Cache(); - - private Cache() { - } - - @Override - protected Locale createObject(Object key) { - if (key instanceof BaseLocale) { - return new Locale((BaseLocale)key, null); - } else { - LocaleKey lk = (LocaleKey)key; - return new Locale(lk.base, lk.exts); - } - } + private static final ReferencedKeyMap LOCALE_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new); + private static Locale createLocale(Object key) { + return switch (key) { + case BaseLocale base -> new Locale(base, null); + case LocaleKey lk -> new Locale(lk.base, lk.exts); + default -> throw new InternalError("should not happen"); + }; } private static final class LocaleKey { diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java index 81ff9e7b534..d2407c403ae 100644 --- a/src/java.base/share/classes/java/util/ResourceBundle.java +++ b/src/java.base/share/classes/java/util/ResourceBundle.java @@ -69,9 +69,9 @@ import jdk.internal.access.SharedSecrets; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; +import jdk.internal.util.ReferencedKeyMap; import sun.security.action.GetPropertyAction; import sun.util.locale.BaseLocale; -import sun.util.locale.LocaleObjectCache; import sun.util.resources.Bundles; import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION; @@ -2867,123 +2867,122 @@ public List getCandidateLocales(String baseName, Locale locale) { if (baseName == null) { throw new NullPointerException(); } - return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale())); + return new ArrayList<>(CANDIDATES_CACHE.computeIfAbsent(locale.getBaseLocale(), + Control::createCandidateList)); } - private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache(); + private static final ReferencedKeyMap> CANDIDATES_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new); - private static class CandidateListCache extends LocaleObjectCache> { - protected List createObject(BaseLocale base) { - String language = base.getLanguage(); - String script = base.getScript(); - String region = base.getRegion(); - String variant = base.getVariant(); + private static List createCandidateList(BaseLocale base) { + String language = base.getLanguage(); + String script = base.getScript(); + String region = base.getRegion(); + String variant = base.getVariant(); - // Special handling for Norwegian - boolean isNorwegianBokmal = false; - boolean isNorwegianNynorsk = false; - if (language.equals("no")) { - if (region.equals("NO") && variant.equals("NY")) { - variant = ""; - isNorwegianNynorsk = true; - } else { - isNorwegianBokmal = true; - } + // Special handling for Norwegian + boolean isNorwegianBokmal = false; + boolean isNorwegianNynorsk = false; + if (language.equals("no")) { + if (region.equals("NO") && variant.equals("NY")) { + variant = ""; + isNorwegianNynorsk = true; + } else { + isNorwegianBokmal = true; } - if (language.equals("nb") || isNorwegianBokmal) { - List tmpList = getDefaultList("nb", script, region, variant); - // Insert a locale replacing "nb" with "no" for every list entry with precedence - List bokmalList = new ArrayList<>(); - for (Locale l_nb : tmpList) { - var isRoot = l_nb.getLanguage().isEmpty(); - var l_no = Locale.getInstance(isRoot ? "" : "no", - l_nb.getScript(), l_nb.getCountry(), l_nb.getVariant(), null); - bokmalList.add(isNorwegianBokmal ? l_no : l_nb); - if (isRoot) { - break; - } - bokmalList.add(isNorwegianBokmal ? l_nb : l_no); + } + if (language.equals("nb") || isNorwegianBokmal) { + List tmpList = getDefaultList("nb", script, region, variant); + // Insert a locale replacing "nb" with "no" for every list entry with precedence + List bokmalList = new ArrayList<>(); + for (Locale l_nb : tmpList) { + var isRoot = l_nb.getLanguage().isEmpty(); + var l_no = Locale.getInstance(isRoot ? "" : "no", + l_nb.getScript(), l_nb.getCountry(), l_nb.getVariant(), null); + bokmalList.add(isNorwegianBokmal ? l_no : l_nb); + if (isRoot) { + break; } - return bokmalList; - } else if (language.equals("nn") || isNorwegianNynorsk) { - // Insert no_NO_NY, no_NO, no after nn - List nynorskList = getDefaultList("nn", script, region, variant); - int idx = nynorskList.size() - 1; - nynorskList.add(idx++, Locale.getInstance("no", "NO", "NY")); - nynorskList.add(idx++, Locale.getInstance("no", "NO", "")); - nynorskList.add(idx++, Locale.getInstance("no", "", "")); - return nynorskList; + bokmalList.add(isNorwegianBokmal ? l_nb : l_no); } - // Special handling for Chinese - else if (language.equals("zh")) { - if (script.isEmpty() && !region.isEmpty()) { - // Supply script for users who want to use zh_Hans/zh_Hant - // as bundle names (recommended for Java7+) - switch (region) { - case "TW", "HK", "MO" -> script = "Hant"; - case "CN", "SG" -> script = "Hans"; - } + return bokmalList; + } else if (language.equals("nn") || isNorwegianNynorsk) { + // Insert no_NO_NY, no_NO, no after nn + List nynorskList = getDefaultList("nn", script, region, variant); + int idx = nynorskList.size() - 1; + nynorskList.add(idx++, Locale.getInstance("no", "NO", "NY")); + nynorskList.add(idx++, Locale.getInstance("no", "NO", "")); + nynorskList.add(idx++, Locale.getInstance("no", "", "")); + return nynorskList; + } + // Special handling for Chinese + else if (language.equals("zh")) { + if (script.isEmpty() && !region.isEmpty()) { + // Supply script for users who want to use zh_Hans/zh_Hant + // as bundle names (recommended for Java7+) + switch (region) { + case "TW", "HK", "MO" -> script = "Hant"; + case "CN", "SG" -> script = "Hans"; } } - - return getDefaultList(language, script, region, variant); } - private static List getDefaultList(String language, String script, String region, String variant) { - List variants = null; + return getDefaultList(language, script, region, variant); + } - if (!variant.isEmpty()) { - variants = new ArrayList<>(); - int idx = variant.length(); - while (idx != -1) { - variants.add(variant.substring(0, idx)); - idx = variant.lastIndexOf('_', --idx); - } + private static List getDefaultList(String language, String script, String region, String variant) { + List variants = null; + + if (!variant.isEmpty()) { + variants = new ArrayList<>(); + int idx = variant.length(); + while (idx != -1) { + variants.add(variant.substring(0, idx)); + idx = variant.lastIndexOf('_', --idx); } + } - List list = new ArrayList<>(); + List list = new ArrayList<>(); - if (variants != null) { - for (String v : variants) { - list.add(Locale.getInstance(language, script, region, v, null)); - } - } - if (!region.isEmpty()) { - list.add(Locale.getInstance(language, script, region, "", null)); + if (variants != null) { + for (String v : variants) { + list.add(Locale.getInstance(language, script, region, v, null)); } - if (!script.isEmpty()) { - list.add(Locale.getInstance(language, script, "", "", null)); - // Special handling for Chinese - if (language.equals("zh")) { - if (region.isEmpty()) { - // Supply region(country) for users who still package Chinese - // bundles using old convention. - switch (script) { - case "Hans" -> region = "CN"; - case "Hant" -> region = "TW"; - } + } + if (!region.isEmpty()) { + list.add(Locale.getInstance(language, script, region, "", null)); + } + if (!script.isEmpty()) { + list.add(Locale.getInstance(language, script, "", "", null)); + // Special handling for Chinese + if (language.equals("zh")) { + if (region.isEmpty()) { + // Supply region(country) for users who still package Chinese + // bundles using old convention. + switch (script) { + case "Hans" -> region = "CN"; + case "Hant" -> region = "TW"; } } + } - // With script, after truncating variant, region and script, - // start over without script. - if (variants != null) { - for (String v : variants) { - list.add(Locale.getInstance(language, "", region, v, null)); - } - } - if (!region.isEmpty()) { - list.add(Locale.getInstance(language, "", region, "", null)); + // With script, after truncating variant, region and script, + // start over without script. + if (variants != null) { + for (String v : variants) { + list.add(Locale.getInstance(language, "", region, v, null)); } } - if (!language.isEmpty()) { - list.add(Locale.getInstance(language, "", "", "", null)); + if (!region.isEmpty()) { + list.add(Locale.getInstance(language, "", region, "", null)); } - // Add root locale at the end - list.add(Locale.ROOT); - - return list; } + if (!language.isEmpty()) { + list.add(Locale.getInstance(language, "", "", "", null)); + } + // Add root locale at the end + list.add(Locale.ROOT); + + return list; } /** diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java index 89cda00a208..7e0fc9a2d34 100644 --- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java +++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2024, 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 @@ -33,34 +33,35 @@ package sun.util.locale; import jdk.internal.misc.CDS; +import jdk.internal.util.ReferencedKeySet; import jdk.internal.util.StaticProperty; import jdk.internal.vm.annotation.Stable; -import java.lang.ref.SoftReference; import java.util.StringJoiner; +import java.util.concurrent.ConcurrentHashMap; public final class BaseLocale { public static @Stable BaseLocale[] constantBaseLocales; - public static final byte ENGLISH = 0, - FRENCH = 1, - GERMAN = 2, - ITALIAN = 3, - JAPANESE = 4, - KOREAN = 5, - CHINESE = 6, - SIMPLIFIED_CHINESE = 7, - TRADITIONAL_CHINESE = 8, - FRANCE = 9, - GERMANY = 10, - ITALY = 11, - JAPAN = 12, - KOREA = 13, - UK = 14, - US = 15, - CANADA = 16, - CANADA_FRENCH = 17, - ROOT = 18, + public static final byte ROOT = 0, + ENGLISH = 1, + US = 2, + FRENCH = 3, + GERMAN = 4, + ITALIAN = 5, + JAPANESE = 6, + KOREAN = 7, + CHINESE = 8, + SIMPLIFIED_CHINESE = 9, + TRADITIONAL_CHINESE = 10, + FRANCE = 11, + GERMANY = 12, + ITALY = 13, + JAPAN = 14, + KOREA = 15, + UK = 16, + CANADA = 17, + CANADA_FRENCH = 18, NUM_CONSTANTS = 19; static { CDS.initializeFromArchive(BaseLocale.class); @@ -90,6 +91,10 @@ public final class BaseLocale { } } + // Interned BaseLocale cache + private static final ReferencedKeySet CACHE = + ReferencedKeySet.create(true, ConcurrentHashMap::new); + public static final String SEP = "_"; private final String language; @@ -107,27 +112,17 @@ public final class BaseLocale { private static final boolean OLD_ISO_CODES = StaticProperty.javaLocaleUseOldISOCodes() .equalsIgnoreCase("true"); - // This method must be called with normalize = false only when creating the - // Locale.* constants and non-normalized BaseLocale$Keys used for lookup. - private BaseLocale(String language, String script, String region, String variant, - boolean normalize) { - if (normalize) { - this.language = LocaleUtils.toLowerString(language).intern(); - this.script = LocaleUtils.toTitleString(script).intern(); - this.region = LocaleUtils.toUpperString(region).intern(); - this.variant = variant.intern(); - } else { - this.language = language; - this.script = script; - this.region = region; - this.variant = variant; - } + private BaseLocale(String language, String script, String region, String variant) { + this.language = language; + this.script = script; + this.region = region; + this.variant = variant; } // Called for creating the Locale.* constants. No argument // validation is performed. private static BaseLocale createInstance(String language, String region) { - return new BaseLocale(language, "", region, "", false); + return new BaseLocale(language, "", region, ""); } public static BaseLocale getInstance(String language, String script, @@ -153,8 +148,8 @@ public static BaseLocale getInstance(String language, String script, // Check for constant base locales first if (script.isEmpty() && variant.isEmpty()) { for (BaseLocale baseLocale : constantBaseLocales) { - if (baseLocale.getLanguage().equals(language) - && baseLocale.getRegion().equals(region)) { + if (baseLocale.language.equals(language) + && baseLocale.region.equals(region)) { return baseLocale; } } @@ -165,8 +160,15 @@ public static BaseLocale getInstance(String language, String script, language = convertOldISOCodes(language); } - Key key = new Key(language, script, region, variant, false); - return Cache.CACHE.get(key); + // Obtain the "interned" BaseLocale from the cache. The returned + // "interned" instance can subsequently be used by the Locale + // instance which guarantees the locale components are properly cased/interned. + return CACHE.intern(new BaseLocale(language, script, region, variant), + (b) -> new BaseLocale( + LocaleUtils.toLowerString(b.language).intern(), + LocaleUtils.toTitleString(b.script).intern(), + LocaleUtils.toUpperString(b.region).intern(), + b.variant.intern())); } public static String convertOldISOCodes(String language) { @@ -199,14 +201,14 @@ public boolean equals(Object obj) { if (this == obj) { return true; } - if (!(obj instanceof BaseLocale)) { - return false; + if (obj instanceof BaseLocale other) { + return LocaleUtils.caseIgnoreMatch(other.language, language) + && LocaleUtils.caseIgnoreMatch(other.region, region) + && LocaleUtils.caseIgnoreMatch(other.script, script) + // variant is case sensitive in JDK! + && other.variant.equals(variant); } - BaseLocale other = (BaseLocale)obj; - return language == other.language - && script == other.script - && region == other.region - && variant == other.variant; + return false; } @Override @@ -231,128 +233,26 @@ public String toString() { public int hashCode() { int h = hash; if (h == 0) { - // Generating a hash value from language, script, region and variant - h = language.hashCode(); - h = 31 * h + script.hashCode(); - h = 31 * h + region.hashCode(); - h = 31 * h + variant.hashCode(); - if (h != 0) { - hash = h; - } - } - return h; - } - - private static final class Key { - /** - * Keep a SoftReference to the Key data if normalized (actually used - * as a cache key) and not initialized via the constant creation path. - * - * This allows us to avoid creating SoftReferences on lookup Keys - * (which are short-lived) and for Locales created via - * Locale#createConstant. - */ - private final SoftReference holderRef; - private final BaseLocale holder; - - private final boolean normalized; - private final int hash; - - private Key(String language, String script, String region, - String variant, boolean normalize) { - BaseLocale locale = new BaseLocale(language, script, region, variant, normalize); - this.normalized = normalize; - if (normalized) { - this.holderRef = new SoftReference<>(locale); - this.holder = null; - } else { - this.holderRef = null; - this.holder = locale; - } - this.hash = hashCode(locale); - } - - public int hashCode() { - return hash; - } - - private int hashCode(BaseLocale locale) { - int h = 0; - String lang = locale.getLanguage(); - int len = lang.length(); + int len = language.length(); for (int i = 0; i < len; i++) { - h = 31*h + LocaleUtils.toLower(lang.charAt(i)); + h = 31*h + LocaleUtils.toLower(language.charAt(i)); } - String scrt = locale.getScript(); - len = scrt.length(); + len = script.length(); for (int i = 0; i < len; i++) { - h = 31*h + LocaleUtils.toLower(scrt.charAt(i)); + h = 31*h + LocaleUtils.toLower(script.charAt(i)); } - String regn = locale.getRegion(); - len = regn.length(); + len = region.length(); for (int i = 0; i < len; i++) { - h = 31*h + LocaleUtils.toLower(regn.charAt(i)); + h = 31*h + LocaleUtils.toLower(region.charAt(i)); } - String vart = locale.getVariant(); - len = vart.length(); + len = variant.length(); for (int i = 0; i < len; i++) { - h = 31*h + vart.charAt(i); - } - return h; - } - - private BaseLocale getBaseLocale() { - return (holder == null) ? holderRef.get() : holder; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; + h = 31*h + variant.charAt(i); } - if (obj instanceof Key && this.hash == ((Key)obj).hash) { - BaseLocale other = ((Key) obj).getBaseLocale(); - BaseLocale locale = this.getBaseLocale(); - if (other != null && locale != null - && LocaleUtils.caseIgnoreMatch(other.getLanguage(), locale.getLanguage()) - && LocaleUtils.caseIgnoreMatch(other.getScript(), locale.getScript()) - && LocaleUtils.caseIgnoreMatch(other.getRegion(), locale.getRegion()) - // variant is case sensitive in JDK! - && other.getVariant().equals(locale.getVariant())) { - return true; - } - } - return false; - } - - public static Key normalize(Key key) { - if (key.normalized) { - return key; + if (h != 0) { + hash = h; } - - // Only normalized keys may be softly referencing the data holder - assert (key.holder != null && key.holderRef == null); - BaseLocale locale = key.holder; - return new Key(locale.getLanguage(), locale.getScript(), - locale.getRegion(), locale.getVariant(), true); - } - } - - private static class Cache extends LocaleObjectCache { - - private static final Cache CACHE = new Cache(); - - public Cache() { - } - - @Override - protected Key normalizeKey(Key key) { - return Key.normalize(key); - } - - @Override - protected BaseLocale createObject(Key key) { - return Key.normalize(key).getBaseLocale(); } + return h; } } diff --git a/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java b/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java deleted file mode 100644 index 8712f8b8ad8..00000000000 --- a/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2010, 2023, 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 (C) 2009-2010, International Business Machines Corporation and * - * others. All Rights Reserved. * - ******************************************************************************* - */ -package sun.util.locale; - -import java.lang.ref.ReferenceQueue; -import java.lang.ref.SoftReference; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -public abstract class LocaleObjectCache { - private final ConcurrentMap> map; - private final ReferenceQueue queue = new ReferenceQueue<>(); - - public LocaleObjectCache() { - this(16, 0.75f, 16); - } - - public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) { - map = new ConcurrentHashMap<>(initialCapacity, loadFactor, concurrencyLevel); - } - - public V get(K key) { - V value = null; - - cleanStaleEntries(); - CacheEntry entry = map.get(key); - if (entry != null) { - value = entry.get(); - } - if (value == null) { - key = normalizeKey(key); - V newVal = createObject(key); - if (key == null || newVal == null) { - // subclass must return non-null key/value object - return null; - } - - CacheEntry newEntry = new CacheEntry<>(key, newVal, queue); - entry = map.putIfAbsent(key, newEntry); - if (entry == null) { - value = newVal; - } else { - value = entry.get(); - if (value == null) { - map.put(key, newEntry); - value = newVal; - } - } - } - return value; - } - - protected V put(K key, V value) { - CacheEntry entry = new CacheEntry<>(key, value, queue); - CacheEntry oldEntry = map.put(key, entry); - return (oldEntry == null) ? null : oldEntry.get(); - } - - @SuppressWarnings("unchecked") - private void cleanStaleEntries() { - CacheEntry entry; - while ((entry = (CacheEntry)queue.poll()) != null) { - map.remove(entry.getKey(), entry); - } - } - - protected abstract V createObject(K key); - - protected K normalizeKey(K key) { - return key; - } - - private static class CacheEntry extends SoftReference { - private final K key; - - CacheEntry(K key, V value, ReferenceQueue queue) { - super(value, queue); - this.key = key; - } - - K getKey() { - return key; - } - } -} From 045eea11307f5df89071c7c7e366effdc23a22db Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 4 Mar 2024 18:50:45 +0000 Subject: [PATCH 46/86] 8327057: Parallel: Refactor ParMarkBitMap::iterate Reviewed-by: tschatzl, iwalulya --- .../share/gc/parallel/parMarkBitMap.cpp | 47 +++++++++---------- .../share/gc/parallel/parMarkBitMap.hpp | 4 -- .../share/gc/parallel/psParallelCompact.cpp | 26 +--------- 3 files changed, 22 insertions(+), 55 deletions(-) diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp index 54db633af52..deffcc019c9 100644 --- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp @@ -173,27 +173,26 @@ ParMarkBitMap::iterate(ParMarkBitMapClosure* live_closure, // The bitmap routines require the right boundary to be word-aligned. const idx_t search_end = align_range_end(range_end); - idx_t cur_beg = find_obj_beg(range_beg, search_end); - while (cur_beg < range_end) { - const idx_t cur_end = find_obj_end(cur_beg, search_end); - if (cur_end >= range_end) { - // The obj ends outside the range. - live_closure->set_source(bit_to_addr(cur_beg)); - return incomplete; + idx_t cur_beg = range_beg; + while (true) { + cur_beg = find_obj_beg(cur_beg, search_end); + if (cur_beg >= range_end) { + break; } - const size_t size = obj_size(cur_beg, cur_end); + const size_t size = obj_size(cur_beg); IterationStatus status = live_closure->do_addr(bit_to_addr(cur_beg), size); if (status != incomplete) { assert(status == would_overflow || status == full, "sanity"); return status; } - // Successfully processed the object; look for the next object. - cur_beg = find_obj_beg(cur_end + 1, search_end); + cur_beg += words_to_bits(size); + if (cur_beg >= range_end) { + break; + } } - live_closure->set_source(bit_to_addr(range_end)); return complete; } @@ -210,45 +209,41 @@ ParMarkBitMap::iterate(ParMarkBitMapClosure* live_closure, assert(range_end <= dead_range_end, "dead range invalid"); // The bitmap routines require the right boundary to be word-aligned. - const idx_t live_search_end = align_range_end(range_end); const idx_t dead_search_end = align_range_end(dead_range_end); idx_t cur_beg = range_beg; if (range_beg < range_end && is_unmarked(range_beg)) { // The range starts with dead space. Look for the next object, then fill. + // This must be the beginning of old/eden/from/to-space, so it's must be + // large enough for a filler. cur_beg = find_obj_beg(range_beg + 1, dead_search_end); - const idx_t dead_space_end = MIN2(cur_beg - 1, dead_range_end - 1); + const idx_t dead_space_end = cur_beg - 1; const size_t size = obj_size(range_beg, dead_space_end); dead_closure->do_addr(bit_to_addr(range_beg), size); } while (cur_beg < range_end) { - const idx_t cur_end = find_obj_end(cur_beg, live_search_end); - if (cur_end >= range_end) { - // The obj ends outside the range. - live_closure->set_source(bit_to_addr(cur_beg)); - return incomplete; - } - - const size_t size = obj_size(cur_beg, cur_end); + const size_t size = obj_size(cur_beg); IterationStatus status = live_closure->do_addr(bit_to_addr(cur_beg), size); if (status != incomplete) { assert(status == would_overflow || status == full, "sanity"); return status; } + const idx_t dead_space_beg = cur_beg + words_to_bits(size); + if (dead_space_beg >= dead_search_end) { + break; + } // Look for the start of the next object. - const idx_t dead_space_beg = cur_end + 1; cur_beg = find_obj_beg(dead_space_beg, dead_search_end); if (cur_beg > dead_space_beg) { // Found dead space; compute the size and invoke the dead closure. - const idx_t dead_space_end = MIN2(cur_beg - 1, dead_range_end - 1); - const size_t size = obj_size(dead_space_beg, dead_space_end); - dead_closure->do_addr(bit_to_addr(dead_space_beg), size); + const idx_t dead_space_end = cur_beg - 1; + dead_closure->do_addr(bit_to_addr(dead_space_beg), + obj_size(dead_space_beg, dead_space_end)); } } - live_closure->set_source(bit_to_addr(range_end)); return complete; } diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp index 7713af6e7a6..ad0e51fdcdf 100644 --- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp @@ -81,10 +81,6 @@ class ParMarkBitMap: public CHeapObj // range [live_range_beg, live_range_end). This is used to iterate over the // compacted region of the heap. Return values: // - // incomplete The iteration is not complete. The last object that - // begins in the range does not end in the range; - // closure->source() is set to the start of that object. - // // complete The iteration is complete. All objects in the range // were processed and the closure is not full; // closure->source() is set one past the end of the range. diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index d6cafe72401..886a5d308c1 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -2424,12 +2424,7 @@ PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm, // Create closures and iterate. UpdateOnlyClosure update_closure(mbm, cm, space_id); FillClosure fill_closure(cm, space_id); - ParMarkBitMap::IterationStatus status; - status = mbm->iterate(&update_closure, &fill_closure, beg_addr, end_addr, - dense_prefix_end); - if (status == ParMarkBitMap::incomplete) { - update_closure.do_addr(update_closure.source()); - } + mbm->iterate(&update_closure, &fill_closure, beg_addr, end_addr, dense_prefix_end); } // Mark the regions as filled. @@ -2740,25 +2735,6 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu src_space_top); IterationStatus status = bitmap->iterate(&closure, cur_addr, end_addr); - if (status == ParMarkBitMap::incomplete) { - // The last obj that starts in the source region does not end in the - // region. - assert(closure.source() < end_addr, "sanity"); - HeapWord* const obj_beg = closure.source(); - HeapWord* const range_end = MIN2(obj_beg + closure.words_remaining(), - src_space_top); - HeapWord* const obj_end = bitmap->find_obj_end(obj_beg, range_end); - if (obj_end < range_end) { - // The end was found; the entire object will fit. - status = closure.do_addr(obj_beg, bitmap->obj_size(obj_beg, obj_end)); - assert(status != ParMarkBitMap::would_overflow, "sanity"); - } else { - // The end was not found; the object will not fit. - assert(range_end < src_space_top, "obj cannot cross space boundary"); - status = ParMarkBitMap::would_overflow; - } - } - if (status == ParMarkBitMap::would_overflow) { // The last object did not fit. Note that interior oop updates were // deferred, then copy enough of the object to fill the region. From e1b661f8c1df780cce28fe76d257b44e2fe44058 Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Tue, 5 Mar 2024 02:04:21 +0000 Subject: [PATCH 47/86] 8319900: Recursive lightweight locking: riscv64 implementation Co-authored-by: Axel Boldt-Christmas Reviewed-by: fyang --- .../cpu/riscv/c1_MacroAssembler_riscv.cpp | 8 +- .../cpu/riscv/c2_MacroAssembler_riscv.cpp | 453 ++++++++++++++---- .../cpu/riscv/c2_MacroAssembler_riscv.hpp | 4 +- src/hotspot/cpu/riscv/interp_masm_riscv.cpp | 19 - .../cpu/riscv/macroAssembler_riscv.cpp | 167 ++++--- .../cpu/riscv/macroAssembler_riscv.hpp | 4 +- src/hotspot/cpu/riscv/riscv.ad | 38 +- src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp | 6 +- src/hotspot/cpu/riscv/vm_version_riscv.hpp | 2 + 9 files changed, 499 insertions(+), 202 deletions(-) diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp index 770dd6a9d0f..f4c05b9efd6 100644 --- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp @@ -69,13 +69,12 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr bnez(temp, slow_case, true /* is_far */); } - // Load object header - ld(hdr, Address(obj, hdr_offset)); - if (LockingMode == LM_LIGHTWEIGHT) { lightweight_lock(obj, hdr, temp, t1, slow_case); } else if (LockingMode == LM_LEGACY) { Label done; + // Load object header + ld(hdr, Address(obj, hdr_offset)); // and mark it as unlocked ori(hdr, hdr, markWord::unlocked_value); // save unlocked object header into the displaced header location on the stack @@ -134,9 +133,6 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_ verify_oop(obj); if (LockingMode == LM_LIGHTWEIGHT) { - ld(hdr, Address(obj, oopDesc::mark_offset_in_bytes())); - test_bit(temp, hdr, exact_log2(markWord::monitor_value)); - bnez(temp, slow_case, /* is_far */ true); lightweight_unlock(obj, hdr, temp, t1, slow_case); } else if (LockingMode == LM_LEGACY) { // test if object header is pointing to the displaced header, and if so, restore diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp index 9670bc987a3..767d4111e76 100644 --- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp @@ -32,6 +32,7 @@ #include "opto/output.hpp" #include "opto/subnode.hpp" #include "runtime/stubRoutines.hpp" +#include "utilities/globalDefinitions.hpp" #ifdef PRODUCT #define BLOCK_COMMENT(str) /* nothing */ @@ -51,30 +52,35 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register box = boxReg; Register disp_hdr = tmp1Reg; Register tmp = tmp2Reg; - Label cont; Label object_has_monitor; - Label count, no_count; + // Finish fast lock successfully. MUST branch to with flag == 0 + Label locked; + // Finish fast lock unsuccessfully. slow_path MUST branch to with flag != 0 + Label slow_path; + assert(LockingMode != LM_LIGHTWEIGHT, "lightweight locking should use fast_lock_lightweight"); assert_different_registers(oop, box, tmp, disp_hdr, flag, tmp3Reg, t0); + mv(flag, 1); + // Load markWord from object into displaced_header. ld(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes())); if (DiagnoseSyncOnValueBasedClasses != 0) { - load_klass(flag, oop); - lwu(flag, Address(flag, Klass::access_flags_offset())); - test_bit(flag, flag, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS)); - bnez(flag, cont, true /* is_far */); + load_klass(tmp, oop); + lwu(tmp, Address(tmp, Klass::access_flags_offset())); + test_bit(tmp, tmp, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS)); + bnez(tmp, slow_path); } // Check for existing monitor - test_bit(t0, disp_hdr, exact_log2(markWord::monitor_value)); - bnez(t0, object_has_monitor); + test_bit(tmp, disp_hdr, exact_log2(markWord::monitor_value)); + bnez(tmp, object_has_monitor); if (LockingMode == LM_MONITOR) { - mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path - j(cont); - } else if (LockingMode == LM_LEGACY) { + j(slow_path); + } else { + assert(LockingMode == LM_LEGACY, "must be"); // Set tmp to be (markWord of object | UNLOCK_VALUE). ori(tmp, disp_hdr, markWord::unlocked_value); @@ -84,39 +90,27 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, // Compare object markWord with an unlocked value (tmp) and if // equal exchange the stack address of our box with object markWord. // On failure disp_hdr contains the possibly locked markWord. - cmpxchg(/*memory address*/oop, /*expected value*/tmp, /*new value*/box, Assembler::int64, Assembler::aq, - Assembler::rl, /*result*/disp_hdr); - mv(flag, zr); - beq(disp_hdr, tmp, cont); // prepare zero flag and goto cont if we won the cas + cmpxchg(/*memory address*/oop, /*expected value*/tmp, /*new value*/box, Assembler::int64, + Assembler::aq, Assembler::rl, /*result*/disp_hdr); + beq(disp_hdr, tmp, locked); assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0"); // If the compare-and-exchange succeeded, then we found an unlocked - // object, will have now locked it will continue at label cont + // object, will have now locked it will continue at label locked // We did not see an unlocked object so try the fast recursive case. // Check if the owner is self by comparing the value in the // markWord of object (disp_hdr) with the stack pointer. sub(disp_hdr, disp_hdr, sp); mv(tmp, (intptr_t) (~(os::vm_page_size()-1) | (uintptr_t)markWord::lock_mask_in_place)); - // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto cont, + // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto label locked, // hence we can store 0 as the displaced header in the box, which indicates that it is a // recursive lock. andr(tmp/*==0?*/, disp_hdr, tmp); sd(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes())); - mv(flag, tmp); // we can use the value of tmp as the result here - j(cont); - } else { - assert(LockingMode == LM_LIGHTWEIGHT, ""); - Label slow; - lightweight_lock(oop, disp_hdr, tmp, tmp3Reg, slow); - - // Indicate success on completion. - mv(flag, zr); - j(count); - bind(slow); - mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path - j(no_count); + beqz(tmp, locked); + j(slow_path); } // Handle existing monitor. @@ -126,35 +120,42 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, // // Try to CAS m->owner from null to current thread. add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value)); - cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64, Assembler::aq, - Assembler::rl, /*result*/flag); // cas succeeds if flag == zr(expected) - - if (LockingMode != LM_LIGHTWEIGHT) { - // Store a non-null value into the box to avoid looking like a re-entrant - // lock. The fast-path monitor unlock code checks for - // markWord::monitor_value so use markWord::unused_mark which has the - // relevant bit set, and also matches ObjectSynchronizer::slow_enter. - mv(tmp, (address)markWord::unused_mark().value()); - sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes())); - } + cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64, + Assembler::aq, Assembler::rl, /*result*/tmp3Reg); // cas succeeds if tmp3Reg == zr(expected) - beqz(flag, cont); // CAS success means locking succeeded + // Store a non-null value into the box to avoid looking like a re-entrant + // lock. The fast-path monitor unlock code checks for + // markWord::monitor_value so use markWord::unused_mark which has the + // relevant bit set, and also matches ObjectSynchronizer::slow_enter. + mv(tmp, (address)markWord::unused_mark().value()); + sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes())); - bne(flag, xthread, cont); // Check for recursive locking + beqz(tmp3Reg, locked); // CAS success means locking succeeded + + bne(tmp3Reg, xthread, slow_path); // Check for recursive locking // Recursive lock case - mv(flag, zr); - increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1, t0, tmp); + increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1, tmp2Reg, tmp3Reg); - bind(cont); - // zero flag indicates success - // non-zero flag indicates failure - bnez(flag, no_count); + bind(locked); + mv(flag, zr); + increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2Reg, tmp3Reg); - bind(count); - increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp); +#ifdef ASSERT + // Check that locked label is reached with flag == 0. + Label flag_correct; + beqz(flag, flag_correct); + stop("Fast Lock Flag != 0"); +#endif - bind(no_count); + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag != 0. + bnez(flag, flag_correct); + stop("Fast Lock Flag == 0"); + bind(flag_correct); +#endif + // C2 uses the value of flag (0 vs !0) to determine the continuation. } void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, @@ -165,19 +166,23 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Register box = boxReg; Register disp_hdr = tmp1Reg; Register tmp = tmp2Reg; - Label cont; Label object_has_monitor; - Label count, no_count; + // Finish fast lock successfully. MUST branch to with flag == 0 + Label unlocked; + // Finish fast lock unsuccessfully. slow_path MUST branch to with flag != 0 + Label slow_path; + assert(LockingMode != LM_LIGHTWEIGHT, "lightweight locking should use fast_unlock_lightweight"); assert_different_registers(oop, box, tmp, disp_hdr, flag, t0); + mv(flag, 1); + if (LockingMode == LM_LEGACY) { // Find the lock address and load the displaced header from the stack. ld(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes())); // If the displaced header is 0, we have a recursive unlock. - mv(flag, disp_hdr); - beqz(disp_hdr, cont); + beqz(disp_hdr, unlocked); } // Handle existing monitor. @@ -186,28 +191,17 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, bnez(t0, object_has_monitor); if (LockingMode == LM_MONITOR) { - mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path - j(cont); - } else if (LockingMode == LM_LEGACY) { + j(slow_path); + } else { + assert(LockingMode == LM_LEGACY, "must be"); // Check if it is still a light weight lock, this is true if we // see the stack address of the basicLock in the markWord of the // object. - cmpxchg(/*memory address*/oop, /*expected value*/box, /*new value*/disp_hdr, Assembler::int64, Assembler::relaxed, - Assembler::rl, /*result*/tmp); - xorr(flag, box, tmp); // box == tmp if cas succeeds - j(cont); - } else { - assert(LockingMode == LM_LIGHTWEIGHT, ""); - Label slow; - lightweight_unlock(oop, tmp, box, disp_hdr, slow); - - // Indicate success on completion. - mv(flag, zr); - j(count); - bind(slow); - mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path - j(no_count); + cmpxchg(/*memory address*/oop, /*expected value*/box, /*new value*/disp_hdr, Assembler::int64, + Assembler::relaxed, Assembler::rl, /*result*/tmp); + beq(box, tmp, unlocked); // box == tmp if cas succeeds + j(slow_path); } assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0"); @@ -217,17 +211,6 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, STATIC_ASSERT(markWord::monitor_value <= INT_MAX); add(tmp, tmp, -(int)markWord::monitor_value); // monitor - if (LockingMode == LM_LIGHTWEIGHT) { - // If the owner is anonymous, we need to fix it -- in an outline stub. - Register tmp2 = disp_hdr; - ld(tmp2, Address(tmp, ObjectMonitor::owner_offset())); - test_bit(t0, tmp2, exact_log2(ObjectMonitor::ANONYMOUS_OWNER)); - C2HandleAnonOMOwnerStub* stub = new (Compile::current()->comp_arena()) C2HandleAnonOMOwnerStub(tmp, tmp2); - Compile::current()->output()->add_stub(stub); - bnez(t0, stub->entry(), /* is_far */ true); - bind(stub->continuation()); - } - ld(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset())); Label notRecursive; @@ -236,28 +219,304 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, // Recursive lock addi(disp_hdr, disp_hdr, -1); sd(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset())); - mv(flag, zr); - j(cont); + j(unlocked); bind(notRecursive); - ld(flag, Address(tmp, ObjectMonitor::EntryList_offset())); + ld(t0, Address(tmp, ObjectMonitor::EntryList_offset())); ld(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset())); - orr(flag, flag, disp_hdr); // Will be 0 if both are 0. - bnez(flag, cont); + orr(t0, t0, disp_hdr); // Will be 0 if both are 0. + bnez(t0, slow_path); + // need a release store here la(tmp, Address(tmp, ObjectMonitor::owner_offset())); membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore); sd(zr, Address(tmp)); // set unowned - bind(cont); - // zero flag indicates success - // non-zero flag indicates failure - bnez(flag, no_count); + bind(unlocked); + mv(flag, zr); + decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp1Reg, tmp2Reg); - bind(count); - decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp); +#ifdef ASSERT + // Check that unlocked label is reached with flag == 0. + Label flag_correct; + beqz(flag, flag_correct); + stop("Fast Lock Flag != 0"); +#endif - bind(no_count); + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag != 0. + bnez(flag, flag_correct); + stop("Fast Lock Flag == 0"); + bind(flag_correct); +#endif + // C2 uses the value of flag (0 vs !0) to determine the continuation. +} + +void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register tmp1, Register tmp2, Register tmp3) { + // Flag register, zero for success; non-zero for failure. + Register flag = t1; + + assert(LockingMode == LM_LIGHTWEIGHT, "must be"); + assert_different_registers(obj, tmp1, tmp2, tmp3, flag, t0); + + mv(flag, 1); + + // Handle inflated monitor. + Label inflated; + // Finish fast lock successfully. MUST branch to with flag == 0 + Label locked; + // Finish fast lock unsuccessfully. slow_path MUST branch to with flag != 0 + Label slow_path; + + if (DiagnoseSyncOnValueBasedClasses != 0) { + load_klass(tmp1, obj); + lwu(tmp1, Address(tmp1, Klass::access_flags_offset())); + test_bit(tmp1, tmp1, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS)); + bnez(tmp1, slow_path); + } + + const Register tmp1_mark = tmp1; + + { // Lightweight locking + + // Push lock to the lock stack and finish successfully. MUST branch to with flag == 0 + Label push; + + const Register tmp2_top = tmp2; + const Register tmp3_t = tmp3; + + // Check if lock-stack is full. + lwu(tmp2_top, Address(xthread, JavaThread::lock_stack_top_offset())); + mv(tmp3_t, (unsigned)LockStack::end_offset()); + bge(tmp2_top, tmp3_t, slow_path); + + // Check if recursive. + add(tmp3_t, xthread, tmp2_top); + ld(tmp3_t, Address(tmp3_t, -oopSize)); + beq(obj, tmp3_t, push); + + // Relaxed normal load to check for monitor. Optimization for monitor case. + ld(tmp1_mark, Address(obj, oopDesc::mark_offset_in_bytes())); + test_bit(tmp3_t, tmp1_mark, exact_log2(markWord::monitor_value)); + bnez(tmp3_t, inflated); + + // Not inflated + assert(oopDesc::mark_offset_in_bytes() == 0, "required to avoid a la"); + + // Try to lock. Transition lock-bits 0b01 => 0b00 + ori(tmp1_mark, tmp1_mark, markWord::unlocked_value); + xori(tmp3_t, tmp1_mark, markWord::unlocked_value); + cmpxchg(/*addr*/ obj, /*expected*/ tmp1_mark, /*new*/ tmp3_t, Assembler::int64, + /*acquire*/ Assembler::aq, /*release*/ Assembler::relaxed, /*result*/ tmp3_t); + bne(tmp1_mark, tmp3_t, slow_path); + + bind(push); + // After successful lock, push object on lock-stack. + add(tmp3_t, xthread, tmp2_top); + sd(obj, Address(tmp3_t)); + addw(tmp2_top, tmp2_top, oopSize); + sw(tmp2_top, Address(xthread, JavaThread::lock_stack_top_offset())); + j(locked); + } + + { // Handle inflated monitor. + bind(inflated); + + // mark contains the tagged ObjectMonitor*. + const Register tmp1_tagged_monitor = tmp1_mark; + const uintptr_t monitor_tag = markWord::monitor_value; + const Register tmp2_owner_addr = tmp2; + const Register tmp3_owner = tmp3; + + // Compute owner address. + la(tmp2_owner_addr, Address(tmp1_tagged_monitor, (in_bytes(ObjectMonitor::owner_offset()) - monitor_tag))); + + // CAS owner (null => current thread). + cmpxchg(/*addr*/ tmp2_owner_addr, /*expected*/ zr, /*new*/ xthread, Assembler::int64, + /*acquire*/ Assembler::aq, /*release*/ Assembler::relaxed, /*result*/ tmp3_owner); + beqz(tmp3_owner, locked); + + // Check if recursive. + bne(tmp3_owner, xthread, slow_path); + + // Recursive. + increment(Address(tmp1_tagged_monitor, in_bytes(ObjectMonitor::recursions_offset()) - monitor_tag), 1, tmp2, tmp3); + } + + bind(locked); + mv(flag, zr); + increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2, tmp3); + +#ifdef ASSERT + // Check that locked label is reached with flag == 0. + Label flag_correct; + beqz(flag, flag_correct); + stop("Fast Lock Flag != 0"); +#endif + + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag != 0. + bnez(flag, flag_correct); + stop("Fast Lock Flag == 0"); + bind(flag_correct); +#endif + // C2 uses the value of flag (0 vs !0) to determine the continuation. +} + +void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register tmp1, Register tmp2, + Register tmp3) { + // Flag register, zero for success; non-zero for failure. + Register flag = t1; + + assert(LockingMode == LM_LIGHTWEIGHT, "must be"); + assert_different_registers(obj, tmp1, tmp2, tmp3, flag, t0); + + mv(flag, 1); + + // Handle inflated monitor. + Label inflated, inflated_load_monitor; + // Finish fast unlock successfully. unlocked MUST branch to with flag == 0 + Label unlocked; + // Finish fast unlock unsuccessfully. MUST branch to with flag != 0 + Label slow_path; + + const Register tmp1_mark = tmp1; + const Register tmp2_top = tmp2; + const Register tmp3_t = tmp3; + + { // Lightweight unlock + + // Check if obj is top of lock-stack. + lwu(tmp2_top, Address(xthread, JavaThread::lock_stack_top_offset())); + subw(tmp2_top, tmp2_top, oopSize); + add(tmp3_t, xthread, tmp2_top); + ld(tmp3_t, Address(tmp3_t)); + // Top of lock stack was not obj. Must be monitor. + bne(obj, tmp3_t, inflated_load_monitor); + + // Pop lock-stack. + DEBUG_ONLY(add(tmp3_t, xthread, tmp2_top);) + DEBUG_ONLY(sd(zr, Address(tmp3_t));) + sw(tmp2_top, Address(xthread, JavaThread::lock_stack_top_offset())); + + // Check if recursive. + add(tmp3_t, xthread, tmp2_top); + ld(tmp3_t, Address(tmp3_t, -oopSize)); + beq(obj, tmp3_t, unlocked); + + // Not recursive. + // Load Mark. + ld(tmp1_mark, Address(obj, oopDesc::mark_offset_in_bytes())); + + // Check header for monitor (0b10). + test_bit(tmp3_t, tmp1_mark, exact_log2(markWord::monitor_value)); + bnez(tmp3_t, inflated); + + // Try to unlock. Transition lock bits 0b00 => 0b01 + assert(oopDesc::mark_offset_in_bytes() == 0, "required to avoid lea"); + ori(tmp3_t, tmp1_mark, markWord::unlocked_value); + cmpxchg(/*addr*/ obj, /*expected*/ tmp1_mark, /*new*/ tmp3_t, Assembler::int64, + /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, /*result*/ tmp3_t); + beq(tmp1_mark, tmp3_t, unlocked); + + // Compare and exchange failed. + // Restore lock-stack and handle the unlock in runtime. + DEBUG_ONLY(add(tmp3_t, xthread, tmp2_top);) + DEBUG_ONLY(sd(obj, Address(tmp3_t));) + addw(tmp2_top, tmp2_top, oopSize); + sd(tmp2_top, Address(xthread, JavaThread::lock_stack_top_offset())); + j(slow_path); + } + + { // Handle inflated monitor. + bind(inflated_load_monitor); + ld(tmp1_mark, Address(obj, oopDesc::mark_offset_in_bytes())); +#ifdef ASSERT + test_bit(tmp3_t, tmp1_mark, exact_log2(markWord::monitor_value)); + bnez(tmp3_t, inflated); + stop("Fast Unlock not monitor"); +#endif + + bind(inflated); + +#ifdef ASSERT + Label check_done; + subw(tmp2_top, tmp2_top, oopSize); + mv(tmp3_t, in_bytes(JavaThread::lock_stack_base_offset())); + blt(tmp2_top, tmp3_t, check_done); + add(tmp3_t, xthread, tmp2_top); + ld(tmp3_t, Address(tmp3_t)); + bne(obj, tmp3_t, inflated); + stop("Fast Unlock lock on stack"); + bind(check_done); +#endif + + // mark contains the tagged ObjectMonitor*. + const Register tmp1_monitor = tmp1_mark; + const uintptr_t monitor_tag = markWord::monitor_value; + + // Untag the monitor. + sub(tmp1_monitor, tmp1_mark, monitor_tag); + + const Register tmp2_recursions = tmp2; + Label not_recursive; + + // Check if recursive. + ld(tmp2_recursions, Address(tmp1_monitor, ObjectMonitor::recursions_offset())); + beqz(tmp2_recursions, not_recursive); + + // Recursive unlock. + addi(tmp2_recursions, tmp2_recursions, -1); + sd(tmp2_recursions, Address(tmp1_monitor, ObjectMonitor::recursions_offset())); + j(unlocked); + + bind(not_recursive); + + Label release; + const Register tmp2_owner_addr = tmp2; + + // Compute owner address. + la(tmp2_owner_addr, Address(tmp1_monitor, ObjectMonitor::owner_offset())); + + // Check if the entry lists are empty. + ld(t0, Address(tmp1_monitor, ObjectMonitor::EntryList_offset())); + ld(tmp3_t, Address(tmp1_monitor, ObjectMonitor::cxq_offset())); + orr(t0, t0, tmp3_t); + beqz(t0, release); + + // The owner may be anonymous and we removed the last obj entry in + // the lock-stack. This loses the information about the owner. + // Write the thread to the owner field so the runtime knows the owner. + sd(xthread, Address(tmp2_owner_addr)); + j(slow_path); + + bind(release); + // Set owner to null. + membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore); + sd(zr, Address(tmp2_owner_addr)); + } + + bind(unlocked); + mv(flag, zr); + decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2, tmp3); + +#ifdef ASSERT + // Check that unlocked label is reached with flag == 0. + Label flag_correct; + beqz(flag, flag_correct); + stop("Fast Lock Flag != 0"); +#endif + + bind(slow_path); +#ifdef ASSERT + // Check that slow_path label is reached with flag != 0. + bnez(flag, flag_correct); + stop("Fast Lock Flag == 0"); + bind(flag_correct); +#endif + // C2 uses the value of flag (0 vs !0) to determine the continuation. } // short string diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp index 9fe4dc002c9..25ba66387f1 100644 --- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp @@ -44,9 +44,11 @@ public: // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file. - // See full description in macroAssembler_riscv.cpp. void fast_lock(Register object, Register box, Register tmp1, Register tmp2, Register tmp3); void fast_unlock(Register object, Register box, Register tmp1, Register tmp2); + // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file. + void fast_lock_lightweight(Register object, Register tmp1, Register tmp2, Register tmp3); + void fast_unlock_lightweight(Register object, Register tmp1, Register tmp2, Register tmp3); void string_compare(Register str1, Register str2, Register cnt1, Register cnt2, Register result, diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp index 19d665bd421..497918e6c05 100644 --- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp +++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp @@ -763,7 +763,6 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) } if (LockingMode == LM_LIGHTWEIGHT) { - ld(tmp, Address(obj_reg, oopDesc::mark_offset_in_bytes())); lightweight_lock(obj_reg, tmp, tmp2, tmp3, slow_case); j(count); } else if (LockingMode == LM_LEGACY) { @@ -860,24 +859,6 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) if (LockingMode == LM_LIGHTWEIGHT) { Label slow_case; - - // Check for non-symmetric locking. This is allowed by the spec and the interpreter - // must handle it. - Register tmp1 = t0; - Register tmp2 = header_reg; - // First check for lock-stack underflow. - lwu(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); - mv(tmp2, (unsigned)LockStack::start_offset()); - ble(tmp1, tmp2, slow_case); - // Then check if the top of the lock-stack matches the unlocked object. - subw(tmp1, tmp1, oopSize); - add(tmp1, xthread, tmp1); - ld(tmp1, Address(tmp1, 0)); - bne(tmp1, obj_reg, slow_case); - - ld(header_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes())); - test_bit(t0, header_reg, exact_log2(markWord::monitor_value)); - bnez(t0, slow_case); lightweight_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case); j(count); diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp index 96e07319e84..4459356d3b1 100644 --- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp @@ -49,6 +49,7 @@ #include "runtime/jniHandles.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/powerOfTwo.hpp" #ifdef COMPILER2 #include "opto/compile.hpp" @@ -5042,98 +5043,124 @@ void MacroAssembler::test_bit(Register Rd, Register Rs, uint32_t bit_pos) { } // Implements lightweight-locking. -// Branches to slow upon failure to lock the object. -// Falls through upon success. // // - obj: the object to be locked -// - hdr: the header, already loaded from obj, will be destroyed -// - tmp1, tmp2: temporary registers, will be destroyed -void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) { +// - tmp1, tmp2, tmp3: temporary registers, will be destroyed +// - slow: branched to if locking fails +void MacroAssembler::lightweight_lock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) { assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking"); - assert_different_registers(obj, hdr, tmp1, tmp2, t0); - - // Check if we would have space on lock-stack for the object. - lwu(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); - mv(tmp2, (unsigned)LockStack::end_offset()); - bge(tmp1, tmp2, slow, /* is_far */ true); - - // Load (object->mark() | 1) into hdr - ori(hdr, hdr, markWord::unlocked_value); - // Clear lock-bits, into tmp2 - xori(tmp2, hdr, markWord::unlocked_value); - - // Try to swing header from unlocked to locked - Label success; - cmpxchgptr(hdr, tmp2, obj, tmp1, success, &slow); - bind(success); - - // After successful lock, push object on lock-stack - lwu(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); - add(tmp2, xthread, tmp1); - sd(obj, Address(tmp2, 0)); - addw(tmp1, tmp1, oopSize); - sw(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); + assert_different_registers(obj, tmp1, tmp2, tmp3, t0); + + Label push; + const Register top = tmp1; + const Register mark = tmp2; + const Register t = tmp3; + + // Preload the markWord. It is important that this is the first + // instruction emitted as it is part of C1's null check semantics. + ld(mark, Address(obj, oopDesc::mark_offset_in_bytes())); + + // Check if the lock-stack is full. + lwu(top, Address(xthread, JavaThread::lock_stack_top_offset())); + mv(t, (unsigned)LockStack::end_offset()); + bge(top, t, slow, /* is_far */ true); + + // Check for recursion. + add(t, xthread, top); + ld(t, Address(t, -oopSize)); + beq(obj, t, push); + + // Check header for monitor (0b10). + test_bit(t, mark, exact_log2(markWord::monitor_value)); + bnez(t, slow, /* is_far */ true); + + // Try to lock. Transition lock-bits 0b01 => 0b00 + assert(oopDesc::mark_offset_in_bytes() == 0, "required to avoid a la"); + ori(mark, mark, markWord::unlocked_value); + xori(t, mark, markWord::unlocked_value); + cmpxchg(/*addr*/ obj, /*expected*/ mark, /*new*/ t, Assembler::int64, + /*acquire*/ Assembler::aq, /*release*/ Assembler::relaxed, /*result*/ t); + bne(mark, t, slow, /* is_far */ true); + + bind(push); + // After successful lock, push object on lock-stack. + add(t, xthread, top); + sd(obj, Address(t)); + addw(top, top, oopSize); + sw(top, Address(xthread, JavaThread::lock_stack_top_offset())); } // Implements ligthweight-unlocking. -// Branches to slow upon failure. -// Falls through upon success. // // - obj: the object to be unlocked -// - hdr: the (pre-loaded) header of the object -// - tmp1, tmp2: temporary registers -void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) { +// - tmp1, tmp2, tmp3: temporary registers +// - slow: branched to if unlocking fails +void MacroAssembler::lightweight_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) { assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking"); - assert_different_registers(obj, hdr, tmp1, tmp2, t0); + assert_different_registers(obj, tmp1, tmp2, tmp3, t0); #ifdef ASSERT { - // The following checks rely on the fact that LockStack is only ever modified by - // its owning thread, even if the lock got inflated concurrently; removal of LockStack - // entries after inflation will happen delayed in that case. - // Check for lock-stack underflow. Label stack_ok; lwu(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); mv(tmp2, (unsigned)LockStack::start_offset()); - bgt(tmp1, tmp2, stack_ok); + bge(tmp1, tmp2, stack_ok); STOP("Lock-stack underflow"); bind(stack_ok); } - { - // Check if the top of the lock-stack matches the unlocked object. - Label tos_ok; - subw(tmp1, tmp1, oopSize); - add(tmp1, xthread, tmp1); - ld(tmp1, Address(tmp1, 0)); - beq(tmp1, obj, tos_ok); - STOP("Top of lock-stack does not match the unlocked object"); - bind(tos_ok); - } - { - // Check that hdr is fast-locked. - Label hdr_ok; - andi(tmp1, hdr, markWord::lock_mask_in_place); - beqz(tmp1, hdr_ok); - STOP("Header is not fast-locked"); - bind(hdr_ok); - } #endif - // Load the new header (unlocked) into tmp1 - ori(tmp1, hdr, markWord::unlocked_value); + Label unlocked, push_and_slow; + const Register top = tmp1; + const Register mark = tmp2; + const Register t = tmp3; + + // Check if obj is top of lock-stack. + lwu(top, Address(xthread, JavaThread::lock_stack_top_offset())); + subw(top, top, oopSize); + add(t, xthread, top); + ld(t, Address(t)); + bne(obj, t, slow, /* is_far */ true); + + // Pop lock-stack. + DEBUG_ONLY(add(t, xthread, top);) + DEBUG_ONLY(sd(zr, Address(t));) + sw(top, Address(xthread, JavaThread::lock_stack_top_offset())); + + // Check if recursive. + add(t, xthread, top); + ld(t, Address(t, -oopSize)); + beq(obj, t, unlocked); + + // Not recursive. Check header for monitor (0b10). + ld(mark, Address(obj, oopDesc::mark_offset_in_bytes())); + test_bit(t, mark, exact_log2(markWord::monitor_value)); + bnez(t, push_and_slow); - // Try to swing header from locked to unlocked - Label success; - cmpxchgptr(hdr, tmp1, obj, tmp2, success, &slow); - bind(success); - - // After successful unlock, pop object from lock-stack - lwu(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); - subw(tmp1, tmp1, oopSize); #ifdef ASSERT - add(tmp2, xthread, tmp1); - sd(zr, Address(tmp2, 0)); + // Check header not unlocked (0b01). + Label not_unlocked; + test_bit(t, mark, exact_log2(markWord::unlocked_value)); + beqz(t, not_unlocked); + stop("lightweight_unlock already unlocked"); + bind(not_unlocked); #endif - sw(tmp1, Address(xthread, JavaThread::lock_stack_top_offset())); + + // Try to unlock. Transition lock bits 0b00 => 0b01 + assert(oopDesc::mark_offset_in_bytes() == 0, "required to avoid lea"); + ori(t, mark, markWord::unlocked_value); + cmpxchg(/*addr*/ obj, /*expected*/ mark, /*new*/ t, Assembler::int64, + /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, /*result*/ t); + beq(mark, t, unlocked); + + bind(push_and_slow); + // Restore lock-stack and handle the unlock in runtime. + DEBUG_ONLY(add(t, xthread, top);) + DEBUG_ONLY(sd(obj, Address(t));) + addw(top, top, oopSize); + sw(top, Address(xthread, JavaThread::lock_stack_top_offset())); + j(slow); + + bind(unlocked); } diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp index 63cfb228551..75c0f9ba305 100644 --- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp @@ -1519,8 +1519,8 @@ class MacroAssembler: public Assembler { void store_conditional(Register dst, Register new_val, Register addr, enum operand_size size, Assembler::Aqrl release); public: - void lightweight_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow); - void lightweight_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow); + void lightweight_lock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow); + void lightweight_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow); }; #ifdef ASSERT diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad index 10a80cd0940..86d0ad7a059 100644 --- a/src/hotspot/cpu/riscv/riscv.ad +++ b/src/hotspot/cpu/riscv/riscv.ad @@ -10469,10 +10469,11 @@ instruct tlsLoadP(javaThread_RegP dst) // using t1 as the 'flag' register to bridge the BoolNode producers and consumers instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3) %{ + predicate(LockingMode != LM_LIGHTWEIGHT); match(Set cr (FastLock object box)); effect(TEMP tmp1, TEMP tmp2, TEMP tmp3); - ins_cost(LOAD_COST * 2 + STORE_COST * 3 + ALU_COST * 6 + BRANCH_COST * 3); + ins_cost(10 * DEFAULT_COST); format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3, #@cmpFastLock" %} ins_encode %{ @@ -10485,10 +10486,11 @@ instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iReg // using t1 as the 'flag' register to bridge the BoolNode producers and consumers instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2) %{ + predicate(LockingMode != LM_LIGHTWEIGHT); match(Set cr (FastUnlock object box)); effect(TEMP tmp1, TEMP tmp2); - ins_cost(LOAD_COST * 2 + STORE_COST + ALU_COST * 2 + BRANCH_COST * 4); + ins_cost(10 * DEFAULT_COST); format %{ "fastunlock $object,$box\t! kills $tmp1, $tmp2, #@cmpFastUnlock" %} ins_encode %{ @@ -10498,6 +10500,38 @@ instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iR ins_pipe(pipe_serial); %} +instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP_R10 box, iRegPNoSp tmp1, iRegPNoSp tmp2) +%{ + predicate(LockingMode == LM_LIGHTWEIGHT); + match(Set cr (FastLock object box)); + effect(TEMP tmp1, TEMP tmp2, USE_KILL box); + + ins_cost(10 * DEFAULT_COST); + format %{ "fastlock $object,$box\t! kills $box,$tmp1,$tmp2 #@cmpFastLockLightweight" %} + + ins_encode %{ + __ fast_lock_lightweight($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register); + %} + + ins_pipe(pipe_serial); +%} + +instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP_R10 box, iRegPNoSp tmp1, iRegPNoSp tmp2) +%{ + predicate(LockingMode == LM_LIGHTWEIGHT); + match(Set cr (FastUnlock object box)); + effect(TEMP tmp1, TEMP tmp2, USE_KILL box); + + ins_cost(10 * DEFAULT_COST); + format %{ "fastunlock $object,$box\t! kills $box,$tmp1,$tmp2, #@cmpFastUnlockLightweight" %} + + ins_encode %{ + __ fast_unlock_lightweight($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register); + %} + + ins_pipe(pipe_serial); +%} + // Tail Call; Jump from runtime stub to Java code. // Also known as an 'interprocedural jump'. // Target of jump will eventually return to caller. diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp index 7435b552d15..5945f9d5fe2 100644 --- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp +++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp @@ -1679,8 +1679,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, __ sd(swap_reg, Address(lock_reg, mark_word_offset)); __ bnez(swap_reg, slow_path_lock); } else { - assert(LockingMode == LM_LIGHTWEIGHT, ""); - __ ld(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes())); + assert(LockingMode == LM_LIGHTWEIGHT, "must be"); __ lightweight_lock(obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock); } @@ -1806,9 +1805,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, __ decrement(Address(xthread, JavaThread::held_monitor_count_offset())); } else { assert(LockingMode == LM_LIGHTWEIGHT, ""); - __ ld(old_hdr, Address(obj_reg, oopDesc::mark_offset_in_bytes())); - __ test_bit(t0, old_hdr, exact_log2(markWord::monitor_value)); - __ bnez(t0, slow_path_unlock); __ lightweight_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock); __ decrement(Address(xthread, JavaThread::held_monitor_count_offset())); } diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp index b63238cbe31..e6f79cd6379 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp @@ -217,6 +217,8 @@ class VM_Version : public Abstract_VM_Version { constexpr static bool supports_stack_watermark_barrier() { return true; } + constexpr static bool supports_recursive_lightweight_locking() { return true; } + static bool supports_on_spin_wait() { return UseZihintpause; } // RISCV64 supports fast class initialization checks From b7540df6a4279c63e69d32b9d9834f7a427478d1 Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Tue, 5 Mar 2024 02:34:58 +0000 Subject: [PATCH 48/86] 8327007: javax/swing/JSpinner/8008657/bug8008657.java fails Reviewed-by: prr --- test/jdk/javax/swing/JSpinner/8008657/bug8008657.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/jdk/javax/swing/JSpinner/8008657/bug8008657.java b/test/jdk/javax/swing/JSpinner/8008657/bug8008657.java index cbeb0c185bb..26ed0e0082c 100644 --- a/test/jdk/javax/swing/JSpinner/8008657/bug8008657.java +++ b/test/jdk/javax/swing/JSpinner/8008657/bug8008657.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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 @@ -39,7 +39,6 @@ * @test * @key headful * @bug 8008657 - * @author Alexander Scherbatiy * @summary JSpinner setComponentOrientation doesn't affect on text orientation * @run main bug8008657 */ @@ -137,6 +136,7 @@ static void createDateSpinner() { calendar.add(Calendar.YEAR, -1); Date earliestDate = calendar.getTime(); calendar.add(Calendar.YEAR, 1); + calendar.add(Calendar.DAY_OF_MONTH, 1); Date latestDate = calendar.getTime(); SpinnerModel dateModel = new SpinnerDateModel(initDate, earliestDate, From c589555845e61cdde5340aaa76fcc36b2753240d Mon Sep 17 00:00:00 2001 From: Emanuel Peter Date: Tue, 5 Mar 2024 06:35:32 +0000 Subject: [PATCH 49/86] 8325095: C2: bailout message broken: ResourceArea allocated string used after free Reviewed-by: kvn, dlong --- src/hotspot/share/ci/ciEnv.cpp | 8 ++- src/hotspot/share/ci/ciEnv.hpp | 7 +-- .../share/compiler/cHeapStringHolder.cpp | 43 ++++++++++++++++ .../share/compiler/cHeapStringHolder.hpp | 50 +++++++++++++++++++ .../compiler/compilationMemoryStatistic.cpp | 2 +- src/hotspot/share/compiler/compileBroker.cpp | 4 +- src/hotspot/share/opto/compile.cpp | 6 +-- src/hotspot/share/opto/compile.hpp | 21 ++++++-- src/hotspot/share/runtime/vmStructs.cpp | 1 - 9 files changed, 123 insertions(+), 19 deletions(-) create mode 100644 src/hotspot/share/compiler/cHeapStringHolder.cpp create mode 100644 src/hotspot/share/compiler/cHeapStringHolder.hpp diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index 75d46abd517..b7db2a6860f 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -121,7 +121,6 @@ ciEnv::ciEnv(CompileTask* task) _oop_recorder = nullptr; _debug_info = nullptr; _dependencies = nullptr; - _failure_reason = nullptr; _inc_decompile_count_on_failure = true; _compilable = MethodCompilable; _break_at_compile = false; @@ -250,7 +249,6 @@ ciEnv::ciEnv(Arena* arena) : _ciEnv_arena(mtCompiler) { _oop_recorder = nullptr; _debug_info = nullptr; _dependencies = nullptr; - _failure_reason = nullptr; _inc_decompile_count_on_failure = true; _compilable = MethodCompilable_never; _break_at_compile = false; @@ -1233,9 +1231,9 @@ int ciEnv::num_inlined_bytecodes() const { // ------------------------------------------------------------------ // ciEnv::record_failure() void ciEnv::record_failure(const char* reason) { - if (_failure_reason == nullptr) { + if (_failure_reason.get() == nullptr) { // Record the first failure reason. - _failure_reason = reason; + _failure_reason.set(reason); } } @@ -1265,7 +1263,7 @@ void ciEnv::record_method_not_compilable(const char* reason, bool all_tiers) { _compilable = new_compilable; // Reset failure reason; this one is more important. - _failure_reason = nullptr; + _failure_reason.clear(); record_failure(reason); } } diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp index fc12cc0259b..5d3a61f809e 100644 --- a/src/hotspot/share/ci/ciEnv.hpp +++ b/src/hotspot/share/ci/ciEnv.hpp @@ -33,6 +33,7 @@ #include "code/exceptionHandlerTable.hpp" #include "compiler/compiler_globals.hpp" #include "compiler/compilerThread.hpp" +#include "compiler/cHeapStringHolder.hpp" #include "oops/methodData.hpp" #include "runtime/javaThread.hpp" @@ -57,7 +58,7 @@ class ciEnv : StackObj { OopRecorder* _oop_recorder; DebugInformationRecorder* _debug_info; Dependencies* _dependencies; - const char* _failure_reason; + CHeapStringHolder _failure_reason; bool _inc_decompile_count_on_failure; int _compilable; bool _break_at_compile; @@ -319,10 +320,10 @@ class ciEnv : StackObj { // This is true if the compilation is not going to produce code. // (It is reasonable to retry failed compilations.) - bool failing() const { return _failure_reason != nullptr; } + bool failing() const { return _failure_reason.get() != nullptr; } // Reason this compilation is failing, such as "too many basic blocks". - const char* failure_reason() const { return _failure_reason; } + const char* failure_reason() const { return _failure_reason.get(); } // Return state of appropriate compatibility int compilable() { return _compilable; } diff --git a/src/hotspot/share/compiler/cHeapStringHolder.cpp b/src/hotspot/share/compiler/cHeapStringHolder.cpp new file mode 100644 index 00000000000..0383e738a47 --- /dev/null +++ b/src/hotspot/share/compiler/cHeapStringHolder.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2024, 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. + * + * 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. + * + */ + +#include "precompiled.hpp" +#include "compiler/cHeapStringHolder.hpp" + +void CHeapStringHolder::set(const char* string) { + clear(); + if (string != nullptr) { + size_t len = strlen(string); + _string = NEW_C_HEAP_ARRAY(char, len + 1, mtCompiler); + ::memcpy(_string, string, len); + _string[len] = 0; // terminating null + } +} + +void CHeapStringHolder::clear() { + if (_string != nullptr) { + FREE_C_HEAP_ARRAY(char, _string); + _string = nullptr; + } +} diff --git a/src/hotspot/share/compiler/cHeapStringHolder.hpp b/src/hotspot/share/compiler/cHeapStringHolder.hpp new file mode 100644 index 00000000000..46659c2a521 --- /dev/null +++ b/src/hotspot/share/compiler/cHeapStringHolder.hpp @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2024, 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. + * + * 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. + * + */ + +#ifndef SHARE_COMPILER_CHEAPSTRINGHOLDER_HPP +#define SHARE_COMPILER_CHEAPSTRINGHOLDER_HPP + +#include "memory/allocation.hpp" + +// Holder for a C-Heap allocated String +// The user must ensure that the destructor is called, or at least clear. +class CHeapStringHolder : public StackObj { +private: + char* _string; + +public: + CHeapStringHolder() : _string(nullptr) {} + ~CHeapStringHolder() { clear(); }; + NONCOPYABLE(CHeapStringHolder); + + // Allocate memory to hold a copy of string + void set(const char* string); + + // Release allocated memory + void clear(); + + const char* get() const { return _string; }; +}; + +#endif // SHARE_COMPILER_CHEAPSTRINGHOLDER_HPP diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp index 33e797d2353..7c39024a82a 100644 --- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp +++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp @@ -405,7 +405,7 @@ void CompilationMemoryStatistic::on_end_compilation() { if (env) { const char* const failure_reason = env->failure_reason(); if (failure_reason != nullptr) { - result = (failure_reason == failure_reason_memlimit()) ? "oom" : "err"; + result = (strcmp(failure_reason, failure_reason_memlimit()) == 0) ? "oom" : "err"; } } diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index 3a251128914..112a15233bd 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -2328,7 +2328,9 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) { compilable = ci_env.compilable(); if (ci_env.failing()) { - failure_reason = ci_env.failure_reason(); + // Duplicate the failure reason string, so that it outlives ciEnv + failure_reason = os::strdup(ci_env.failure_reason(), mtCompiler); + failure_reason_on_C_heap = true; retry_message = ci_env.retry_message(); ci_env.report_failure(failure_reason); } diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp index 338732b420f..417f828013f 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -639,7 +639,6 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci, _env(ci_env), _directive(directive), _log(ci_env->log()), - _failure_reason(nullptr), _first_failure_details(nullptr), _intrinsics (comp_arena(), 0, 0, nullptr), _macro_nodes (comp_arena(), 8, 0, nullptr), @@ -930,7 +929,6 @@ Compile::Compile( ciEnv* ci_env, _env(ci_env), _directive(directive), _log(ci_env->log()), - _failure_reason(nullptr), _first_failure_details(nullptr), _congraph(nullptr), NOT_PRODUCT(_igv_printer(nullptr) COMMA) @@ -4392,9 +4390,9 @@ void Compile::record_failure(const char* reason) { if (log() != nullptr) { log()->elem("failure reason='%s' phase='compile'", reason); } - if (_failure_reason == nullptr) { + if (_failure_reason.get() == nullptr) { // Record the first failure reason. - _failure_reason = reason; + _failure_reason.set(reason); if (CaptureBailoutInformation) { _first_failure_details = new CompilationFailureInfo(reason); } diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp index 917ceb52d9a..0b60a674b49 100644 --- a/src/hotspot/share/opto/compile.hpp +++ b/src/hotspot/share/opto/compile.hpp @@ -32,6 +32,7 @@ #include "compiler/compilerOracle.hpp" #include "compiler/compileBroker.hpp" #include "compiler/compilerEvent.hpp" +#include "compiler/cHeapStringHolder.hpp" #include "libadt/dict.hpp" #include "libadt/vectset.hpp" #include "memory/resourceArea.hpp" @@ -363,7 +364,7 @@ class Compile : public Phase { ciEnv* _env; // CI interface DirectiveSet* _directive; // Compiler directive CompileLog* _log; // from CompilerThread - const char* _failure_reason; // for record_failure/failing pattern + CHeapStringHolder _failure_reason; // for record_failure/failing pattern CompilationFailureInfo* _first_failure_details; // Details for the first failure happening during compilation GrowableArray _intrinsics; // List of intrinsics. GrowableArray _macro_nodes; // List of nodes which need to be expanded before matching. @@ -811,12 +812,24 @@ class Compile : public Phase { Arena* comp_arena() { return &_comp_arena; } ciEnv* env() const { return _env; } CompileLog* log() const { return _log; } - bool failing() const { return _env->failing() || _failure_reason != nullptr; } - const char* failure_reason() const { return (_env->failing()) ? _env->failure_reason() : _failure_reason; } + + bool failing() const { + return _env->failing() || + _failure_reason.get() != nullptr; + } + + const char* failure_reason() const { + return _env->failing() ? _env->failure_reason() + : _failure_reason.get(); + } + const CompilationFailureInfo* first_failure_details() const { return _first_failure_details; } bool failure_reason_is(const char* r) const { - return (r == _failure_reason) || (r != nullptr && _failure_reason != nullptr && strcmp(r, _failure_reason) == 0); + return (r == _failure_reason.get()) || + (r != nullptr && + _failure_reason.get() != nullptr && + strcmp(r, _failure_reason.get()) == 0); } void record_failure(const char* reason); diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp index 3ddb9619d72..cc9d8afbaa4 100644 --- a/src/hotspot/share/runtime/vmStructs.cpp +++ b/src/hotspot/share/runtime/vmStructs.cpp @@ -724,7 +724,6 @@ /************/ \ \ nonstatic_field(ciEnv, _compiler_data, void*) \ - nonstatic_field(ciEnv, _failure_reason, const char*) \ nonstatic_field(ciEnv, _factory, ciObjectFactory*) \ nonstatic_field(ciEnv, _dependencies, Dependencies*) \ nonstatic_field(ciEnv, _task, CompileTask*) \ From 0b959098be452aa2c9b461c921e11b19678138c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?= Date: Tue, 5 Mar 2024 06:56:49 +0000 Subject: [PATCH 50/86] 8327224: G1: comment in G1BarrierSetC2::post_barrier() refers to nonexistent new_deferred_store_barrier() Reviewed-by: kbarrett --- src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp index 06be2fd7606..807e9aa9c59 100644 --- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp +++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp @@ -389,7 +389,7 @@ void G1BarrierSetC2::post_barrier(GraphKit* kit, if (use_ReduceInitialCardMarks() && obj == kit->just_allocated_object(kit->control())) { // We can skip marks on a freshly-allocated object in Eden. - // Keep this code in sync with new_deferred_store_barrier() in runtime.cpp. + // Keep this code in sync with CardTableBarrierSet::on_slowpath_allocation_exit. // That routine informs GC to take appropriate compensating steps, // upon a slow-path allocation, so as to make this card-mark // elision safe. From d6f2a174fcf41f0b091ef7eabea5d06fae90e0b2 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Tue, 5 Mar 2024 07:16:34 +0000 Subject: [PATCH 51/86] 8325881: Require minimum gcc version 10 Reviewed-by: ihse, shade --- doc/building.html | 2 +- doc/building.md | 2 +- make/autoconf/toolchain.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/building.html b/doc/building.html index 8a0acada254..29d0ace19b0 100644 --- a/doc/building.html +++ b/doc/building.html @@ -601,7 +601,7 @@

    Native Compiler

    All compilers are expected to be able to handle the C11 language standard for C, and C++14 for C++.

    gcc

    -

    The minimum accepted version of gcc is 6.0. Older versions will not +

    The minimum accepted version of gcc is 10.0. Older versions will not be accepted by configure.

    The JDK is currently known to compile successfully with gcc version 13.2 or newer.

    diff --git a/doc/building.md b/doc/building.md index ed8a0669355..14409b40668 100644 --- a/doc/building.md +++ b/doc/building.md @@ -403,7 +403,7 @@ C, and C++14 for C++. ### gcc -The minimum accepted version of gcc is 6.0. Older versions will not be accepted +The minimum accepted version of gcc is 10.0. Older versions will not be accepted by `configure`. The JDK is currently known to compile successfully with gcc version 13.2 or diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 index 6a29529c5c5..de0b6f0adfb 100644 --- a/make/autoconf/toolchain.m4 +++ b/make/autoconf/toolchain.m4 @@ -51,7 +51,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" # Minimum supported versions, empty means unspecified TOOLCHAIN_MINIMUM_VERSION_clang="3.5" -TOOLCHAIN_MINIMUM_VERSION_gcc="6.0" +TOOLCHAIN_MINIMUM_VERSION_gcc="10.0" TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28 TOOLCHAIN_MINIMUM_VERSION_xlc="16.1.0.0011" From e9adcebaf242843fe2004b01747b5a930b62b291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= Date: Tue, 5 Mar 2024 08:39:43 +0000 Subject: [PATCH 52/86] 8327208: Remove unused method java.util.jar.Manifest.make72Safe Reviewed-by: lancea, iris, jpai --- .../share/classes/java/util/jar/Manifest.java | 16 -------------- .../util/jar/Manifest/LineBreakLineWidth.java | 5 +++-- .../PreserveRawManifestEntryAndDigest.java | 22 ++++++++----------- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java index b3b9baa38cc..c0e30707a35 100644 --- a/src/java.base/share/classes/java/util/jar/Manifest.java +++ b/src/java.base/share/classes/java/util/jar/Manifest.java @@ -219,22 +219,6 @@ public void write(OutputStream out) throws IOException { dos.flush(); } - /** - * Adds line breaks to enforce a maximum of 72 bytes per line. - * - * @deprecation Replaced with {@link #println72}. - */ - @Deprecated(since = "13") - static void make72Safe(StringBuffer line) { - int length = line.length(); - int index = 72; - while (index < length) { - line.insert(index, "\r\n "); - index += 74; // + line width + line break ("\r\n") - length += 3; // + line break ("\r\n") and space - } - } - /** * Writes {@code line} to {@code out} with line breaks and continuation * spaces within the limits of 72 bytes of contents per line followed diff --git a/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java b/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java index bb5cee5b47d..8009db75601 100644 --- a/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java +++ b/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2024, 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,6 +26,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.util.jar.Manifest; import java.util.jar.Attributes; import java.util.jar.Attributes.Name; @@ -171,7 +172,7 @@ static void readSpecificLineWidthManifest(String name, String value, * if the header name is 69 or 70 bytes and in that case the name/value * delimiter ": " was broken on a new line. * - * changing the line width in Manifest#make72Safe(StringBuffer), + * changing the line width in {@link Manifest#println72(OutputStream, String)}, * however, also affects at which positions values are broken across * lines (should always have affected values only and never header * names or the delimiter) which is tested here. diff --git a/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java b/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java index ed47231e004..1217788eef0 100644 --- a/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java +++ b/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, 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 @@ -22,12 +22,9 @@ */ import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.FilterOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -46,7 +43,6 @@ import java.util.zip.ZipEntry; import jdk.security.jarsigner.JarSigner; import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.Platform; import jdk.test.lib.SecurityTools; import jdk.test.lib.util.JarUtils; import org.testng.annotations.BeforeTest; @@ -467,14 +463,14 @@ public void arbitraryLineBreaksHeader() throws Exception { } /** - * Breaks {@code line} at 70 bytes even though the name says 72 but when - * also counting the line delimiter ("{@code \r\n}") the line totals to 72 - * bytes. - * Borrowed from {@link Manifest#make72Safe} before JDK 11 + * Pre JDK 11, {@link Manifest#write(OutputStream)} would inject + * line breaks after 70 bytes instead of 72 bytes as mandated by + * the JAR File Specification. * - * @see Manifest#make72Safe + * This method injects line breaks after 70 bytes to simulate pre + * JDK 11 manifests. */ - static void make72Safe(StringBuffer line) { + static void injectLineBreaksAt70Bytes(StringBuffer line) { int length = line.length(); if (length > 72) { int index = 70; @@ -516,7 +512,7 @@ public void lineWidth70(String name, String digestalg) throws Exception { buf[0].append(line.substring(1)); } else { if (buf[0] != null) { - make72Safe(buf[0]); + injectLineBreaksAt70Bytes(buf[0]); sb.append(buf[0].toString()); sb.append("\r\n"); } @@ -524,7 +520,7 @@ public void lineWidth70(String name, String digestalg) throws Exception { buf[0].append(line); } }); - make72Safe(buf[0]); + injectLineBreaksAt70Bytes(buf[0]); sb.append(buf[0].toString()); sb.append("\r\n"); return sb.toString().getBytes(UTF_8); From fec51d4c46a2cdd2eae148478831677c9b558a5e Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Tue, 5 Mar 2024 11:18:09 +0000 Subject: [PATCH 53/86] 8327130: Serial: Remove Generation::record_spaces_top Reviewed-by: gli, kbarrett --- src/hotspot/share/gc/serial/defNewGeneration.hpp | 2 +- src/hotspot/share/gc/serial/generation.hpp | 3 --- src/hotspot/share/gc/serial/tenuredGeneration.hpp | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp index ddc177f6ccc..5fcfa5813ad 100644 --- a/src/hotspot/share/gc/serial/defNewGeneration.hpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp @@ -234,7 +234,7 @@ class DefNewGeneration: public Generation { void gc_epilogue(bool full); // Save the tops for eden, from, and to - virtual void record_spaces_top(); + void record_spaces_top(); // Accessing marks void save_marks(); diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp index e4545b56f44..114ab3d6312 100644 --- a/src/hotspot/share/gc/serial/generation.hpp +++ b/src/hotspot/share/gc/serial/generation.hpp @@ -168,9 +168,6 @@ class Generation: public CHeapObj { // still unsuccessful, return "null". virtual HeapWord* expand_and_allocate(size_t word_size, bool is_tlab) = 0; - // Save the high water marks for the used space in a generation. - virtual void record_spaces_top() {} - // Generations may keep statistics about collection. This method // updates those statistics. current_generation is the generation // that was most recently collected. This allows the generation to diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp index 1b7347161e7..b87926e0497 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp @@ -154,7 +154,7 @@ class TenuredGeneration: public Generation { // Performance Counter support void update_counters(); - virtual void record_spaces_top(); + void record_spaces_top(); // Statistics From 560cf59626188d7582f601b29d9e2d5bfd0fac7d Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Tue, 5 Mar 2024 11:31:45 +0000 Subject: [PATCH 54/86] 8327287: Remove unused FLSVerifyDictionary debug option Reviewed-by: ayang, kbarrett --- src/hotspot/share/runtime/globals.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 6d3edcf8ed9..88549316e8c 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -898,9 +898,6 @@ const int ObjectAlignmentInBytes = 8; develop(bool, TraceOopMapRewrites, false, \ "Trace rewriting of methods during oop map generation") \ \ - develop(bool, FLSVerifyDictionary, false, \ - "Do lots of (expensive) FLS dictionary verification") \ - \ product(uintx, ProcessDistributionStride, 4, \ "Stride through processors when distributing processes") \ range(0, max_juint) \ From a089ed2b9289eeda73bba47ac87e5bc81a4af9dc Mon Sep 17 00:00:00 2001 From: MaxXSoft Date: Tue, 5 Mar 2024 11:42:37 +0000 Subject: [PATCH 55/86] 8326936: RISC-V: Shenandoah GC crashes due to incorrect atomic memory operations Reviewed-by: fyang, rehn --- .../os_cpu/linux_riscv/atomic_linux_riscv.hpp | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp index e85bd60b226..6546adb6ff3 100644 --- a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp +++ b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp @@ -39,6 +39,12 @@ #define FULL_COMPILER_ATOMIC_SUPPORT #endif +#if defined(__clang_major__) +#define CORRECT_COMPILER_ATOMIC_SUPPORT +#elif defined(__GNUC__) && (__riscv_xlen <= 32 || __GNUC__ > 13) +#define CORRECT_COMPILER_ATOMIC_SUPPORT +#endif + template struct Atomic::PlatformAdd { template @@ -114,6 +120,44 @@ inline T Atomic::PlatformCmpxchg<1>::operator()(T volatile* dest __attribute__(( } #endif +#ifndef CORRECT_COMPILER_ATOMIC_SUPPORT +// The implementation of `__atomic_compare_exchange` lacks sign extensions +// in GCC 13 and lower when using with 32-bit unsigned integers on RV64, +// so we should implement it manually. +// GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114130. +// See also JDK-8326936. +template<> +template +inline T Atomic::PlatformCmpxchg<4>::operator()(T volatile* dest __attribute__((unused)), + T compare_value, + T exchange_value, + atomic_memory_order order) const { + STATIC_ASSERT(4 == sizeof(T)); + + int32_t old_value; + uint64_t rc_temp; + + if (order != memory_order_relaxed) { + FULL_MEM_BARRIER; + } + + __asm__ __volatile__ ( + "1: lr.w %0, %2 \n\t" + " bne %0, %3, 2f \n\t" + " sc.w %1, %4, %2 \n\t" + " bnez %1, 1b \n\t" + "2: \n\t" + : /*%0*/"=&r" (old_value), /*%1*/"=&r" (rc_temp), /*%2*/"+A" (*dest) + : /*%3*/"r" ((int64_t)(int32_t)compare_value), /*%4*/"r" (exchange_value) + : "memory" ); + + if (order != memory_order_relaxed) { + FULL_MEM_BARRIER; + } + return (T)old_value; +} +#endif + template template inline T Atomic::PlatformXchg::operator()(T volatile* dest, @@ -151,6 +195,10 @@ inline T Atomic::PlatformCmpxchg::operator()(T volatile* dest __attri STATIC_ASSERT(byte_size >= 4); #endif +#ifndef CORRECT_COMPILER_ATOMIC_SUPPORT + STATIC_ASSERT(byte_size != 4); +#endif + STATIC_ASSERT(byte_size == sizeof(T)); if (order != memory_order_relaxed) { FULL_MEM_BARRIER; @@ -187,5 +235,6 @@ struct Atomic::PlatformOrderedStore }; #undef FULL_COMPILER_ATOMIC_SUPPORT +#undef CORRECT_COMPILER_ATOMIC_SUPPORT #endif // OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP From c653e67c0f6ce7a023a5ea079d8872b1eeb8eba7 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Tue, 5 Mar 2024 13:31:08 +0000 Subject: [PATCH 56/86] 8327225: Revert DataInputStream.readUTF to static final Reviewed-by: rriggs, bpb, gli --- src/java.base/share/classes/java/io/DataInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java index 88cd4edc411..eab7a6e2f18 100644 --- a/src/java.base/share/classes/java/io/DataInputStream.java +++ b/src/java.base/share/classes/java/io/DataInputStream.java @@ -571,7 +571,7 @@ public final String readUTF() throws IOException { * valid modified UTF-8 encoding of a Unicode string. * @see java.io.DataInputStream#readUnsignedShort() */ - public static String readUTF(DataInput in) throws IOException { + public static final String readUTF(DataInput in) throws IOException { int utflen = in.readUnsignedShort(); byte[] bytearr; char[] chararr; From 2372aba6a21c569d4d724396e59b9fd1bec90682 Mon Sep 17 00:00:00 2001 From: Jorn Vernee Date: Tue, 5 Mar 2024 13:32:24 +0000 Subject: [PATCH 57/86] 8326172: Dubious claim on long[]/double[] alignment in MemorySegment javadoc Reviewed-by: mcimadamore --- .../java/lang/foreign/MemorySegment.java | 35 ++++++------------- .../java/lang/foreign/ValueLayout.java | 3 -- .../foreign/HeapMemorySegmentImpl.java | 3 -- .../foreign/abi/fallback/FallbackLinker.java | 4 +-- .../foreign/abi/fallback/LibFallback.java | 7 ++++ .../internal/foreign/layout/ValueLayouts.java | 4 +-- .../native/libfallbackLinker/fallbackLinker.c | 11 ++++++ test/jdk/java/foreign/TestLayouts.java | 20 +++++------ test/jdk/java/foreign/TestValueLayouts.java | 4 +-- .../stackwalk/TestReentrantUpcalls.java | 2 +- 10 files changed, 44 insertions(+), 49 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java index faf28b01bf0..a58595cb541 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java +++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java @@ -305,8 +305,7 @@ * and/or garbage collection behavior). *

    * In practice, the Java runtime lays out arrays in memory so that each n-byte element - * occurs at an n-byte aligned physical address (except for {@code long[]} and - * {@code double[]}, where alignment is platform-dependent, as explained below). The + * occurs at an n-byte aligned physical address. The * runtime preserves this invariant even if the array is relocated during garbage * collection. Access operations rely on this invariant to determine if the specified * offset in a heap segment refers to an aligned address in physical memory. @@ -325,26 +324,17 @@ * would correspond to physical address 1008 but offset 4 would correspond to * physical address 1010.

    • *
  • The starting physical address of a {@code long[]} array will be 8-byte aligned - * (e.g. 1000) on 64-bit platforms, so that successive long elements occur at - * 8-byte aligned addresses (e.g., 1000, 1008, 1016, 1024, etc.) On 64-bit platforms, - * a heap segment backed by a {@code long[]} array can be accessed at offsets - * 0, 8, 16, 24, etc under an 8-byte alignment constraint. In addition, the segment - * can be accessed at offsets 0, 4, 8, 12, etc under a 4-byte alignment constraint, - * because the target addresses (1000, 1004, 1008, 1012) are 4-byte aligned. And, - * the segment can be accessed at offsets 0, 2, 4, 6, etc under a 2-byte alignment - * constraint, because the target addresses (e.g. 1000, 1002, 1004, 1006) are - * 2-byte aligned.
    • - *
  • The starting physical address of a {@code long[]} array will be 4-byte aligned - * (e.g. 1004) on 32-bit platforms, so that successive long elements occur at 4-byte - * aligned addresses (e.g., 1004, 1008, 1012, 1016, etc.) On 32-bit platforms, a heap - * segment backed by a {@code long[]} array can be accessed at offsets - * 0, 4, 8, 12, etc under a 4-byte alignment constraint, because the target addresses - * (1004, 1008, 1012, 1016) are 4-byte aligned. And, the segment can be accessed at - * offsets 0, 2, 4, 6, etc under a 2-byte alignment constraint, because the target - * addresses (e.g. 1000, 1002, 1004, 1006) are 2-byte aligned.
    • + * (e.g. 1000), so that successive long elements occur at 8-byte aligned addresses + * (e.g., 1000, 1008, 1016, 1024, etc.) A heap segment backed by a {@code long[]} + * array can be accessed at offsets 0, 8, 16, 24, etc under an 8-byte alignment + * constraint. In addition, the segment can be accessed at offsets 0, 4, 8, 12, + * etc under a 4-byte alignment constraint, because the target addresses (1000, 1004, + * 1008, 1012) are 4-byte aligned. And, the segment can be accessed at offsets 0, 2, + * 4, 6, etc under a 2-byte alignment constraint, because the target addresses (e.g. + * 1000, 1002, 1004, 1006) are 2-byte aligned. * *

    - * In other words, heap segments feature a (platform-dependent) maximum + * In other words, heap segments feature a maximum * alignment which is derived from the size of the elements of the Java array backing the * segment, as shown in the following table: * @@ -389,10 +379,7 @@ * In such circumstances, clients have two options. They can use a heap segment backed * by a different array type (e.g. {@code long[]}), capable of supporting greater maximum * alignment. More specifically, the maximum alignment associated with {@code long[]} is - * set to {@code ValueLayout.JAVA_LONG.byteAlignment()} which is a platform-dependent - * value (set to {@code ValueLayout.ADDRESS.byteSize()}). That is, {@code long[]}) is - * guaranteed to provide at least 8-byte alignment in 64-bit platforms, but only 4-byte - * alignment in 32-bit platforms: + * set to {@code ValueLayout.JAVA_LONG.byteAlignment()}, which is 8 bytes: * * {@snippet lang=java : * MemorySegment longSegment = MemorySegment.ofArray(new long[10]); diff --git a/src/java.base/share/classes/java/lang/foreign/ValueLayout.java b/src/java.base/share/classes/java/lang/foreign/ValueLayout.java index e8740be387c..77bfe0e0209 100644 --- a/src/java.base/share/classes/java/lang/foreign/ValueLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/ValueLayout.java @@ -47,9 +47,6 @@ * For instance, the byte order of these constants is set to the * {@linkplain ByteOrder#nativeOrder() native byte order}, thus making it easy * to work with other APIs, such as arrays and {@link java.nio.ByteBuffer}. - * Moreover, the alignment constraint of {@link ValueLayout#JAVA_LONG} and - * {@link ValueLayout#JAVA_DOUBLE} is set to 8 bytes on 64-bit platforms, - * but only to 4 bytes on 32-bit platforms. * * @implSpec implementing classes and subclasses are immutable, thread-safe and * value-based. diff --git a/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java index e1ea65ff308..0b95c43b440 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java +++ b/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java @@ -49,9 +49,6 @@ abstract sealed class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl { // Constants defining the maximum alignment supported by various kinds of heap arrays. - // While for most arrays, the maximum alignment is constant (the size, in bytes, of the array elements), - // note that the alignment of a long[]/double[] depends on the platform: it's 4-byte on x86, but 8 bytes on x64 - // (as specified by the JAVA_LONG layout constant). private static final long MAX_ALIGN_BYTE_ARRAY = ValueLayout.JAVA_BYTE.byteAlignment(); private static final long MAX_ALIGN_SHORT_ARRAY = ValueLayout.JAVA_SHORT.byteAlignment(); diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java index 77c81c6dd58..d617e535dd6 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java +++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java @@ -307,8 +307,8 @@ class Holder { Map.entry("bool", JAVA_BOOLEAN), Map.entry("char", JAVA_BYTE), Map.entry("float", JAVA_FLOAT), - Map.entry("long long", JAVA_LONG), - Map.entry("double", JAVA_DOUBLE), + Map.entry("long long", JAVA_LONG.withByteAlignment(LibFallback.longLongAlign())), + Map.entry("double", JAVA_DOUBLE.withByteAlignment(LibFallback.doubleAlign())), Map.entry("void*", ADDRESS), // platform-dependent sizes Map.entry("size_t", FFIType.SIZE_T), diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java index b0b6bac3d64..58d6baf8525 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java +++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java @@ -73,6 +73,8 @@ public Boolean run() { static int intSize() { return NativeConstants.SIZEOF_INT; } static int longSize() {return NativeConstants.SIZEOF_LONG; } static int wcharSize() {return NativeConstants.SIZEOF_WCHAR; } + static int longLongAlign() { return NativeConstants.ALIGNOF_LONG_LONG; } + static int doubleAlign() { return NativeConstants.ALIGNOF_DOUBLE; } static short structTag() { return NativeConstants.STRUCT_TAG; } @@ -242,6 +244,9 @@ private static native void doDowncall(long cif, long fn, long rvalue, long avalu private static native int ffi_sizeof_long(); private static native int ffi_sizeof_wchar(); + private static native int alignof_long_long(); + private static native int alignof_double(); + // put these in a separate class to avoid an UnsatisfiedLinkError // when LibFallback is initialized but the library is not present private static final class NativeConstants { @@ -263,6 +268,8 @@ private NativeConstants() {} static final int SIZEOF_LONG = ffi_sizeof_long(); static final int SIZEOF_WCHAR = ffi_sizeof_wchar(); + static final int ALIGNOF_LONG_LONG = alignof_long_long(); + static final int ALIGNOF_DOUBLE = alignof_double(); static final MemorySegment VOID_TYPE = MemorySegment.ofAddress(ffi_type_void()); static final short STRUCT_TAG = ffi_type_struct(); diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index cc61ed41a98..4b41c80f2eb 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java @@ -278,7 +278,7 @@ OfLongImpl dup(ByteOrder order, long byteAlignment, Optional name) { } public static OfLong of(ByteOrder order) { - return new OfLongImpl(order, ADDRESS_SIZE_BYTES, Optional.empty()); + return new OfLongImpl(order, Long.BYTES, Optional.empty()); } } @@ -294,7 +294,7 @@ OfDoubleImpl dup(ByteOrder order, long byteAlignment, Optional name) { } public static OfDouble of(ByteOrder order) { - return new OfDoubleImpl(order, ADDRESS_SIZE_BYTES, Optional.empty()); + return new OfDoubleImpl(order, Double.BYTES, Optional.empty()); } } diff --git a/src/java.base/share/native/libfallbackLinker/fallbackLinker.c b/src/java.base/share/native/libfallbackLinker/fallbackLinker.c index 39d869adb63..2ee64fb05bc 100644 --- a/src/java.base/share/native/libfallbackLinker/fallbackLinker.c +++ b/src/java.base/share/native/libfallbackLinker/fallbackLinker.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -275,3 +276,13 @@ JNIEXPORT jint JNICALL Java_jdk_internal_foreign_abi_fallback_LibFallback_ffi_1sizeof_1wchar(JNIEnv* env, jclass cls) { return sizeof(wchar_t); } + +JNIEXPORT jint JNICALL +Java_jdk_internal_foreign_abi_fallback_LibFallback_alignof_1long_1long(JNIEnv* env, jclass cls) { + return alignof(long long); +} + +JNIEXPORT jint JNICALL +Java_jdk_internal_foreign_abi_fallback_LibFallback_alignof_1double(JNIEnv* env, jclass cls) { + return alignof(double); +} diff --git a/test/jdk/java/foreign/TestLayouts.java b/test/jdk/java/foreign/TestLayouts.java index 2aa398468cc..eb271db4e5e 100644 --- a/test/jdk/java/foreign/TestLayouts.java +++ b/test/jdk/java/foreign/TestLayouts.java @@ -161,7 +161,7 @@ public void testStructSizeAndAlign() { ValueLayout.JAVA_LONG ); assertEquals(struct.byteSize(), 1 + 1 + 2 + 4 + 8); - assertEquals(struct.byteAlignment(), ADDRESS.byteSize()); + assertEquals(struct.byteAlignment(), 8); } @Test(dataProvider="basicLayouts") @@ -192,7 +192,7 @@ public void testUnionSizeAndAlign() { ValueLayout.JAVA_LONG ); assertEquals(struct.byteSize(), 8); - assertEquals(struct.byteAlignment(), ADDRESS.byteSize()); + assertEquals(struct.byteAlignment(), 8); } @Test @@ -477,24 +477,24 @@ public Object[][] layoutsAndAlignments() { List layoutsAndAlignments = new ArrayList<>(); int i = 0; //add basic layouts - for (MemoryLayout l : basicLayoutsNoLongDouble) { + for (MemoryLayout l : basicLayouts) { layoutsAndAlignments.add(new Object[] { l, l.byteAlignment() }); } //add basic layouts wrapped in a sequence with given size - for (MemoryLayout l : basicLayoutsNoLongDouble) { + for (MemoryLayout l : basicLayouts) { layoutsAndAlignments.add(new Object[] { MemoryLayout.sequenceLayout(4, l), l.byteAlignment() }); } //add basic layouts wrapped in a struct - for (MemoryLayout l1 : basicLayoutsNoLongDouble) { - for (MemoryLayout l2 : basicLayoutsNoLongDouble) { + for (MemoryLayout l1 : basicLayouts) { + for (MemoryLayout l2 : basicLayouts) { if (l1.byteSize() % l2.byteAlignment() != 0) continue; // second element is not aligned, skip long align = Math.max(l1.byteAlignment(), l2.byteAlignment()); layoutsAndAlignments.add(new Object[]{MemoryLayout.structLayout(l1, l2), align}); } } //add basic layouts wrapped in a union - for (MemoryLayout l1 : basicLayoutsNoLongDouble) { - for (MemoryLayout l2 : basicLayoutsNoLongDouble) { + for (MemoryLayout l1 : basicLayouts) { + for (MemoryLayout l2 : basicLayouts) { long align = Math.max(l1.byteAlignment(), l2.byteAlignment()); layoutsAndAlignments.add(new Object[]{MemoryLayout.unionLayout(l1, l2), align}); } @@ -543,8 +543,4 @@ static Stream groupLayoutStream() { ValueLayout.JAVA_LONG, ValueLayout.JAVA_DOUBLE, }; - - static MemoryLayout[] basicLayoutsNoLongDouble = Stream.of(basicLayouts) - .filter(l -> l.carrier() != long.class && l.carrier() != double.class) - .toArray(MemoryLayout[]::new); } diff --git a/test/jdk/java/foreign/TestValueLayouts.java b/test/jdk/java/foreign/TestValueLayouts.java index ec44ad60aca..50f7f4c753f 100644 --- a/test/jdk/java/foreign/TestValueLayouts.java +++ b/test/jdk/java/foreign/TestValueLayouts.java @@ -70,7 +70,7 @@ public void testIntUnaligned() { @Test public void testLong() { - testAligned(JAVA_LONG, long.class, Long.BYTES, ADDRESS.byteSize()); + testAligned(JAVA_LONG, long.class, Long.BYTES, Long.BYTES); } @Test @@ -90,7 +90,7 @@ public void testFloatUnaligned() { @Test public void testDouble() { - testAligned(JAVA_DOUBLE, double.class, Double.BYTES, ADDRESS.byteSize()); + testAligned(JAVA_DOUBLE, double.class, Double.BYTES, Double.BYTES); } @Test diff --git a/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java b/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java index e69b44b4aa0..1d776aed128 100644 --- a/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java +++ b/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java @@ -76,7 +76,7 @@ public static void main(String[] args) throws Throwable { } static void m(int depth, MemorySegment thisStub, MethodHandle downcallHandle) throws Throwable { - if (depth < 100) { + if (depth < 50) { downcallHandle.invokeExact(depth + 1, thisStub); } else { WB.verifyFrames(/*log=*/true, /*updateRegisterMap=*/true); From 98f0b86641d84048949ed3da1cb14f3820b01c12 Mon Sep 17 00:00:00 2001 From: Emanuel Peter Date: Tue, 5 Mar 2024 13:37:08 +0000 Subject: [PATCH 58/86] 8319690: [AArch64] C2 compilation hits offset_ok_for_immed: assert "c2 compiler bug" Co-authored-by: Fei Gao Reviewed-by: aph, kvn, gli --- src/hotspot/cpu/aarch64/aarch64.ad | 4 - .../compiler/c2/TestUnalignedAccess.java | 172 ++++++++++++++++++ 2 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestUnalignedAccess.java diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad index a07ff041c48..7b94897eaad 100644 --- a/src/hotspot/cpu/aarch64/aarch64.ad +++ b/src/hotspot/cpu/aarch64/aarch64.ad @@ -2729,10 +2729,6 @@ typedef void (MacroAssembler::* mem_vector_insn)(FloatRegister Rt, { Address addr = mem2address(opcode, base, index, scale, disp); if (addr.getMode() == Address::base_plus_offset) { - /* If we get an out-of-range offset it is a bug in the compiler, - so we assert here. */ - assert(Address::offset_ok_for_immed(addr.offset(), exact_log2(size_in_memory)), - "c2 compiler bug"); /* Fix up any out-of-range offsets. */ assert_different_registers(rscratch1, base); assert_different_registers(rscratch1, reg); diff --git a/test/hotspot/jtreg/compiler/c2/TestUnalignedAccess.java b/test/hotspot/jtreg/compiler/c2/TestUnalignedAccess.java new file mode 100644 index 00000000000..d05dbad4a73 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestUnalignedAccess.java @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, Arm Limited. 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. + * + * 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 compiler.c2; + +import jdk.internal.misc.Unsafe; +import jdk.test.lib.Asserts; + +/** + * @test TestUnalignedAccess + * @summary AArch64: C2 compilation hits offset_ok_for_immed: assert "c2 compiler bug". + * @bug 8319690 + * @library /test/lib + * @modules java.base/jdk.internal.misc + * @run main/othervm compiler.c2.TestUnalignedAccess + * @run main/othervm -Xcomp -XX:-TieredCompilation -Xmx1g + * -XX:CompileCommand=compileonly,compiler.c2.TestUnalignedAccess*:: + * compiler.c2.TestUnalignedAccess + */ + +public class TestUnalignedAccess { + + public static final int LEN = 2040; + + static final Unsafe UNSAFE = Unsafe.getUnsafe(); + static void sink(int x) {} + + public static long lseed = 1; + public static int iseed = 2; + public static short sseed = 3; + public static byte bseed = 4; + public static long lres = lseed; + public static int ires = iseed; + public static short sres = sseed; + public static byte bres = bseed; + + public static class TestLong { + + private static final byte[] BYTES = new byte[LEN]; + private static final long rawdata = 0xbeef; + private static final long data; + + static { + sink(2); + // Signed immediate byte offset: range -256 to 255 + // Positive immediate byte offset: a multiple of 8 in the range 0 to 32760 + // Other immediate byte offsets can't be encoded in the instruction field. + + // 1030 can't be encoded as "base + offset" mode into the instruction field. + UNSAFE.putLongUnaligned(BYTES, 1030, rawdata); + lres += UNSAFE.getLongUnaligned(BYTES, 1030); + // 127 can be encoded into simm9 field. + UNSAFE.putLongUnaligned(BYTES, 127, lres); + lres += UNSAFE.getLongUnaligned(BYTES, 127); + // 1096 can be encoded into uimm12 field. + UNSAFE.putLongUnaligned(BYTES, 1096, lres); + data = UNSAFE.getLongUnaligned(BYTES, 1096); + } + + } + + public static class TestInt { + + private static final byte[] BYTES = new byte[LEN]; + private static final int rawdata = 0xbeef; + private static final int data; + static { + sink(2); + // Signed immediate byte offset: range -256 to 255 + // Positive immediate byte offset, a multiple of 4 in the range 0 to 16380 + // Other immediate byte offsets can't be encoded in the instruction field. + + // 274 can't be encoded as "base + offset" mode into the instruction field. + UNSAFE.putIntUnaligned(BYTES, 274, rawdata); + ires += UNSAFE.getIntUnaligned(BYTES, 274); + // 255 can be encoded into simm9 field. + UNSAFE.putIntUnaligned(BYTES, 255, ires); + ires += UNSAFE.getIntUnaligned(BYTES, 255); + // 528 can be encoded into uimm12 field. + UNSAFE.putIntUnaligned(BYTES, 528, ires); + data = UNSAFE.getIntUnaligned(BYTES, 528); + } + + } + + public static class TestShort { + + private static final byte[] BYTES = new byte[LEN]; + private static final short rawdata = (short)0xbeef; + private static final short data; + static { + sink(2); + // Signed immediate byte offset: range -256 to 255 + // Positive immediate byte offset: a multiple of 2 in the range 0 to 8190 + // Other immediate byte offsets can't be encoded in the instruction field. + + // 257 can't be encoded as "base + offset" mode into the instruction field. + UNSAFE.putShortUnaligned(BYTES, 257, rawdata); + sres = (short) (sres + UNSAFE.getShortUnaligned(BYTES, 257)); + // 253 can be encoded into simm9 field. + UNSAFE.putShortUnaligned(BYTES, 253, sres); + sres = (short) (sres + UNSAFE.getShortUnaligned(BYTES, 253)); + // 272 can be encoded into uimm12 field. + UNSAFE.putShortUnaligned(BYTES, 272, sres); + data = UNSAFE.getShortUnaligned(BYTES, 272); + } + + } + + public static class TestByte { + + private static final byte[] BYTES = new byte[LEN]; + private static final byte rawdata = (byte)0x3f; + private static final byte data; + static { + sink(2); + // Signed immediate byte offset: range -256 to 255 + // Positive immediate byte offset: range 0 to 4095 + // Other immediate byte offsets can't be encoded in the instruction field. + + // 272 can be encoded into simm9 field. + UNSAFE.putByte(BYTES, 272, rawdata); + bres = (byte) (bres + UNSAFE.getByte(BYTES, 272)); + // 53 can be encoded into simm9 field. + UNSAFE.putByte(BYTES, 53, bres); + bres = (byte) (bres + UNSAFE.getByte(BYTES, 53)); + // 1027 can be encoded into uimm12 field. + UNSAFE.putByte(BYTES, 1027, bres); + data = UNSAFE.getByte(BYTES, 1027); + } + + } + + static void test() { + TestLong ta = new TestLong(); + Asserts.assertEquals(ta.data, (ta.rawdata + lseed) * 2, "putUnaligned long failed!"); + + TestInt tb = new TestInt(); + Asserts.assertEquals(tb.data, (tb.rawdata + iseed) * 2, "putUnaligned int failed!"); + + TestShort tc = new TestShort(); + Asserts.assertEquals(tc.data, (short) (((short) (tc.rawdata + sseed)) * 2), "putUnaligned short failed!"); + + TestByte td = new TestByte(); + Asserts.assertEquals(td.data, (byte) (((byte) (td.rawdata + bseed)) * 2), "put byte failed!"); + } + + public static void main(String[] strArr) { + test(); + } +} From c00c939f99c7dfd31733cb27d36cb92fcc52a75b Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Tue, 5 Mar 2024 14:54:55 +0000 Subject: [PATCH 59/86] 8327364: Parallel: Remove unused ParallelCompactData::add_obj Reviewed-by: kbarrett --- .../share/gc/parallel/psParallelCompact.cpp | 29 ------------------- .../share/gc/parallel/psParallelCompact.hpp | 3 -- 2 files changed, 32 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 886a5d308c1..c4a191e2861 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -527,35 +527,6 @@ HeapWord* ParallelCompactData::partial_obj_end(size_t region_idx) const return result; } -void ParallelCompactData::add_obj(HeapWord* addr, size_t len) -{ - const size_t obj_ofs = pointer_delta(addr, _heap_start); - const size_t beg_region = obj_ofs >> Log2RegionSize; - // end_region is inclusive - const size_t end_region = (obj_ofs + len - 1) >> Log2RegionSize; - - if (beg_region == end_region) { - // All in one region. - _region_data[beg_region].add_live_obj(len); - return; - } - - // First region. - const size_t beg_ofs = region_offset(addr); - _region_data[beg_region].add_live_obj(RegionSize - beg_ofs); - - // Middle regions--completely spanned by this object. - for (size_t region = beg_region + 1; region < end_region; ++region) { - _region_data[region].set_partial_obj_size(RegionSize); - _region_data[region].set_partial_obj_addr(addr); - } - - // Last region. - const size_t end_ofs = region_offset(addr + len - 1); - _region_data[end_region].set_partial_obj_size(end_ofs + 1); - _region_data[end_region].set_partial_obj_addr(addr); -} - void ParallelCompactData::summarize_dense_prefix(HeapWord* beg, HeapWord* end) { diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 6a158e1385e..f5521b6014e 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -407,9 +407,6 @@ class ParallelCompactData inline BlockData* block(size_t block_idx) const; inline size_t block(const BlockData* block_ptr) const; - void add_obj(HeapWord* addr, size_t len); - void add_obj(oop p, size_t len) { add_obj(cast_from_oop(p), len); } - // Fill in the regions covering [beg, end) so that no data moves; i.e., the // destination of region n is simply the start of region n. Both arguments // beg and end must be region-aligned. From 3d106cb091de6b6ef2a9bf483fb0f5c98c28263c Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Tue, 5 Mar 2024 15:34:27 +0000 Subject: [PATCH 60/86] 8325139: JFR SwapSpace event - add free swap space information on Linux when running in a container environment Reviewed-by: lucy, sgehwolf --- .../os/linux/cgroupSubsystem_linux.hpp | 1 + .../os/linux/cgroupV1Subsystem_linux.cpp | 16 +++++++- .../os/linux/cgroupV1Subsystem_linux.hpp | 1 + .../os/linux/cgroupV2Subsystem_linux.cpp | 10 +++++ .../os/linux/cgroupV2Subsystem_linux.hpp | 1 + src/hotspot/os/linux/osContainer_linux.cpp | 5 +++ src/hotspot/os/linux/osContainer_linux.hpp | 1 + src/hotspot/os/linux/os_linux.cpp | 39 +++++++++++++++---- .../containers/docker/TestJFREvents.java | 37 +++++++++++++++++- 9 files changed, 101 insertions(+), 10 deletions(-) diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp index 3cc2141f176..7943d2fe9de 100644 --- a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp +++ b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp @@ -264,6 +264,7 @@ class CgroupSubsystem: public CHeapObj { virtual jlong pids_current() = 0; virtual jlong memory_usage_in_bytes() = 0; virtual jlong memory_and_swap_limit_in_bytes() = 0; + virtual jlong memory_and_swap_usage_in_bytes() = 0; virtual jlong memory_soft_limit_in_bytes() = 0; virtual jlong memory_max_usage_in_bytes() = 0; virtual jlong rss_usage_in_bytes() = 0; diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp index 37a1f476bde..b83da9099f8 100644 --- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp +++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, 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 @@ -168,6 +168,20 @@ jlong CgroupV1Subsystem::memory_and_swap_limit_in_bytes() { return memory_swap; } +jlong CgroupV1Subsystem::memory_and_swap_usage_in_bytes() { + jlong memory_sw_limit = memory_and_swap_limit_in_bytes(); + jlong memory_limit = CgroupSubsystem::memory_limit_in_bytes(); + if (memory_sw_limit > 0 && memory_limit > 0) { + jlong delta_swap = memory_sw_limit - memory_limit; + if (delta_swap > 0) { + GET_CONTAINER_INFO(julong, _memory->controller(), "/memory.memsw.usage_in_bytes", + "mem swap usage is: ", JULONG_FORMAT, JULONG_FORMAT, memory_swap_usage); + return (jlong)memory_swap_usage; + } + } + return memory_usage_in_bytes(); +} + jlong CgroupV1Subsystem::read_mem_swappiness() { GET_CONTAINER_INFO(julong, _memory->controller(), "/memory.swappiness", "Swappiness is: ", JULONG_FORMAT, JULONG_FORMAT, swappiness); diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp index c7550136f48..3205973961a 100644 --- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp +++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp @@ -76,6 +76,7 @@ class CgroupV1Subsystem: public CgroupSubsystem { public: jlong read_memory_limit_in_bytes(); jlong memory_and_swap_limit_in_bytes(); + jlong memory_and_swap_usage_in_bytes(); jlong memory_soft_limit_in_bytes(); jlong memory_usage_in_bytes(); jlong memory_max_usage_in_bytes(); diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp index 1c433be1c23..d7c6464caa0 100644 --- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp +++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp @@ -180,6 +180,16 @@ jlong CgroupV2Subsystem::memory_and_swap_limit_in_bytes() { return swap_limit; } +jlong CgroupV2Subsystem::memory_and_swap_usage_in_bytes() { + jlong memory_usage = memory_usage_in_bytes(); + if (memory_usage >= 0) { + char* mem_swp_current_str = mem_swp_current_val(); + jlong swap_current = limit_from_str(mem_swp_current_str); + return memory_usage + (swap_current >= 0 ? swap_current : 0); + } + return memory_usage; // not supported or unlimited case +} + char* CgroupV2Subsystem::mem_swp_limit_val() { GET_CONTAINER_INFO_CPTR(cptr, _unified, "/memory.swap.max", "Memory and Swap Limit is: %s", "%1023s", mem_swp_limit_str, 1024); diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp index b12b4ce6512..978c193c602 100644 --- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp +++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp @@ -75,6 +75,7 @@ class CgroupV2Subsystem: public CgroupSubsystem { int cpu_period(); int cpu_shares(); jlong memory_and_swap_limit_in_bytes(); + jlong memory_and_swap_usage_in_bytes(); jlong memory_soft_limit_in_bytes(); jlong memory_usage_in_bytes(); jlong memory_max_usage_in_bytes(); diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp index cd723228a75..fdb138c864f 100644 --- a/src/hotspot/os/linux/osContainer_linux.cpp +++ b/src/hotspot/os/linux/osContainer_linux.cpp @@ -77,6 +77,11 @@ jlong OSContainer::memory_and_swap_limit_in_bytes() { return cgroup_subsystem->memory_and_swap_limit_in_bytes(); } +jlong OSContainer::memory_and_swap_usage_in_bytes() { + assert(cgroup_subsystem != nullptr, "cgroup subsystem not available"); + return cgroup_subsystem->memory_and_swap_usage_in_bytes(); +} + jlong OSContainer::memory_soft_limit_in_bytes() { assert(cgroup_subsystem != nullptr, "cgroup subsystem not available"); return cgroup_subsystem->memory_soft_limit_in_bytes(); diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp index bb03ba3b005..fb837ec0bd6 100644 --- a/src/hotspot/os/linux/osContainer_linux.hpp +++ b/src/hotspot/os/linux/osContainer_linux.hpp @@ -52,6 +52,7 @@ class OSContainer: AllStatic { static jlong memory_limit_in_bytes(); static jlong memory_and_swap_limit_in_bytes(); + static jlong memory_and_swap_usage_in_bytes(); static jlong memory_soft_limit_in_bytes(); static jlong memory_usage_in_bytes(); static jlong memory_max_usage_in_bytes(); diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index 119f98c6874..457bcc10ec1 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -304,18 +304,41 @@ jlong os::total_swap_space() { return (jlong)(si.totalswap * si.mem_unit); } +static jlong host_free_swap() { + struct sysinfo si; + int ret = sysinfo(&si); + if (ret != 0) { + return -1; + } + return (jlong)(si.freeswap * si.mem_unit); +} + jlong os::free_swap_space() { + jlong host_free_swap_val = host_free_swap(); if (OSContainer::is_containerized()) { - // TODO add a good implementation - return -1; - } else { - struct sysinfo si; - int ret = sysinfo(&si); - if (ret != 0) { - return -1; + jlong mem_swap_limit = OSContainer::memory_and_swap_limit_in_bytes(); + jlong mem_limit = OSContainer::memory_limit_in_bytes(); + if (mem_swap_limit >= 0 && mem_limit >= 0) { + jlong delta_limit = mem_swap_limit - mem_limit; + if (delta_limit <= 0) { + return 0; + } + jlong mem_swap_usage = OSContainer::memory_and_swap_usage_in_bytes(); + jlong mem_usage = OSContainer::memory_usage_in_bytes(); + if (mem_swap_usage > 0 && mem_usage > 0) { + jlong delta_usage = mem_swap_usage - mem_usage; + if (delta_usage >= 0) { + jlong free_swap = delta_limit - delta_usage; + return free_swap >= 0 ? free_swap : 0; + } + } } - return (jlong)(si.freeswap * si.mem_unit); + // unlimited or not supported. Fall through to return host value + log_trace(os,container)("os::free_swap_space: container_swap_limit=" JLONG_FORMAT + " container_mem_limit=" JLONG_FORMAT " returning host value: " JLONG_FORMAT, + mem_swap_limit, mem_limit, host_free_swap_val); } + return host_free_swap_val; } julong os::physical_memory() { diff --git a/test/hotspot/jtreg/containers/docker/TestJFREvents.java b/test/hotspot/jtreg/containers/docker/TestJFREvents.java index 534b580d1fa..19bbce1c547 100644 --- a/test/hotspot/jtreg/containers/docker/TestJFREvents.java +++ b/test/hotspot/jtreg/containers/docker/TestJFREvents.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, 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 @@ -68,6 +68,10 @@ public static void main(String[] args) throws Exception { testMemory("500m", "" + 500*MB); testMemory("1g", "" + 1024*MB); + // see https://docs.docker.com/config/containers/resource_constraints/ + testSwapMemory("200m", "200m", "" + 0*MB, "" + 0*MB); + testSwapMemory("200m", "300m", "" + 100*MB, "" + 100*MB); + testProcessInfo(); testEnvironmentVariables(); @@ -211,6 +215,37 @@ private static void testMemory(String valueToSet, String expectedValue) throws E } + private static void testSwapMemory(String memValueToSet, String swapValueToSet, String expectedTotalValue, String expectedFreeValue) throws Exception { + Common.logNewTestCase("Memory: --memory = " + memValueToSet + " --memory-swap = " + swapValueToSet); + OutputAnalyzer out = DockerTestUtils.dockerRunJava( + commonDockerOpts() + .addDockerOpts("--memory=" + memValueToSet) + .addDockerOpts("--memory-swap=" + swapValueToSet) + .addClassOptions("jdk.SwapSpace")); + out.shouldHaveExitValue(0) + .shouldContain("totalSize = " + expectedTotalValue) + .shouldContain("freeSize = "); + List ls = out.asLinesWithoutVMWarnings(); + for (String cur : ls) { + int idx = cur.indexOf("freeSize = "); + if (idx != -1) { + int startNbr = idx+11; + int endNbr = cur.indexOf(' ', startNbr); + if (endNbr == -1) endNbr = cur.length(); + String freeSizeStr = cur.substring(startNbr, endNbr); + long freeval = Long.parseLong(freeSizeStr); + long totalval = Long.parseLong(expectedTotalValue); + if (0 <= freeval && freeval <= totalval) { + System.out.println("Found freeSize value " + freeval + " is fine"); + } else { + System.out.println("Found freeSize value " + freeval + " is bad"); + throw new Exception("Found free size value is bad"); + } + } + } + } + + private static void testProcessInfo() throws Exception { Common.logNewTestCase("ProcessInfo"); DockerTestUtils.dockerRunJava( From c6641c7d2d5fd3e085e39646c9a350eeb83e3c5b Mon Sep 17 00:00:00 2001 From: Ludvig Janiuk Date: Tue, 5 Mar 2024 16:24:54 +0000 Subject: [PATCH 61/86] 8326831: Clarify test harness control variables in make help Reviewed-by: erikj, gli, ihse --- make/Global.gmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/Global.gmk b/make/Global.gmk index 1df6c5fb6bc..998ba4d2bda 100644 --- a/make/Global.gmk +++ b/make/Global.gmk @@ -102,9 +102,9 @@ help: $(info $(_) # method is 'auto', 'ignore' or 'fail' (default)) $(info $(_) TEST="test1 ..." # Use the given test descriptor(s) for testing, e.g.) $(info $(_) # make test TEST="jdk_lang gtest:all") - $(info $(_) JTREG="OPT1=x;OPT2=y" # Control the JTREG test harness, use 'help' to list) - $(info $(_) GTEST="OPT1=x;OPT2=y" # Control the GTEST test harness, use 'help' to list) - $(info $(_) MICRO="OPT1=x;OPT2=y" # Control the MICRO test harness, use 'help' to list) + $(info $(_) JTREG="OPT1=x;OPT2=y" # Control the JTREG test harness, use 'make test-only JTREG=help' to list) + $(info $(_) GTEST="OPT1=x;OPT2=y" # Control the GTEST test harness, use 'make test-only GTEST=help' to list) + $(info $(_) MICRO="OPT1=x;OPT2=y" # Control the MICRO test harness, use 'make test-only MICRO=help' to list) $(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses) $(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...") $(info ) From 809995b526ea79e4fd9fd4f911bcce811f77eb89 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Tue, 5 Mar 2024 19:32:29 +0000 Subject: [PATCH 62/86] 8174269: Remove COMPAT locale data provider from JDK Reviewed-by: ihse, joehw --- .../tools/cldrconverter/CLDRConverter.java | 114 +- make/modules/java.base/Gensrc.gmk | 7 +- .../java.base/gensrc/GensrcLocaleData.gmk | 153 --- make/modules/jdk.localedata/Gensrc.gmk | 21 +- .../time/format/DateTimeFormatterBuilder.java | 12 +- .../share/classes/java/util/Locale.java | 1 - .../java/util/spi/LocaleServiceProvider.java | 20 +- .../sun/text/resources/FormatData_en.java | 83 -- .../sun/text/resources/FormatData_en_US.java | 60 - .../resources/JavaTimeSupplementary_en.java | 274 ---- .../cldr/CLDRTimeZoneNameProviderImpl.java | 71 +- ...a.template => BaseLocaleDataMetaInfo.java} | 39 +- .../provider/CalendarNameProviderImpl.java | 38 +- .../FallbackLocaleProviderAdapter.java | 73 +- .../provider/JRELocaleProviderAdapter.java | 4 +- .../provider/LocaleProviderAdapter.java | 31 +- .../util/resources/CalendarData_en.properties | 43 - .../resources/CurrencyNames_en_US.properties | 38 - .../util/resources/LocaleNames_en.properties | 41 - .../sun/util/resources/TimeZoneNames_en.java | 58 - .../plugins/IncludeLocalesPlugin.java | 31 +- .../share/classes/module-info.java | 4 +- ...{FormatData_fr_FR.java => FormatData.java} | 26 +- .../sun/text/resources/ext/FormatData_ar.java | 271 ---- .../text/resources/ext/FormatData_ar_JO.java | 100 -- .../text/resources/ext/FormatData_ar_LB.java | 100 -- .../text/resources/ext/FormatData_ar_SY.java | 100 -- .../sun/text/resources/ext/FormatData_be.java | 225 ---- .../text/resources/ext/FormatData_be_BY.java | 63 - .../sun/text/resources/ext/FormatData_bg.java | 225 ---- .../text/resources/ext/FormatData_bg_BG.java | 63 - .../sun/text/resources/ext/FormatData_ca.java | 303 ----- .../text/resources/ext/FormatData_ca_ES.java | 63 - .../sun/text/resources/ext/FormatData_cs.java | 321 ----- .../text/resources/ext/FormatData_cs_CZ.java | 63 - .../sun/text/resources/ext/FormatData_da.java | 242 ---- .../text/resources/ext/FormatData_da_DK.java | 63 - .../sun/text/resources/ext/FormatData_de.java | 253 ---- .../text/resources/ext/FormatData_de_AT.java | 136 -- .../text/resources/ext/FormatData_de_CH.java | 79 -- .../text/resources/ext/FormatData_de_DE.java | 63 - .../text/resources/ext/FormatData_de_LU.java | 60 - .../sun/text/resources/ext/FormatData_el.java | 314 ----- .../text/resources/ext/FormatData_el_CY.java | 143 -- .../text/resources/ext/FormatData_el_GR.java | 60 - .../text/resources/ext/FormatData_en_AU.java | 74 -- .../text/resources/ext/FormatData_en_CA.java | 75 -- .../text/resources/ext/FormatData_en_GB.java | 75 -- .../text/resources/ext/FormatData_en_IE.java | 75 -- .../text/resources/ext/FormatData_en_IN.java | 86 -- .../text/resources/ext/FormatData_en_MT.java | 114 -- .../text/resources/ext/FormatData_en_NZ.java | 74 -- .../text/resources/ext/FormatData_en_PH.java | 114 -- .../text/resources/ext/FormatData_en_SG.java | 101 -- .../text/resources/ext/FormatData_en_ZA.java | 81 -- .../sun/text/resources/ext/FormatData_es.java | 229 ---- .../text/resources/ext/FormatData_es_AR.java | 81 -- .../text/resources/ext/FormatData_es_BO.java | 89 -- .../text/resources/ext/FormatData_es_CL.java | 81 -- .../text/resources/ext/FormatData_es_CO.java | 89 -- .../text/resources/ext/FormatData_es_CR.java | 89 -- .../text/resources/ext/FormatData_es_DO.java | 89 -- .../text/resources/ext/FormatData_es_EC.java | 96 -- .../text/resources/ext/FormatData_es_ES.java | 60 - .../text/resources/ext/FormatData_es_GT.java | 89 -- .../text/resources/ext/FormatData_es_HN.java | 89 -- .../text/resources/ext/FormatData_es_MX.java | 96 -- .../text/resources/ext/FormatData_es_NI.java | 89 -- .../text/resources/ext/FormatData_es_PA.java | 89 -- .../text/resources/ext/FormatData_es_PE.java | 96 -- .../text/resources/ext/FormatData_es_PR.java | 89 -- .../text/resources/ext/FormatData_es_PY.java | 74 -- .../text/resources/ext/FormatData_es_SV.java | 89 -- .../text/resources/ext/FormatData_es_US.java | 127 -- .../text/resources/ext/FormatData_es_UY.java | 81 -- .../text/resources/ext/FormatData_es_VE.java | 81 -- .../sun/text/resources/ext/FormatData_et.java | 221 ---- .../text/resources/ext/FormatData_et_EE.java | 60 - .../sun/text/resources/ext/FormatData_fi.java | 324 ----- .../text/resources/ext/FormatData_fi_FI.java | 60 - .../sun/text/resources/ext/FormatData_fr.java | 258 ---- .../text/resources/ext/FormatData_fr_BE.java | 90 -- .../text/resources/ext/FormatData_fr_CA.java | 82 -- .../text/resources/ext/FormatData_fr_CH.java | 97 -- .../sun/text/resources/ext/FormatData_ga.java | 206 --- .../text/resources/ext/FormatData_ga_IE.java | 99 -- .../sun/text/resources/ext/FormatData_he.java | 235 ---- .../text/resources/ext/FormatData_he_IL.java | 60 - .../text/resources/ext/FormatData_hi_IN.java | 223 ---- .../sun/text/resources/ext/FormatData_hr.java | 311 ----- .../text/resources/ext/FormatData_hr_HR.java | 81 -- .../sun/text/resources/ext/FormatData_hu.java | 324 ----- .../text/resources/ext/FormatData_hu_HU.java | 60 - .../sun/text/resources/ext/FormatData_id.java | 176 --- .../text/resources/ext/FormatData_id_ID.java | 92 -- .../sun/text/resources/ext/FormatData_is.java | 238 ---- .../text/resources/ext/FormatData_is_IS.java | 60 - .../sun/text/resources/ext/FormatData_it.java | 267 ---- .../text/resources/ext/FormatData_it_CH.java | 97 -- .../text/resources/ext/FormatData_it_IT.java | 60 - .../sun/text/resources/ext/FormatData_ja.java | 159 +-- .../text/resources/ext/FormatData_ja_JP.java | 60 - .../sun/text/resources/ext/FormatData_ko.java | 244 ---- .../text/resources/ext/FormatData_ko_KR.java | 60 - .../sun/text/resources/ext/FormatData_lt.java | 306 ----- .../text/resources/ext/FormatData_lt_LT.java | 60 - .../sun/text/resources/ext/FormatData_lv.java | 233 ---- .../text/resources/ext/FormatData_lv_LV.java | 60 - .../sun/text/resources/ext/FormatData_mk.java | 216 ---- .../text/resources/ext/FormatData_mk_MK.java | 60 - .../sun/text/resources/ext/FormatData_ms.java | 228 ---- .../text/resources/ext/FormatData_ms_MY.java | 99 -- .../sun/text/resources/ext/FormatData_mt.java | 189 --- .../text/resources/ext/FormatData_mt_MT.java | 78 -- .../sun/text/resources/ext/FormatData_nl.java | 216 ---- .../text/resources/ext/FormatData_nl_BE.java | 82 -- .../text/resources/ext/FormatData_nl_NL.java | 60 - .../sun/text/resources/ext/FormatData_no.java | 258 ---- .../text/resources/ext/FormatData_no_NO.java | 60 - .../resources/ext/FormatData_no_NO_NY.java | 146 --- .../sun/text/resources/ext/FormatData_pl.java | 300 ----- .../text/resources/ext/FormatData_pl_PL.java | 81 -- .../sun/text/resources/ext/FormatData_pt.java | 222 ---- .../text/resources/ext/FormatData_pt_BR.java | 81 -- .../text/resources/ext/FormatData_pt_PT.java | 60 - .../sun/text/resources/ext/FormatData_ro.java | 300 ----- .../text/resources/ext/FormatData_ro_RO.java | 60 - .../sun/text/resources/ext/FormatData_ru.java | 300 ----- .../text/resources/ext/FormatData_ru_RU.java | 60 - .../sun/text/resources/ext/FormatData_sk.java | 283 ---- .../text/resources/ext/FormatData_sk_SK.java | 60 - .../sun/text/resources/ext/FormatData_sl.java | 244 ---- .../text/resources/ext/FormatData_sl_SI.java | 60 - .../sun/text/resources/ext/FormatData_sq.java | 186 --- .../text/resources/ext/FormatData_sq_AL.java | 60 - .../sun/text/resources/ext/FormatData_sr.java | 218 ---- .../text/resources/ext/FormatData_sr_BA.java | 131 -- .../text/resources/ext/FormatData_sr_CS.java | 71 - .../resources/ext/FormatData_sr_Latn.java | 206 --- .../resources/ext/FormatData_sr_Latn_ME.java | 94 -- .../text/resources/ext/FormatData_sr_ME.java | 71 - .../text/resources/ext/FormatData_sr_RS.java | 71 - .../sun/text/resources/ext/FormatData_sv.java | 319 ----- .../text/resources/ext/FormatData_sv_SE.java | 60 - .../sun/text/resources/ext/FormatData_th.java | 282 ---- .../text/resources/ext/FormatData_th_TH.java | 61 - .../sun/text/resources/ext/FormatData_tr.java | 313 ----- .../text/resources/ext/FormatData_tr_TR.java | 53 - .../sun/text/resources/ext/FormatData_uk.java | 250 ---- .../text/resources/ext/FormatData_uk_UA.java | 60 - .../sun/text/resources/ext/FormatData_vi.java | 234 ---- .../text/resources/ext/FormatData_vi_VN.java | 62 - .../sun/text/resources/ext/FormatData_zh.java | 327 ----- .../text/resources/ext/FormatData_zh_CN.java | 61 - .../text/resources/ext/FormatData_zh_HK.java | 123 -- .../text/resources/ext/FormatData_zh_SG.java | 126 -- .../text/resources/ext/FormatData_zh_TW.java | 179 --- .../ext/JavaTimeSupplementary_ar.java | 379 ------ .../ext/JavaTimeSupplementary_ar_JO.java | 115 -- .../ext/JavaTimeSupplementary_ar_LB.java | 115 -- .../ext/JavaTimeSupplementary_ar_SY.java | 115 -- .../ext/JavaTimeSupplementary_be.java | 315 ----- .../ext/JavaTimeSupplementary_bg.java | 316 ----- .../ext/JavaTimeSupplementary_ca.java | 323 ----- .../ext/JavaTimeSupplementary_cs.java | 305 ----- .../ext/JavaTimeSupplementary_da.java | 315 ----- .../ext/JavaTimeSupplementary_de.java | 305 ----- .../ext/JavaTimeSupplementary_de_AT.java | 112 -- .../ext/JavaTimeSupplementary_el.java | 327 ----- .../ext/JavaTimeSupplementary_en_AU.java | 171 --- .../ext/JavaTimeSupplementary_en_CA.java | 104 -- .../ext/JavaTimeSupplementary_en_GB.java | 130 -- .../ext/JavaTimeSupplementary_en_IE.java | 130 -- .../ext/JavaTimeSupplementary_en_IN.java | 110 -- .../ext/JavaTimeSupplementary_en_MT.java | 121 -- .../ext/JavaTimeSupplementary_en_NZ.java | 110 -- .../ext/JavaTimeSupplementary_en_SG.java | 110 -- .../ext/JavaTimeSupplementary_en_ZA.java | 104 -- .../ext/JavaTimeSupplementary_es.java | 322 ----- .../ext/JavaTimeSupplementary_es_AR.java | 180 --- .../ext/JavaTimeSupplementary_es_BO.java | 182 --- .../ext/JavaTimeSupplementary_es_CL.java | 186 --- .../ext/JavaTimeSupplementary_es_CO.java | 171 --- .../ext/JavaTimeSupplementary_es_CR.java | 182 --- .../ext/JavaTimeSupplementary_es_DO.java | 209 --- .../ext/JavaTimeSupplementary_es_EC.java | 182 --- .../ext/JavaTimeSupplementary_es_GT.java | 190 --- .../ext/JavaTimeSupplementary_es_HN.java | 190 --- .../ext/JavaTimeSupplementary_es_MX.java | 235 ---- .../ext/JavaTimeSupplementary_es_PA.java | 205 --- .../ext/JavaTimeSupplementary_es_PE.java | 207 --- .../ext/JavaTimeSupplementary_es_PR.java | 190 --- .../ext/JavaTimeSupplementary_es_PY.java | 163 --- .../ext/JavaTimeSupplementary_es_US.java | 198 --- .../ext/JavaTimeSupplementary_es_UY.java | 199 --- .../ext/JavaTimeSupplementary_es_VE.java | 180 --- .../ext/JavaTimeSupplementary_et.java | 287 ----- .../ext/JavaTimeSupplementary_fi.java | 333 ----- .../ext/JavaTimeSupplementary_fr.java | 338 ----- .../ext/JavaTimeSupplementary_fr_BE.java | 126 -- .../ext/JavaTimeSupplementary_fr_CA.java | 130 -- .../ext/JavaTimeSupplementary_fr_CH.java | 126 -- .../ext/JavaTimeSupplementary_ga.java | 291 ----- .../ext/JavaTimeSupplementary_he.java | 333 ----- .../ext/JavaTimeSupplementary_hi_IN.java | 344 ----- .../ext/JavaTimeSupplementary_hr.java | 344 ----- .../ext/JavaTimeSupplementary_hu.java | 385 ------ .../ext/JavaTimeSupplementary_id.java | 355 ----- .../ext/JavaTimeSupplementary_is.java | 291 ----- .../ext/JavaTimeSupplementary_it.java | 308 ----- .../ext/JavaTimeSupplementary_it_CH.java | 104 -- .../ext/JavaTimeSupplementary_ja.java | 323 ----- .../ext/JavaTimeSupplementary_ko.java | 311 ----- .../ext/JavaTimeSupplementary_lt.java | 334 ----- .../ext/JavaTimeSupplementary_lv.java | 321 ----- .../ext/JavaTimeSupplementary_mk.java | 291 ----- .../ext/JavaTimeSupplementary_ms.java | 306 ----- .../ext/JavaTimeSupplementary_mt.java | 271 ---- .../ext/JavaTimeSupplementary_nl.java | 374 ------ .../ext/JavaTimeSupplementary_nl_BE.java | 104 -- .../ext/JavaTimeSupplementary_no.java | 398 ------ .../ext/JavaTimeSupplementary_pl.java | 336 ----- .../ext/JavaTimeSupplementary_pt.java | 303 ----- .../ext/JavaTimeSupplementary_pt_PT.java | 171 --- .../ext/JavaTimeSupplementary_ro.java | 298 ----- .../ext/JavaTimeSupplementary_ru.java | 348 ----- .../ext/JavaTimeSupplementary_sk.java | 287 ----- .../ext/JavaTimeSupplementary_sl.java | 293 ----- .../ext/JavaTimeSupplementary_sq.java | 301 ----- .../ext/JavaTimeSupplementary_sr.java | 395 ------ .../ext/JavaTimeSupplementary_sr_BA.java | 89 -- .../ext/JavaTimeSupplementary_sr_Latn.java | 328 ----- .../ext/JavaTimeSupplementary_sv.java | 354 ----- .../ext/JavaTimeSupplementary_th.java | 394 ------ .../ext/JavaTimeSupplementary_tr.java | 364 ------ .../ext/JavaTimeSupplementary_uk.java | 303 ----- .../ext/JavaTimeSupplementary_vi.java | 307 ----- .../ext/JavaTimeSupplementary_zh.java | 353 ----- .../ext/JavaTimeSupplementary_zh_HK.java | 123 -- .../ext/JavaTimeSupplementary_zh_SG.java | 104 -- .../ext/JavaTimeSupplementary_zh_TW.java | 285 ---- .../resources/ext/CalendarData_ar.properties | 40 - .../resources/ext/CalendarData_be.properties | 43 - .../resources/ext/CalendarData_bg.properties | 43 - .../resources/ext/CalendarData_ca.properties | 40 - .../resources/ext/CalendarData_cs.properties | 40 - .../resources/ext/CalendarData_da.properties | 40 - .../resources/ext/CalendarData_de.properties | 40 - .../resources/ext/CalendarData_el.properties | 40 - .../ext/CalendarData_el_CY.properties | 43 - .../ext/CalendarData_en_GB.properties | 40 - .../ext/CalendarData_en_IE.properties | 40 - .../ext/CalendarData_en_MT.properties | 43 - .../resources/ext/CalendarData_es.properties | 40 - .../ext/CalendarData_es_ES.properties | 40 - .../ext/CalendarData_es_US.properties | 43 - .../resources/ext/CalendarData_et.properties | 40 - .../resources/ext/CalendarData_fi.properties | 40 - .../resources/ext/CalendarData_fr.properties | 40 - .../ext/CalendarData_fr_CA.properties | 40 - .../resources/ext/CalendarData_he.properties | 43 - .../resources/ext/CalendarData_hi.properties | 43 - .../resources/ext/CalendarData_hr.properties | 38 - .../resources/ext/CalendarData_hu.properties | 40 - .../ext/CalendarData_id_ID.properties | 43 - .../resources/ext/CalendarData_is.properties | 40 - .../resources/ext/CalendarData_it.properties | 40 - .../resources/ext/CalendarData_ja.properties | 43 - .../resources/ext/CalendarData_ko.properties | 43 - .../resources/ext/CalendarData_lt.properties | 40 - .../resources/ext/CalendarData_lv.properties | 67 - .../resources/ext/CalendarData_mk.properties | 43 - .../ext/CalendarData_ms_MY.properties | 43 - .../resources/ext/CalendarData_mt.properties | 43 - .../ext/CalendarData_mt_MT.properties | 43 - .../resources/ext/CalendarData_nl.properties | 40 - .../resources/ext/CalendarData_no.properties | 40 - .../resources/ext/CalendarData_pl.properties | 40 - .../resources/ext/CalendarData_pt.properties | 40 - .../ext/CalendarData_pt_BR.properties | 40 - .../ext/CalendarData_pt_PT.properties | 40 - .../resources/ext/CalendarData_ro.properties | 39 - .../resources/ext/CalendarData_ru.properties | 40 - .../resources/ext/CalendarData_sk.properties | 46 - .../resources/ext/CalendarData_sl.properties | 39 - .../resources/ext/CalendarData_sq.properties | 43 - .../resources/ext/CalendarData_sr.properties | 43 - .../ext/CalendarData_sr_Latn_BA.properties | 66 - .../ext/CalendarData_sr_Latn_ME.properties | 66 - .../ext/CalendarData_sr_Latn_RS.properties | 66 - .../resources/ext/CalendarData_sv.properties | 40 - .../resources/ext/CalendarData_th.properties | 43 - .../resources/ext/CalendarData_tr.properties | 40 - .../resources/ext/CalendarData_uk.properties | 40 - .../resources/ext/CalendarData_vi.properties | 43 - .../resources/ext/CalendarData_zh.properties | 43 - .../ext/CurrencyNames_ar_AE.properties | 38 - .../ext/CurrencyNames_ar_BH.properties | 38 - .../ext/CurrencyNames_ar_DZ.properties | 38 - .../ext/CurrencyNames_ar_EG.properties | 38 - .../ext/CurrencyNames_ar_IQ.properties | 38 - .../ext/CurrencyNames_ar_JO.properties | 38 - .../ext/CurrencyNames_ar_KW.properties | 38 - .../ext/CurrencyNames_ar_LB.properties | 38 - .../ext/CurrencyNames_ar_LY.properties | 38 - .../ext/CurrencyNames_ar_MA.properties | 38 - .../ext/CurrencyNames_ar_OM.properties | 38 - .../ext/CurrencyNames_ar_QA.properties | 38 - .../ext/CurrencyNames_ar_SA.properties | 38 - .../ext/CurrencyNames_ar_SD.properties | 40 - .../ext/CurrencyNames_ar_SY.properties | 38 - .../ext/CurrencyNames_ar_TN.properties | 38 - .../ext/CurrencyNames_ar_YE.properties | 38 - .../ext/CurrencyNames_be_BY.properties | 39 - .../ext/CurrencyNames_bg_BG.properties | 38 - .../ext/CurrencyNames_ca_ES.properties | 39 - .../ext/CurrencyNames_cs_CZ.properties | 38 - .../ext/CurrencyNames_da_DK.properties | 39 - .../resources/ext/CurrencyNames_de.properties | 285 ---- .../ext/CurrencyNames_de_AT.properties | 39 - .../ext/CurrencyNames_de_CH.properties | 38 - .../ext/CurrencyNames_de_DE.properties | 39 - .../ext/CurrencyNames_de_LU.properties | 39 - .../ext/CurrencyNames_el_CY.properties | 44 - .../ext/CurrencyNames_el_GR.properties | 39 - .../ext/CurrencyNames_en_AU.properties | 38 - .../ext/CurrencyNames_en_CA.properties | 39 - .../ext/CurrencyNames_en_GB.properties | 39 - .../ext/CurrencyNames_en_IE.properties | 39 - .../ext/CurrencyNames_en_IN.properties | 38 - .../ext/CurrencyNames_en_MT.properties | 44 - .../ext/CurrencyNames_en_NZ.properties | 38 - .../ext/CurrencyNames_en_PH.properties | 43 - .../ext/CurrencyNames_en_SG.properties | 43 - .../ext/CurrencyNames_en_ZA.properties | 38 - .../resources/ext/CurrencyNames_es.properties | 278 ---- .../ext/CurrencyNames_es_AR.properties | 39 - .../ext/CurrencyNames_es_BO.properties | 38 - .../ext/CurrencyNames_es_CL.properties | 38 - .../ext/CurrencyNames_es_CO.properties | 38 - .../ext/CurrencyNames_es_CR.properties | 38 - .../ext/CurrencyNames_es_CU.properties | 67 - .../ext/CurrencyNames_es_DO.properties | 38 - .../ext/CurrencyNames_es_EC.properties | 38 - .../ext/CurrencyNames_es_ES.properties | 39 - .../ext/CurrencyNames_es_GT.properties | 38 - .../ext/CurrencyNames_es_HN.properties | 38 - .../ext/CurrencyNames_es_MX.properties | 39 - .../ext/CurrencyNames_es_NI.properties | 38 - .../ext/CurrencyNames_es_PA.properties | 38 - .../ext/CurrencyNames_es_PE.properties | 66 - .../ext/CurrencyNames_es_PR.properties | 38 - .../ext/CurrencyNames_es_PY.properties | 38 - .../ext/CurrencyNames_es_SV.properties | 38 - .../ext/CurrencyNames_es_US.properties | 43 - .../ext/CurrencyNames_es_UY.properties | 38 - .../ext/CurrencyNames_es_VE.properties | 40 - .../ext/CurrencyNames_et_EE.properties | 69 - .../ext/CurrencyNames_fi_FI.properties | 39 - .../resources/ext/CurrencyNames_fr.properties | 277 ---- .../ext/CurrencyNames_fr_BE.properties | 39 - .../ext/CurrencyNames_fr_CA.properties | 38 - .../ext/CurrencyNames_fr_CH.properties | 38 - .../ext/CurrencyNames_fr_FR.properties | 39 - .../ext/CurrencyNames_fr_LU.properties | 39 - .../ext/CurrencyNames_ga_IE.properties | 43 - .../ext/CurrencyNames_he_IL.properties | 38 - .../ext/CurrencyNames_hi_IN.properties | 38 - .../ext/CurrencyNames_hr_HR.properties | 39 - .../ext/CurrencyNames_hu_HU.properties | 38 - .../ext/CurrencyNames_id_ID.properties | 43 - .../ext/CurrencyNames_is_IS.properties | 38 - .../resources/ext/CurrencyNames_it.properties | 270 ---- .../ext/CurrencyNames_it_CH.properties | 38 - .../ext/CurrencyNames_it_IT.properties | 39 - .../resources/ext/CurrencyNames_ja.properties | 285 ---- .../ext/CurrencyNames_ja_JP.properties | 38 - .../resources/ext/CurrencyNames_ko.properties | 276 ---- .../ext/CurrencyNames_ko_KR.properties | 38 - .../ext/CurrencyNames_lt_LT.properties | 39 - .../ext/CurrencyNames_lv_LV.properties | 39 - .../ext/CurrencyNames_mk_MK.properties | 38 - .../ext/CurrencyNames_ms_MY.properties | 43 - .../ext/CurrencyNames_mt_MT.properties | 44 - .../ext/CurrencyNames_nl_BE.properties | 39 - .../ext/CurrencyNames_nl_NL.properties | 39 - .../ext/CurrencyNames_no_NO.properties | 38 - .../ext/CurrencyNames_pl_PL.properties | 38 - .../resources/ext/CurrencyNames_pt.properties | 278 ---- .../ext/CurrencyNames_pt_BR.properties | 39 - .../ext/CurrencyNames_pt_PT.properties | 39 - .../ext/CurrencyNames_ro_RO.properties | 39 - .../ext/CurrencyNames_ru_RU.properties | 38 - .../ext/CurrencyNames_sk_SK.properties | 68 - .../ext/CurrencyNames_sl_SI.properties | 39 - .../ext/CurrencyNames_sq_AL.properties | 38 - .../ext/CurrencyNames_sr_BA.properties | 44 - .../ext/CurrencyNames_sr_CS.properties | 43 - .../ext/CurrencyNames_sr_Latn_BA.properties | 69 - .../ext/CurrencyNames_sr_Latn_ME.properties | 67 - .../ext/CurrencyNames_sr_Latn_RS.properties | 67 - .../ext/CurrencyNames_sr_ME.properties | 43 - .../ext/CurrencyNames_sr_RS.properties | 66 - .../resources/ext/CurrencyNames_sv.properties | 275 ---- .../ext/CurrencyNames_sv_SE.properties | 39 - .../ext/CurrencyNames_th_TH.properties | 38 - .../ext/CurrencyNames_tr_TR.properties | 39 - .../ext/CurrencyNames_uk_UA.properties | 38 - .../ext/CurrencyNames_vi_VN.properties | 38 - .../ext/CurrencyNames_zh_CN.properties | 286 ---- .../resources/ext/CurrencyNames_zh_HK.java | 101 -- .../resources/ext/CurrencyNames_zh_SG.java | 49 - .../ext/CurrencyNames_zh_TW.properties | 279 ---- .../resources/ext/LocaleNames_ar.properties | 62 - .../resources/ext/LocaleNames_be.properties | 46 - .../resources/ext/LocaleNames_bg.properties | 46 - .../resources/ext/LocaleNames_ca.properties | 315 ----- .../resources/ext/LocaleNames_cs.properties | 46 - .../resources/ext/LocaleNames_da.properties | 46 - .../resources/ext/LocaleNames_de.properties | 770 ----------- .../resources/ext/LocaleNames_el.properties | 342 ----- .../ext/LocaleNames_el_CY.properties | 42 - .../ext/LocaleNames_en_MT.properties | 43 - .../ext/LocaleNames_en_PH.properties | 43 - .../ext/LocaleNames_en_SG.properties | 43 - .../resources/ext/LocaleNames_es.properties | 1007 --------------- .../ext/LocaleNames_es_US.properties | 53 - .../resources/ext/LocaleNames_et.properties | 46 - .../resources/ext/LocaleNames_fi.properties | 97 -- .../resources/ext/LocaleNames_fr.properties | 993 -------------- .../resources/ext/LocaleNames_ga.properties | 375 ------ .../resources/ext/LocaleNames_he.properties | 46 - .../resources/ext/LocaleNames_hi.properties | 48 - .../resources/ext/LocaleNames_hr.properties | 46 - .../resources/ext/LocaleNames_hu.properties | 46 - .../resources/ext/LocaleNames_id.properties | 183 --- .../resources/ext/LocaleNames_is.properties | 46 - .../resources/ext/LocaleNames_it.properties | 932 -------------- .../resources/ext/LocaleNames_ja.properties | 1145 ----------------- .../resources/ext/LocaleNames_ko.properties | 1145 ----------------- .../resources/ext/LocaleNames_lt.properties | 46 - .../resources/ext/LocaleNames_lv.properties | 46 - .../resources/ext/LocaleNames_mk.properties | 46 - .../resources/ext/LocaleNames_ms.properties | 89 -- .../resources/ext/LocaleNames_mt.properties | 297 ----- .../resources/ext/LocaleNames_nl.properties | 302 ----- .../resources/ext/LocaleNames_no.properties | 56 - .../ext/LocaleNames_no_NO_NY.properties | 56 - .../resources/ext/LocaleNames_pl.properties | 321 ----- .../resources/ext/LocaleNames_pt.properties | 403 ------ .../ext/LocaleNames_pt_BR.properties | 45 - .../ext/LocaleNames_pt_PT.properties | 77 -- .../resources/ext/LocaleNames_ro.properties | 46 - .../resources/ext/LocaleNames_ru.properties | 382 ------ .../resources/ext/LocaleNames_sk.properties | 46 - .../resources/ext/LocaleNames_sl.properties | 46 - .../resources/ext/LocaleNames_sq.properties | 46 - .../resources/ext/LocaleNames_sr.properties | 339 ----- .../ext/LocaleNames_sr_Latn.properties | 471 ------- .../resources/ext/LocaleNames_sv.properties | 957 -------------- .../resources/ext/LocaleNames_th.properties | 382 ------ .../resources/ext/LocaleNames_tr.properties | 46 - .../resources/ext/LocaleNames_uk.properties | 46 - .../resources/ext/LocaleNames_vi.properties | 163 --- .../resources/ext/LocaleNames_zh.properties | 1145 ----------------- .../ext/LocaleNames_zh_SG.properties | 42 - .../ext/LocaleNames_zh_TW.properties | 1009 --------------- ...aleNames_zh_HK.java => TimeZoneNames.java} | 23 +- .../provider/LocaleDataProvider.java | 3 +- .../provider/NonBaseLocaleDataMetaInfo.java | 80 ++ .../SupplementaryLocaleDataProvider.java | 48 - .../TestWithCompatProvider.java | 87 -- .../text/Format/DateFormat/Bug4823811.java | 791 ------------ .../text/Format/DateFormat/Bug6530336.java | 14 +- .../text/Format/DateFormat/Bug6683975.java | 37 +- .../text/Format/DateFormat/Bug8141243.java | 5 +- .../DateFormat/ContextMonthNamesTest.java | 12 +- .../DateFormat/DateFormatRegression.java | 10 +- .../DateFormat/DateFormatRoundTripTest.java | 4 +- .../Format/DateFormat/DateFormatTest.java | 53 +- .../Format/DateFormat/IntlTestDateFormat.java | 6 +- .../DateFormat/IntlTestDateFormatAPI.java | 8 +- .../IntlTestSimpleDateFormatAPI.java | 8 +- .../Format/DateFormat/LocaleDateFormats.java | 12 +- .../DateFormat/NonGregorianFormatTest.java | 70 +- .../Format/DateFormat/TimeZoneNameTest.java | 70 +- .../MessageFormat/LargeMessageFormat.java | 8 +- .../Format/NumberFormat/BigDecimalFormat.java | 12 +- .../Format/NumberFormat/BigDecimalParse.java | 12 +- .../text/Format/NumberFormat/Bug4838107.java | 10 +- .../Format/NumberFormat/CurrencyFormat.java | 75 +- .../NumberFormat/CurrencySymbols.properties | 157 --- .../MultipleNumberScriptTest.java | 10 +- .../Format/NumberFormat/NumberRegression.java | 42 +- .../text/Format/NumberFormat/NumberTest.java | 18 +- .../NumberFormat/TestPeruCurrencyFormat.java | 51 - .../test/java/time/format/TestUTCParse.java | 20 +- .../format/TestZoneTextPrinterParser.java | 7 +- test/jdk/java/util/Calendar/Bug8007038.java | 7 +- test/jdk/java/util/Calendar/Bug8167273.java | 59 +- .../Calendar/CalendarDisplayNamesTest.java | 12 +- .../util/Calendar/JapanEraNameCompatTest.java | 144 --- .../java/util/Calendar/NarrowNamesTest.java | 8 +- .../Formatter/spi/FormatterWithProvider.java | 10 +- .../util/Formatter/spi/NoGroupingUsed.java | 6 +- .../util/Locale/CompareProviderFormats.java | 115 -- test/jdk/java/util/Locale/CompatWarning.java | 10 +- .../util/Locale/ExpectedAdapterTypes.java | 6 +- .../java/util/Locale/InternationalBAT.java | 54 +- .../java/util/Locale/LocaleEnhanceTest.java | 14 +- .../jdk/java/util/Locale/LocaleProviders.java | 16 +- .../util/Locale/LocaleProvidersFormat.java | 12 +- .../java/util/Locale/LocaleProvidersRun.java | 43 +- test/jdk/java/util/Locale/LocaleTest.java | 38 +- .../Locale/RequiredAvailableLocalesTest.java | 5 +- test/jdk/java/util/Locale/ThaiGov.java | 10 +- .../BreakIteratorProviderTest.java | 23 +- .../CalendarDataProviderTest.java | 6 +- .../CalendarNameProviderTest.java | 6 +- .../util/PluggableLocale/ClasspathTest.java | 6 +- .../PluggableLocale/CollatorProviderTest.java | 37 +- .../CurrencyNameProviderTest.java | 14 +- .../DateFormatProviderTest.java | 38 +- .../DateFormatSymbolsProviderTest.java | 17 +- .../DecimalFormatSymbolsProviderTest.java | 17 +- .../util/PluggableLocale/GenericTest.java | 11 +- .../LocaleNameProviderTest.java | 10 +- .../NumberFormatProviderTest.java | 17 +- .../util/PluggableLocale/PermissionTest.java | 8 +- .../TimeZoneNameProviderTest.java | 12 +- .../Scanner/spi/UseLocaleWithProvider.java | 12 +- test/jdk/java/util/TimeZone/Bug6329116.java | 78 +- test/jdk/java/util/TimeZone/Bug8167143.java | 20 +- test/jdk/java/util/TimeZone/HongKong.java | 14 +- .../TimeZone/TimeZoneData/displaynames.txt | 4 - .../util/TimeZone/TimeZoneRegression.java | 6 +- test/jdk/java/util/TimeZone/TimeZoneTest.java | 8 +- .../util/TimeZone/tools/share/makeZoneData.pl | 11 +- .../sun/text/resources/Format/Bug4395196.java | 14 +- .../sun/text/resources/Format/Bug4651568.java | 8 +- .../sun/text/resources/Format/Bug4762201.java | 13 +- .../sun/text/resources/Format/Bug4807540.java | 8 +- .../sun/text/resources/Format/Bug4810032.java | 8 +- .../sun/text/resources/Format/Bug4994312.java | 44 - .../sun/text/resources/Format/Bug5096553.java | 10 +- .../sun/text/resources/Format/Bug8037343.java | 10 +- .../sun/text/resources/LocaleDataTest.java | 5 +- .../sun/util/locale/provider/Bug8024141.java | 60 - .../sun/util/locale/provider/Bug8038436.java | 103 +- .../sun/util/locale/provider/Bug8152817.java | 17 +- .../sun/util/locale/provider/Bug8163350.java | 45 - .../sun/util/resources/Locale/Bug4429024.java | 6 +- .../sun/util/resources/Locale/Bug4965260.java | 6 +- .../sun/util/resources/Locale/Bug6275682.java | 8 +- .../util/resources/TimeZone/Bug4858517.java | 27 +- .../util/resources/TimeZone/Bug4938846.java | 14 +- .../util/resources/TimeZone/Bug6271396.java | 10 +- .../util/resources/TimeZone/Bug6317929.java | 94 +- .../util/resources/TimeZone/Bug6377794.java | 75 +- .../util/resources/TimeZone/Bug6442006.java | 10 +- .../util/resources/TimeZone/Bug8139107.java | 6 +- .../TimeZone/ChineseTimeZoneNameTest.java | 5 +- .../resources/cldr/NorwegianFallbackTest.java | 13 +- .../resources/cldr/TimeZoneNamesTest.java | 48 +- .../plugins/IncludeLocalesPluginTest.java | 74 +- 565 files changed, 1109 insertions(+), 67330 deletions(-) delete mode 100644 make/modules/java.base/gensrc/GensrcLocaleData.gmk delete mode 100644 src/java.base/share/classes/sun/text/resources/FormatData_en.java delete mode 100644 src/java.base/share/classes/sun/text/resources/FormatData_en_US.java delete mode 100644 src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java rename src/java.base/share/classes/sun/util/locale/provider/{LocaleDataMetaInfo-XLocales.java.template => BaseLocaleDataMetaInfo.java} (67%) delete mode 100644 src/java.base/share/classes/sun/util/resources/CalendarData_en.properties delete mode 100644 src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties delete mode 100644 src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties delete mode 100644 src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java rename src/jdk.localedata/share/classes/sun/text/resources/ext/{FormatData_fr_FR.java => FormatData.java} (61%) delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he_IL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id_ID.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_he.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_id.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java delete mode 100644 src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_he.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_id_ID.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_id_ID.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_id.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties rename src/jdk.localedata/share/classes/sun/util/resources/ext/{LocaleNames_zh_HK.java => TimeZoneNames.java} (64%) create mode 100644 src/jdk.localedata/share/classes/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java delete mode 100644 test/jdk/java/text/Format/CompactNumberFormat/TestWithCompatProvider.java delete mode 100644 test/jdk/java/text/Format/DateFormat/Bug4823811.java delete mode 100644 test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties delete mode 100644 test/jdk/java/text/Format/NumberFormat/TestPeruCurrencyFormat.java delete mode 100644 test/jdk/java/util/Calendar/JapanEraNameCompatTest.java delete mode 100644 test/jdk/java/util/Locale/CompareProviderFormats.java delete mode 100644 test/jdk/sun/text/resources/Format/Bug4994312.java delete mode 100644 test/jdk/sun/util/locale/provider/Bug8024141.java delete mode 100644 test/jdk/sun/util/locale/provider/Bug8163350.java diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java index 442a245f92f..2fb45bec1d3 100644 --- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java +++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java @@ -128,9 +128,10 @@ public class CLDRConverter { static Map pluralRules; static Map dayPeriodRules; - // TZDB Short Names Map + // TZDB maps private static final Map tzdbShortNamesMap = HashMap.newHashMap(512); private static final Map tzdbSubstLetters = HashMap.newHashMap(512); + private static final Map tzdbLinks = HashMap.newHashMap(512); static enum DraftType { UNCONFIRMED, @@ -762,12 +763,32 @@ private static Map extractCurrencyNames(Map map, private static Map extractZoneNames(Map map, String id) { Map names = new TreeMap<>(KeyComparator.INSTANCE); + var availableIds = getAvailableZoneIds(); - getAvailableZoneIds().stream().forEach(tzid -> { + availableIds.forEach(tzid -> { // If the tzid is deprecated, get the data for the replacement id String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid)) .orElse(tzid); + // Follow link, if needed + var tzLink = tzdbLinks.get(tzKey); + if (tzLink == null && tzdbLinks.containsValue(tzKey)) { + // reverse link search + // this is needed as in tzdb, "America/Buenos_Aires" links to + // "America/Argentina/Buenos_Aires", but CLDR contains metaZone + // "Argentina" only for "America/Buenos_Aires" (as of CLDR 44) + // Both tzids should have "Argentina" meta zone names + tzLink = tzdbLinks.entrySet().stream() + .filter(e -> e.getValue().equals(tzKey)) + .map(Map.Entry::getKey) + .findAny() + .orElse(null); + + } Object data = map.get(TIMEZONE_ID_PREFIX + tzKey); + if (data == null && tzLink != null) { + // data for tzLink + data = map.get(TIMEZONE_ID_PREFIX + tzLink); + } if (data instanceof String[] tznames) { // Hack for UTC. UTC is an alias to Etc/UTC in CLDR @@ -777,20 +798,36 @@ private static Map extractZoneNames(Map map, Str names.put("UTC", META_ETCUTC_ZONE_NAME); } else { // TZDB short names + tznames = Arrays.copyOf(tznames, tznames.length); fillTZDBShortNames(tzid, tznames); names.put(tzid, tznames); } } else { String meta = handlerMetaZones.get(tzKey); + if (meta == null && tzLink != null) { + // Check for tzLink + meta = handlerMetaZones.get(tzLink); + } if (meta != null) { String metaKey = METAZONE_ID_PREFIX + meta; data = map.get(metaKey); if (data instanceof String[] tznames) { // TZDB short names + tznames = Arrays.copyOf((String[])names.getOrDefault(metaKey, tznames), 6); fillTZDBShortNames(tzid, tznames); // Keep the metazone prefix here. - names.put(metaKey, data); + names.putIfAbsent(metaKey, tznames); names.put(tzid, meta); + if (tzLink != null && availableIds.contains(tzLink)) { + names.put(tzLink, meta); + } + } + } else if (id.equals("root")) { + // supply TZDB short names if available + if (tzdbShortNamesMap.containsKey(tzid)) { + var tznames = new String[6]; + fillTZDBShortNames(tzid, tznames); + names.put(tzid, tznames); } } } @@ -1263,7 +1300,7 @@ private static Map coverageLevelsMap() throws Exception { } /* - * Generates two maps from TZ database files, where they have usual abbreviation + * Generates three maps from TZ database files, where they have usual abbreviation * of the time zone names as "FORMAT". * * `tzdbShortNamesMap` maps the time zone id, such as "America/Los_Angeles" to @@ -1273,53 +1310,46 @@ private static Map coverageLevelsMap() throws Exception { * * "America/Los_Angeles" -> "P%sTUS" * - * The other map, `tzdbSubstLetters` maps the Rule to its substitution letters. + * The map, `tzdbSubstLetters` maps the Rule to its substitution letters. * The key of the map is the Rule name, appended with "std" or "dst" * depending on the savings, e.g., * * "USstd" -> "S" * "USdst" -> "D" * - * These two mappings resolve the short names for time zones in each type, + * These mappings resolve the short names for time zones in each type, * such as: * * Standard short name for "America/Los_Angeles" -> "PST" * DST short name for "America/Los_Angeles" -> "PDT" * Generic short name for "America/Los_Angeles" -> "PT" + * + * The map, `tzdbLinks` retains `Link`s of time zones. For example, + * the mapping: + * + * "US/Hawaii" -> "Pacific/Honolulu" + * + * resolves names for "US/Hawaii" correctly with "Pacific/Honolulu" + * names. */ private static void generateTZDBShortNamesMap() throws IOException { Files.walk(Path.of(tzDataDir), 1, FileVisitOption.FOLLOW_LINKS) - .filter(p -> p.toFile().isFile() && !p.endsWith("jdk11_backward")) + .filter(p -> p.toFile().isFile()) .forEach(p -> { try { String zone = null; String rule = null; String format = null; boolean inVanguard = false; - boolean inRearguard = false; for (var line : Files.readAllLines(p)) { - // Interpret the line in rearguard mode so that STD/DST - // correctly handles negative DST cases, such as "GMT/IST" - // vs. "IST/GMT" case for Europe/Dublin - if (inVanguard) { - if (line.startsWith("# Rearguard")) { - inVanguard = false; - inRearguard = true; - } - continue; - } else if (line.startsWith("# Vanguard")) { + // check for Vanguard lines + if (line.startsWith("# Vanguard section")) { inVanguard = true; continue; } - if (inRearguard) { - if (line.startsWith("# End of rearguard")) { - inRearguard = false; - continue; - } else { - if (line.startsWith("#\t")) { - line = line.substring(1); // omit # - } - } + if (inVanguard && line.startsWith("# Rearguard section")) { + inVanguard = false; + continue; } if (line.isBlank() || line.matches("^[ \t]*#.*")) { // ignore blank/comment lines @@ -1336,7 +1366,7 @@ private static void generateTZDBShortNamesMap() throws IOException { var zl = line.split("[ \t]+", -1); zone = zl[1]; rule = zl[3]; - format = zl[4]; + format = flipIfNeeded(inVanguard, zl[4]); } else { if (zone != null) { if (line.startsWith("Rule") || @@ -1348,7 +1378,7 @@ private static void generateTZDBShortNamesMap() throws IOException { } else { var s = line.split("[ \t]+", -1); rule = s[2]; - format = s[3]; + format = flipIfNeeded(inVanguard, s[3]); } } } @@ -1359,6 +1389,17 @@ private static void generateTZDBShortNamesMap() throws IOException { tzdbSubstLetters.put(rl[1] + NBSP + (rl[8].equals("0") ? STD : DST), rl[9].replace(NO_SUBST, "")); } + + // Link line + if (line.startsWith("Link")) { + var ll = line.split("[ \t]+", -1); + tzdbLinks.put(ll[2], ll[1]); + } + } + + // Last entry + if (zone != null) { + tzdbShortNamesMap.put(zone, format + NBSP + rule); } } catch (IOException ioe) { throw new UncheckedIOException(ioe); @@ -1366,11 +1407,24 @@ private static void generateTZDBShortNamesMap() throws IOException { }); } + // Reverse the std/dst FORMAT in Vanguard so that it + // correctly handles negative DST cases, such as "GMT/IST" + // vs. "IST/GMT" case for Europe/Dublin + private static String flipIfNeeded(boolean inVanguard, String format) { + if (inVanguard) { + var stddst = format.split("/"); + if (stddst.length == 2) { + return stddst[1] + "/" + stddst[0]; + } + } + return format; + } + /* * Fill the TZDB short names if there is no name provided by the CLDR */ private static void fillTZDBShortNames(String tzid, String[] names) { - var val = tzdbShortNamesMap.get(tzid); + var val = tzdbShortNamesMap.get(tzdbLinks.getOrDefault(tzid, tzid)); if (val != null) { var format = val.split(NBSP)[0]; var rule = val.split(NBSP)[1]; diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk index acbd94fc275..6eae7edd078 100644 --- a/make/modules/java.base/Gensrc.gmk +++ b/make/modules/java.base/Gensrc.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2024, 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,7 +25,6 @@ include GensrcCommon.gmk -include gensrc/GensrcLocaleData.gmk include gensrc/GensrcCharacterData.gmk include gensrc/GensrcMisc.gmk include gensrc/GensrcCharsetMapping.gmk @@ -37,10 +36,6 @@ include gensrc/GensrcModuleLoaderMap.gmk include gensrc/GensrcScopedMemoryAccess.gmk include gensrc/GensrcRegex.gmk -# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets -# to include. -TARGETS += $(GENSRC_BASELOCALEDATA) - ################################################################################ CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common diff --git a/make/modules/java.base/gensrc/GensrcLocaleData.gmk b/make/modules/java.base/gensrc/GensrcLocaleData.gmk deleted file mode 100644 index a99b8c3e5db..00000000000 --- a/make/modules/java.base/gensrc/GensrcLocaleData.gmk +++ /dev/null @@ -1,153 +0,0 @@ -# -# Copyright (c) 2011, 2022, 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. -# - -# Scan for all locale resources and extract for which locales there exists -# resources. Then put this meta information about existing (supported?) locales -# into LocaleDataMetaInfo.java - -# First go look for all locale files -LOCALE_FILES := $(call FindFiles, \ - $(MODULE_SRC)/share/classes/sun/text/resources \ - $(MODULE_SRC)/share/classes/sun/util/resources, \ - FormatData_*.java FormatData_*.properties \ - CollationData_*.java CollationData_*.properties \ - TimeZoneNames_*.java TimeZoneNames_*.properties \ - LocaleNames_*.java LocaleNames_*.properties \ - CurrencyNames_*.java CurrencyNames_*.properties \ - CalendarData_*.java CalendarData_*.properties \ - BreakIteratorInfo_*.java BreakIteratorRules_*.java) - -# Then translate the locale files into for example: FormatData_sv -LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES))))) - -# Include the list of resources found during the previous compile. --include $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.locale_resources - -MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES)) -NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES)) - -ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES)) - # There is a difference in the number of supported resources. Trigger a regeneration. - ifeq ($(MODULE), java.base) - $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \ - $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java) - endif - ifeq ($(MODULE), jdk.localedata) - $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java) - endif -endif - -# The base locales -BASE_LOCALES := en en-US - -# Locales that don't have any resource files should be included here. -ALL_NON_BASE_LOCALES := ja-JP-JP th-TH-TH - -SED_BASEARGS := -e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g' -SED_NONBASEARGS := $(SED_BASEARGS) - -# Fill in the languages and package names -SED_BASEARGS += -e 's/$(HASH)Lang$(HASH)/Base/' \ - -e 's/$(HASH)Package$(HASH)/sun.util.locale.provider/' -SED_NONBASEARGS += -e 's/$(HASH)Lang$(HASH)/NonBase/' \ - -e 's/$(HASH)Package$(HASH)/sun.util.resources.provider/' - -# This macro creates a sed expression that substitutes for example: -# #FormatData_Locales# with: en-US locales. -define CaptureLocale - $1_LOCALES := $$(subst _,-,$$(filter-out $1, $$(subst $1_,,$$(filter $1_%, $(LOCALE_RESOURCES))))) - $1_BASE_LOCALES := $$(filter $(BASE_LOCALES), $$($1_LOCALES)) - $1_NON_BASE_LOCALES := $$(filter-out $(BASE_LOCALES), $$($1_LOCALES)) - - # Special handling for Chinese locales to include implicit scripts - $1_NON_BASE_LOCALES := $$(subst zh-CN,zh-CN$$(SPACE)zh-Hans-CN, $$($1_NON_BASE_LOCALES)) - $1_NON_BASE_LOCALES := $$(subst zh-SG,zh-SG$$(SPACE)zh-Hans-SG, $$($1_NON_BASE_LOCALES)) - $1_NON_BASE_LOCALES := $$(subst zh-HK,zh-HK$$(SPACE)zh-Hant-HK, $$($1_NON_BASE_LOCALES)) - $1_NON_BASE_LOCALES := $$(subst zh-MO,zh-MO$$(SPACE)zh-Hant-MO, $$($1_NON_BASE_LOCALES)) - $1_NON_BASE_LOCALES := $$(subst zh-TW,zh-TW$$(SPACE)zh-Hant-TW, $$($1_NON_BASE_LOCALES)) - -# Adding implicit locales nb nn-NO and nb-NO - $1_NON_BASE_LOCALES += nb nn-NO nb-NO - $1_NON_BASE_LOCALES := $$(sort $$($1_NON_BASE_LOCALES)) - - ALL_BASE_LOCALES += $$($1_BASE_LOCALES) - ALL_NON_BASE_LOCALES += $$($1_NON_BASE_LOCALES) - - # Don't sed in a space if there are no locales. - SED_BASEARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_BASE_LOCALES),$$(SPACE)$$($1_BASE_LOCALES),)/g' - SED_NONBASEARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_NON_BASE_LOCALES),$$(SPACE)$$($1_NON_BASE_LOCALES),)/g' -endef - -#sun.text.resources.FormatData -$(eval $(call CaptureLocale,FormatData)) - -#sun.text.resources.CollationData -$(eval $(call CaptureLocale,CollationData)) - -#sun.text.resources.BreakIteratorInfo -$(eval $(call CaptureLocale,BreakIteratorInfo)) - -#sun.text.resources.BreakIteratorRules -$(eval $(call CaptureLocale,BreakIteratorRules)) - -#sun.util.resources.TimeZoneNames -$(eval $(call CaptureLocale,TimeZoneNames)) - -#sun.util.resources.LocaleNames -$(eval $(call CaptureLocale,LocaleNames)) - -#sun.util.resources.CurrencyNames -$(eval $(call CaptureLocale,CurrencyNames)) - -#sun.util.resources.CalendarData -$(eval $(call CaptureLocale,CalendarData)) - -SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_LOCALES))/g' -SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g' - -$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \ - $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template - $(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources) - $(call MakeTargetDir) - $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ - > $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_the.locale_resources - $(SED) $(SED_BASEARGS) $< > $@ - -$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \ - $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template - $(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources) - $(call MakeTargetDir) - $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ - > $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/_the.locale_resources - $(SED) $(SED_NONBASEARGS) $< > $@ - -GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java -GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java - -################################################################################ - -# This file is included twice, by java.base and jdk.localedata. The includer must -# add either GENSRC_BASELOCALEDATA or GENSRC_LOCALEDATA to TARGETS. diff --git a/make/modules/jdk.localedata/Gensrc.gmk b/make/modules/jdk.localedata/Gensrc.gmk index df6400b16b1..4d9f15a20c9 100644 --- a/make/modules/jdk.localedata/Gensrc.gmk +++ b/make/modules/jdk.localedata/Gensrc.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2024, 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,12 +25,6 @@ include GensrcCommon.gmk -include modules/java.base/gensrc/GensrcLocaleData.gmk - -# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets -# to include. -TARGETS += $(GENSRC_LOCALEDATA) - ################################################################################ CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common @@ -53,16 +47,3 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \ $(TOUCH) $@ TARGETS += $(CLDR_GEN_DONE) - -################################################################################ - -include GensrcProperties.gmk - -$(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \ - SRC_DIRS := $(MODULE_SRC)/share/classes/sun/util/resources, \ - CLASS := sun.util.resources.LocaleNamesBundle, \ - KEEP_ALL_TRANSLATIONS := true, \ -)) - -# Skip generating zh_HK from zh_TW for this module. -TARGETS += $(filter-out %_zh_HK.java, $(COMPILE_PROPERTIES)) diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java index 0385c4a1674..ed380841faa 100644 --- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java +++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java @@ -4694,10 +4694,14 @@ public int parse(DateTimeParseContext context, CharSequence text, int position) if (length >= position + 3 && context.charEquals(text.charAt(position + 2), 'C')) { // There are localized zone texts that start with "UTC", e.g. // "UTC\u221210:00" (MINUS SIGN instead of HYPHEN-MINUS) in French. - // Exclude those cases. - if (length == position + 3 || - context.charEquals(text.charAt(position + 3), '+') || - context.charEquals(text.charAt(position + 3), '-')) { + // Treat them as normal '-' with the offset parser (using text parser would + // be problematic due to std/dst distinction) + if (length > position + 3 && context.charEquals(text.charAt(position + 3), '\u2212')) { + var tmpText = "%s-%s".formatted( + text.subSequence(0, position + 3), + text.subSequence(position + 4, text.length())); + return parseOffsetBased(context, tmpText, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO); + } else { return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO); } } else { diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java index 0dde196a784..bcdf32d6f8b 100644 --- a/src/java.base/share/classes/java/util/Locale.java +++ b/src/java.base/share/classes/java/util/Locale.java @@ -55,7 +55,6 @@ import jdk.internal.util.StaticProperty; import jdk.internal.vm.annotation.Stable; -import sun.security.action.GetPropertyAction; import sun.util.locale.BaseLocale; import sun.util.locale.InternalLocaleBuilder; import sun.util.locale.LanguageTag; diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java index 5d443963bef..996ef705269 100644 --- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java +++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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 @@ -75,7 +75,7 @@ * * which is the fully qualified class name of the class implementing * {@code DateFormatProvider}. - *

    Invocation of Locale Sensitive Services

    + *

    Invocation of Locale Sensitive Services

    *

    * Locale sensitive factory methods and methods for name retrieval in the * {@code java.text} and {@code java.util} packages invoke @@ -120,33 +120,27 @@ * property on the java launcher command line. Setting it at runtime with * {@link System#setProperty(String, String)} is discouraged and it may not affect * the order. - * JDK Reference Implementation provides the following four + * JDK Reference Implementation provides the following three * locale providers: *

      *
    • "CLDR": A provider based on Unicode Consortium's * CLDR Project. - *
    • "COMPAT": represents the locale sensitive services that is compatible - * with the prior JDK releases up to JDK 8 (same as JDK 8's "JRE"). This - * provider is deprecated and will be removed in the future release of JDK. *
    • "SPI": represents the locale sensitive services implementing the subclasses of * this {@code LocaleServiceProvider} class. *
    • "HOST": A provider that reflects the user's custom settings in the * underlying operating system. This provider may not be available, depending * on the JDK Reference Implementation. - *
    • "JRE": represents a synonym to "COMPAT". This name - * is deprecated and will be removed in the future release of JDK. *
    *

    * For example, if the following is specified in the property: * 

    - * java.locale.providers=SPI,CLDR,COMPAT
+ * java.locale.providers=SPI,CLDR
  *
    * the locale sensitive services in the SPI providers are looked up first. If the - * desired locale sensitive service is not available, then the runtime looks for CLDR, - * COMPAT in that order. + * desired locale sensitive service is not available, then the runtime looks for CLDR. *

    - * The default order for looking up the preferred locale providers is "CLDR,COMPAT", - * so specifying "CLDR,COMPAT" is identical to the default behavior. Applications which + * The default value for looking up the preferred locale providers is "CLDR", + * so specifying "CLDR" is identical to the default behavior. Applications which * require implementations of the locale sensitive services must explicitly specify * "SPI" in order for the Java runtime to load them from the classpath. * diff --git a/src/java.base/share/classes/sun/text/resources/FormatData_en.java b/src/java.base/share/classes/sun/text/resources/FormatData_en.java deleted file mode 100644 index 117cfab0a30..00000000000 --- a/src/java.base/share/classes/sun/text/resources/FormatData_en.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 1997, 2014, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - // This locale inherits almost everything from the root default locale. However, - // even if it inherited everything, we would still need this locale to exist - // to make the resource-bundle lookup mechanism work right. In that case, we'd - // define this method as follows: - // return new Object[][] { }; - return new Object[][] { - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;-\u00A4#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java b/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java deleted file mode 100644 index cf25a1c26fc..00000000000 --- a/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_US extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00a4#,##0.00;(\u00a4#,##0.00)", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java deleted file mode 100644 index bd4c6cedbac..00000000000 --- a/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java +++ /dev/null @@ -1,274 +0,0 @@ -/* - * 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 - * 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; - -import sun.util.resources.OpenListResourceBundle; - -public class JavaTimeSupplementary_en extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1st quarter", - "2nd quarter", - "3rd quarter", - "4th quarter", - }; - - final String[] sharedDatePatterns = { - "EEEE, MMMM d, y GGGG", - "MMMM d, y GGGG", - "MMM d, y GGGG", - "M/d/y G", - }; - - final String[] sharedDayNames = { - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "MMM d, y G", - "M/d/y GGGGG", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Buddhist Calendar" }, - { "calendarname.gregorian", - "Gregorian Calendar" }, - { "calendarname.gregory", - "Gregorian Calendar" }, - { "calendarname.islamic", - "Islamic Calendar" }, - { "calendarname.islamic-civil", - "Islamic Calendar (tabular, civil epoch)" }, - { "calendarname.islamic-umalqura", - "Islamic Calendar (Umm al-Qura)" }, - { "calendarname.japanese", - "Japanese Calendar" }, - { "calendarname.roc", - "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" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "Before Christ", - "Anno Domini", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - new String[] { - "Sun", - "Mon", - "Tue", - "Wed", - "Thu", - "Fri", - "Sat", - } - }, - { "roc.DayNames", - sharedDayNames }, - { "roc.Eras", - sharedEras }, - { "roc.MonthNames", - new String[] { - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java index f97888a6977..3373d3e7a96 100644 --- a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java +++ b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2024, 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,6 +28,8 @@ import static sun.util.locale.provider.LocaleProviderAdapter.Type; import java.text.MessageFormat; +import java.time.Duration; +import java.time.Instant; import java.util.Arrays; import java.util.Locale; import java.util.Objects; @@ -154,10 +156,15 @@ private void deriveFallbackName(String[] names, int index, Locale locale, boolea var cands = ((CLDRLocaleProviderAdapter)LocaleProviderAdapter.forType(Type.CLDR)) .getCandidateLocales("", locale); for (int i = 1; i < cands.size() ; i++) { - String[] parentNames = super.getDisplayNameArray(id, cands.get(i)); + var loc = cands.get(i); + String[] parentNames = super.getDisplayNameArray(id, loc); if (parentNames != null && !parentNames[index].isEmpty()) { - names[index] = parentNames[index]; - return; + // Long names in ROOT locale should not be copied, as they can be generated + // with the fallback mechanisms below + if (!loc.equals(Locale.ROOT) || index % 2 == 0) { + names[index] = parentNames[index]; + return; + } } } } @@ -167,19 +174,6 @@ private void deriveFallbackName(String[] names, int index, Locale locale, boolea return; } - // Check if COMPAT can substitute the name - if (!exists(names, index) && - LocaleProviderAdapter.getAdapterPreference().contains(Type.JRE)) { - String[] compatNames = (String[])LocaleProviderAdapter.forJRE() - .getLocaleResources(mapChineseLocale(locale)) - .getTimeZoneNames(id); - if (compatNames != null) { - // Assumes COMPAT has no empty slots - names[index] = compatNames[index]; - return; - } - } - // Region Fallback if (regionFormatFallback(names, index, locale)) { return; @@ -270,8 +264,18 @@ private boolean regionFormatFallback(String[] names, int index, Locale l) { } private String toGMTFormat(String id, boolean daylight, Locale l) { - TimeZone tz = ZoneInfoFile.getZoneInfo(id); - int offset = (tz.getRawOffset() + (daylight ? tz.getDSTSavings() : 0)) / 60000; + var zr = ZoneInfoFile.getZoneInfo(id).toZoneId().getRules(); + var now = Instant.now(); + var saving = zr.getTransitions().reversed().stream() + .dropWhile(zot -> zot.getInstant().isAfter(now)) + .filter(zot -> zr.isDaylightSavings(zot.getInstant())) + .findFirst() + .map(zot -> zr.getDaylightSavings(zot.getInstant())) + .map(Duration::getSeconds) + .map(Long::intValue) + .orElse(0); + int offset = (zr.getStandardOffset(now).getTotalSeconds() + + (daylight ? saving : 0)) / 60; LocaleResources lr = LocaleProviderAdapter.forType(Type.CLDR).getLocaleResources(l); ResourceBundle fd = lr.getJavaTimeFormatData(); @@ -294,33 +298,4 @@ private String toGMTFormat(String id, boolean daylight, Locale l) { String.format(l, hourFormat, offset / 60, offset % 60)); } } - - // Mapping CLDR's Simplified/Traditional Chinese resources - // to COMPAT's zh-CN/TW - private Locale mapChineseLocale(Locale locale) { - if (locale.getLanguage() == "zh") { - switch (locale.getScript()) { - case "Hans": - return Locale.CHINA; - case "Hant": - return Locale.TAIWAN; - case "": - // no script, guess from country code. - switch (locale.getCountry()) { - case "": - case "CN": - case "SG": - return Locale.CHINA; - case "HK": - case "MO": - case "TW": - return Locale.TAIWAN; - } - break; - } - } - - // no need to map - return locale; - } } diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template b/src/java.base/share/classes/sun/util/locale/provider/BaseLocaleDataMetaInfo.java similarity index 67% rename from src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template rename to src/java.base/share/classes/sun/util/locale/provider/BaseLocaleDataMetaInfo.java index 7509b602b6c..f6243b6b860 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template +++ b/src/java.base/share/classes/sun/util/locale/provider/BaseLocaleDataMetaInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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,58 +23,49 @@ * questions. */ -#warn This file is preprocessed before being compiled - /* * This class contains a map which records the locale list string for * each resource in sun.util.resources & sun.text.resources. * It is used to avoid loading non-existent localized resources so that - * jar files won't be opened unnecessary to look up them. + * jar files won't be opened unnecessarily to look up them. */ -package #Package#; +package sun.util.locale.provider; import java.util.HashMap; import java.util.Map; -import sun.util.locale.provider.LocaleDataMetaInfo; import static sun.util.locale.provider.LocaleProviderAdapter.Type; -public class #Lang#LocaleDataMetaInfo implements LocaleDataMetaInfo { +public class BaseLocaleDataMetaInfo implements LocaleDataMetaInfo { - private static final Map resourceNameToLocales = new HashMap<>(9); + private static final Map resourceNameToLocales = HashMap.newHashMap(9); static { - /* During JDK build time, #XXX_YYY# will be replaced by a string contain all the locales - supported by the resource. - - Don't remove the space character between " and #. That is put there purposely so that - look up locale string such as "en" could be based on if it contains " en ". - */ resourceNameToLocales.put("FormatData", - " #FormatData_Locales# "); + " en en-US "); resourceNameToLocales.put("CollationData", - " #CollationData_Locales# "); + " "); resourceNameToLocales.put("BreakIteratorInfo", - " #BreakIteratorInfo_Locales# "); + " "); resourceNameToLocales.put("BreakIteratorRules", - " #BreakIteratorRules_Locales# "); + " "); resourceNameToLocales.put("TimeZoneNames", - " #TimeZoneNames_Locales# "); + " en "); resourceNameToLocales.put("LocaleNames", - " #LocaleNames_Locales# "); + " en "); resourceNameToLocales.put("CurrencyNames", - " #CurrencyNames_Locales# "); + " en-US "); resourceNameToLocales.put("CalendarData", - " #CalendarData_Locales# "); + " en "); resourceNameToLocales.put("AvailableLocales", - " #AvailableLocales_Locales# "); + " en en-US "); } /* @@ -91,7 +82,7 @@ public static String getSupportedLocaleString(String resourceName) { @Override public Type getType() { return Type.JRE; -} + } @Override public String availableLanguageTags(String category) { diff --git a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java index 19d32f16793..211dff643ec 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java +++ b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -84,29 +84,17 @@ public String getDisplayNameImpl(String calendarType, int field, int value, int Era[] jeras = CalendarSystem.forName("japanese").getEras(); if (value <= jeras.length) { // Localized era name could not be retrieved from this provider. - // This can occur either for Reiwa or SupEra. - // - // If it's CLDR provider, try COMPAT first, which is guaranteed to have - // the name for Reiwa. - if (type == LocaleProviderAdapter.Type.CLDR) { - lr = LocaleProviderAdapter.forJRE().getLocaleResources(locale); - key = getResourceKeyFor(LocaleProviderAdapter.Type.JRE, - calendarType, field, style, javatime); - strings = - javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key); - } - if (strings == null || value >= strings.length) { - // Get the default name for SupEra - Era supEra = jeras[value - 1]; // 0-based index - if (javatime) { - return getBaseStyle(style) == NARROW_FORMAT ? - supEra.getAbbreviation() : - supEra.getName(); - } else { - return (style & LONG) != 0 ? - supEra.getName() : - supEra.getAbbreviation(); - } + // This can occur for SupEra. + // Get the default name for SupEra + Era supEra = jeras[value - 1]; // 0-based index + if (javatime) { + return getBaseStyle(style) == NARROW_FORMAT ? + supEra.getAbbreviation() : + supEra.getName(); + } else { + return (style & LONG) != 0 ? + supEra.getName() : + supEra.getAbbreviation(); } } else { return null; @@ -314,7 +302,7 @@ private static String getResourceKeyFor(LocaleProviderAdapter.Type adapterType, // JRE and CLDR use different resource key conventions // due to historical reasons. (JRE DateFormatSymbols.getEras returns // abbreviations while other getShort*() return abbreviations.) - if (adapterType == LocaleProviderAdapter.Type.JRE) { + if (adapterType == LocaleProviderAdapter.Type.FALLBACK) { if (javatime) { if (baseStyle == LONG) { key.append("long."); diff --git a/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java index 30d47e3197d..8ee95c567aa 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java +++ b/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,29 +25,30 @@ package sun.util.locale.provider; -import java.util.Collections; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.text.spi.BreakIteratorProvider; +import java.util.Arrays; +import java.util.HashSet; import java.util.Locale; import java.util.Set; +import java.util.stream.Stream; -/** - * FallbackProviderAdapter implementation. +/* + * FallbackProviderAdapter implementation. Fallback provider serves the + * following purposes: * - * @author Naoto Sato + * - Locale data for ROOT, in case CLDR provider is absent. + * - Locale data for BreakIterator/Collator resources for all locales. + * - "Gan-nen" support for SimpleDateFormat (provides "FirstYear" for + * Japanese locales). */ public class FallbackLocaleProviderAdapter extends JRELocaleProviderAdapter { + // Required locales/langtags + private static final Locale[] AVAILABLE_LOCS = {Locale.US, Locale.ENGLISH, Locale.ROOT}; + private static final Set AVAILABLE_LANGTAGS = Set.of("en-US", "en", "und"); - /** - * Supported language tag set. - */ - private static final Set rootTagSet = - Collections.singleton(Locale.ROOT.toLanguageTag()); - - /** - * Fallback provider only provides the ROOT locale data. - */ - @SuppressWarnings("this-escape") - private final LocaleResources rootLocaleResources = - new LocaleResources(this, Locale.ROOT); + private volatile BreakIteratorProvider breakIteratorProvider; /** * Returns the type of this LocaleProviderAdapter @@ -58,17 +59,45 @@ public LocaleProviderAdapter.Type getAdapterType() { } @Override - public LocaleResources getLocaleResources(Locale locale) { - return rootLocaleResources; + public Locale[] getAvailableLocales() { + return Stream.concat(Arrays.stream(super.getAvailableLocales()), Stream.of(AVAILABLE_LOCS)) + .distinct().toArray(Locale[]::new); } @Override protected Set createLanguageTagSet(String category) { - return rootTagSet; + var s = new HashSet<>(super.createLanguageTagSet(category)); + s.addAll(AVAILABLE_LANGTAGS); + return s; } @Override - public boolean isSupportedProviderLocale(Locale locale, Setlangtags) { - return Locale.ROOT.equals(locale); + public boolean isSupportedProviderLocale(Locale locale, Set langtags) { + if (Locale.ROOT.equals(locale)) { + return true; + } + + locale = locale.stripExtensions(); + return langtags.contains(locale.toLanguageTag()); + } + + @Override + // In order to correctly report supported locales + public BreakIteratorProvider getBreakIteratorProvider() { + if (breakIteratorProvider == null) { + @SuppressWarnings("removal") + BreakIteratorProvider provider = AccessController.doPrivileged( + (PrivilegedAction) () -> + new BreakIteratorProviderImpl( + getAdapterType(), + getLanguageTagSet("BreakIteratorRules"))); + + synchronized (this) { + if (breakIteratorProvider == null) { + breakIteratorProvider = provider; + } + } + } + return breakIteratorProvider; } } diff --git a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java index fc5a92ebf99..1dd927b8729 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java +++ b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -470,7 +470,7 @@ private static String createSupportedLocaleString(String category) { if (ldmi.getType() == LocaleProviderAdapter.Type.JRE) { String t = ldmi.availableLanguageTags(category); if (t != null) { - if (tags.length() > 0) { + if (!tags.isEmpty()) { tags.append(' '); } tags.append(t); diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java index 01654672abf..a027191e45f 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java +++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -126,8 +126,7 @@ public String getTextResourcesPackage() { for (String type : types) { type = type.trim().toUpperCase(Locale.ROOT); if (type.equals("COMPAT") || type.equals("JRE")) { - compatWarningMessage = "COMPAT locale provider will be removed in a future release"; - type = "JRE"; + compatWarningMessage = "COMPAT locale provider has been removed"; } try { Type aType = Type.valueOf(type.trim().toUpperCase(Locale.ROOT)); @@ -141,17 +140,14 @@ public String getTextResourcesPackage() { } } - if (!typeList.isEmpty()) { - // bona fide preference exists - if (!(typeList.contains(Type.CLDR) || typeList.contains(Type.JRE))) { - // Append FALLBACK as the last resort when no ResourceBundleBasedAdapter is available. - typeList.add(Type.FALLBACK); - } - } else { + if (typeList.isEmpty()) { // Default preference list. typeList.add(Type.CLDR); - typeList.add(Type.JRE); } + + // always append FALLBACK + typeList.add(Type.FALLBACK); + adapterPreference = Collections.unmodifiableList(typeList); // Emit logs, if any, after 'adapterPreference' is initialized which is needed @@ -307,14 +303,13 @@ public boolean isSupportedProviderLocale(Locale locale, Set langtags) { public static Locale[] toLocaleArray(Set tags) { return tags.stream() - .map(t -> { - return switch (t) { - case "ja-JP-JP" -> JRELocaleConstants.JA_JP_JP; - case "no-NO-NY" -> JRELocaleConstants.NO_NO_NY; - case "th-TH-TH" -> JRELocaleConstants.TH_TH_TH; - default -> Locale.forLanguageTag(t); - }; + .map(t -> switch (t) { + case "ja-JP-JP" -> JRELocaleConstants.JA_JP_JP; + case "no-NO-NY" -> JRELocaleConstants.NO_NO_NY; + case "th-TH-TH" -> JRELocaleConstants.TH_TH_TH; + default -> Locale.forLanguageTag(t); }) + .distinct() .toArray(Locale[]::new); } diff --git a/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties b/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties deleted file mode 100644 index 009773ad3df..00000000000 --- a/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -USD=$ diff --git a/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties b/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties deleted file mode 100644 index ef2759e5859..00000000000 --- a/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java deleted file mode 100644 index cc2199b8e21..00000000000 --- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 1997, 2012, 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. - */ - - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.util.resources; - -import sun.util.resources.TimeZoneNamesBundle; - -public final class TimeZoneNames_en extends TimeZoneNamesBundle { - - // This bundle is empty because the root bundle's content - // is adequate for this locale. - // The bundle is necessary to prevent the resource - // bundle lookup from falling back to the default - // locale. - - protected final Object[][] getContents() { - return new Object[][] { - }; - } -} diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java index bc1f4ac0bab..4edc90a97b7 100644 --- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java +++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 @@ -37,6 +37,7 @@ import java.util.Set; import java.util.function.IntUnaryOperator; import java.util.function.Predicate; +import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -98,8 +99,6 @@ public final class IncludeLocalesPlugin extends AbstractPlugin implements Resour private Predicate predicate; private String userParam; private List priorityList; - private List available; - private List filtered; private static final ResourceBundleBasedAdapter CLDR_ADAPTER = (ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(Type.CLDR); @@ -130,10 +129,10 @@ public final class IncludeLocalesPlugin extends AbstractPlugin implements Resour Arrays.stream(CLDR_PARENT_LOCALES.getOrDefault( Locale.forLanguageTag(child), new String[0])) .filter(grandchild -> !grandchild.isEmpty()), - List.of(child).stream())) + Stream.of(child))) .distinct() .forEach(children::add); - return new AbstractMap.SimpleEntry>(parent, children); + return new AbstractMap.SimpleEntry<>(parent, children); }) ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (l1, l2) -> Stream.concat(l1.stream(), l2.stream()).distinct().toList())); @@ -202,6 +201,7 @@ public void previsit(ResourcePool resources, StringTable strings) { Optional optMod = resources.moduleView().findModule(MODULENAME); // jdk.localedata module validation + List available; if (optMod.isPresent()) { ResourcePoolModule module = optMod.get(); Set packages = module.packages(); @@ -214,9 +214,9 @@ public void previsit(ResourcePool resources, StringTable strings) { available = Stream.concat(module.entries() .map(md -> p.matcher(md.path())) - .filter(m -> m.matches()) + .filter(Matcher::matches) .map(m -> m.group("tag").replaceAll("_", "-")), - Stream.concat(Stream.of(jaJPJPTag), Stream.of(thTHTHTag))) + Stream.of(jaJPJPTag, thTHTHTag, "und")) .distinct() .sorted() .map(IncludeLocalesPlugin::tagToLocale) @@ -226,7 +226,7 @@ public void previsit(ResourcePool resources, StringTable strings) { throw new PluginException(PluginsResourceBundle.getMessage(getName() + ".localedatanotfound")); } - filtered = filterLocales(available); + List filtered = filterLocales(available); if (filtered.isEmpty()) { throw new PluginException( @@ -261,6 +261,12 @@ private List includeLocaleFilePatterns(String tag) { files.addAll(includeLocaleFiles("zh_TW")); } + // Make sure to retain sun.text/util.resources.ext packages + if (tag.equals("und")) { + files.add(".+sun/text/resources/ext/FormatData.class"); + files.add(".+sun/util/resources/ext/TimeZoneNames.class"); + } + return files; } @@ -346,13 +352,12 @@ private boolean filterOutUnsupportedTags(byte[] b) { } /* - * Filter list of locales according to the secified priorityList. Note + * Filter list of locales according to the specified priorityList. Note * that returned list of language tags may include extra ones, such as * compatibility ones (e.g., "iw" -> "iw", "he"). */ private List filterLocales(List locales) { - List ret = - Locale.filter(priorityList, locales, Locale.FilteringMode.EXTENDED_FILTERING).stream() + return Locale.filter(priorityList, locales, Locale.FilteringMode.EXTENDED_FILTERING).stream() .flatMap(loc -> Stream.concat(Control.getNoFallbackControl(Control.FORMAT_DEFAULT) .getCandidateLocales("", loc).stream(), CLDR_ADAPTER.getCandidateLocales("", loc).stream())) @@ -367,8 +372,6 @@ private List filterLocales(List locales) { .flatMap(IncludeLocalesPlugin::localeToTags) .distinct() .toList(); - - return ret; } private static final Locale.Builder LOCALE_BUILDER = new Locale.Builder(); @@ -428,6 +431,6 @@ private static Stream localeToTags(Locale loc) { break; } - return tags == null ? List.of(tag).stream() : tags.stream(); + return tags == null ? Stream.of(tag) : tags.stream(); } } diff --git a/src/jdk.localedata/share/classes/module-info.java b/src/jdk.localedata/share/classes/module-info.java index fadb091a92f..3705cf3137e 100644 --- a/src/jdk.localedata/share/classes/module-info.java +++ b/src/jdk.localedata/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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,6 +35,4 @@ sun.util.resources.provider.NonBaseLocaleDataMetaInfo; provides sun.util.resources.LocaleData.CommonResourceBundleProvider with sun.util.resources.provider.LocaleDataProvider; - provides sun.util.resources.LocaleData.SupplementaryResourceBundleProvider with - sun.util.resources.provider.SupplementaryLocaleDataProvider; } diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData.java similarity index 61% rename from src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData.java index a10b431d5cb..0bbbd735f48 100644 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 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,31 +23,17 @@ * questions. */ -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - package sun.text.resources.ext; import sun.util.resources.ParallelListResourceBundle; -public class FormatData_fr_FR extends ParallelListResourceBundle { +public class FormatData extends ParallelListResourceBundle { /** - * Overrides ParallelListResourceBundle + * Exists to keep sun.text.resources.ext package alive + * with IncludeLocales jlink plugin */ + @Override protected final Object[][] getContents() { - return new Object[][] { - }; + return new Object[][]{}; } } diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java deleted file mode 100644 index 4ef9bd30769..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ar extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "Before R.O.C.", - "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "\u064a\u0646\u0627\u064a\u0631", // january - "\u0641\u0628\u0631\u0627\u064a\u0631", // february - "\u0645\u0627\u0631\u0633", // march - "\u0623\u0628\u0631\u064a\u0644", // april - "\u0645\u0627\u064a\u0648", // may - "\u064a\u0648\u0646\u064a\u0648", // june - "\u064a\u0648\u0644\u064a\u0648", // july - "\u0623\u063a\u0633\u0637\u0633", // august - "\u0633\u0628\u062a\u0645\u0628\u0631", // september - "\u0623\u0643\u062a\u0648\u0628\u0631", // october - "\u0646\u0648\u0641\u0645\u0628\u0631", // november - "\u062f\u064a\u0633\u0645\u0628\u0631", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u064a\u0646\u0627", // abb january - "\u0641\u0628\u0631", // abb february - "\u0645\u0627\u0631", // abb march - "\u0623\u0628\u0631", // abb april - "\u0645\u0627\u064a", // abb may - "\u064a\u0648\u0646", // abb june - "\u064a\u0648\u0644", // abb july - "\u0623\u063a\u0633", // abb august - "\u0633\u0628\u062a", // abb september - "\u0623\u0643\u062a", // abb october - "\u0646\u0648\u0641", // abb november - "\u062f\u064a\u0633", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u064a", - "\u0641", - "\u0645", - "\u0623", - "\u0648", - "\u0646", - "\u0644", - "\u063a", - "\u0633", - "\u0643", - "\u0628", - "\u062f", - "", - } - }, - { "DayNames", - new String[] { - "\u0627\u0644\u0623\u062d\u062f", // Sunday - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", // Monday - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", // Tuesday - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", // Wednesday - "\u0627\u0644\u062e\u0645\u064a\u0633", // Thursday - "\u0627\u0644\u062c\u0645\u0639\u0629", // Friday - "\u0627\u0644\u0633\u0628\u062a" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u062d", // abb Sunday - "\u0646", // abb Monday - "\u062b", // abb Tuesday - "\u0631", // abb Wednesday - "\u062e", // abb Thursday - "\u062c", // abb Friday - "\u0633" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "\u0627\u0644\u0623\u062d\u062f", - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062e\u0645\u064a\u0633", - "\u0627\u0644\u062c\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062a", - } - }, - { "DayNarrows", - new String[] { - "\u062d", - "\u0646", - "\u062b", - "\u0631", - "\u062e", - "\u062c", - "\u0633", - } - }, - { "AmPmMarkers", - new String[] { - "\u0635", // am marker - "\u0645" // pm marker - } - }, - { "Eras", - new String[] { // era strings - "\u0642.\u0645", - "\u0645" - } - }, - { "short.Eras", - new String[] { - "\u0642.\u0645", - "\u0645", - } - }, - { "japanese.Eras", - new String[] { - "\u0645", - "\u0645\u064a\u062c\u064a", - "\u062a\u064a\u0634\u0648", - "\u0634\u0648\u0648\u0627", - "\u0647\u064a\u0633\u064a", - "\u0631\u064a\u0648\u0627", - } - }, - { "japanese.short.Eras", - new String[] { - "\u0645", - "\u0645\u064a\u062c\u064a", - "\u062a\u064a\u0634\u0648", - "\u0634\u0648\u0648\u0627", - "\u0647\u064a\u0633\u064a", - "\u0631\u064a\u0648\u0627", - } - }, - { "buddhist.Eras", - new String[] { - "BC", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a", - } - }, - { "buddhist.short.Eras", - new String[] { - "BC", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;#,##0.###-", // decimal pattern - "\u00A4 #,##0.###;\u00A4 #,##0.###-", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "z hh:mm:ss a", // full time pattern - "z hh:mm:ss a", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "dd MMMM, yyyy", // full date pattern - "dd MMMM, yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java deleted file mode 100644 index 2517cd8feee..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 1998, 2020, 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. - */ - -/* - */ - -/* - * (C) Copyright IBM Corp. 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ar_JO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // january - "\u0634\u0628\u0627\u0637", // february - "\u0622\u0630\u0627\u0631", // march - "\u0646\u064a\u0633\u0627\u0646", // april - "\u0623\u064a\u0627\u0631", // may - "\u062d\u0632\u064a\u0631\u0627\u0646", // june - "\u062a\u0645\u0648\u0632", // july - "\u0622\u0628", // august - "\u0623\u064a\u0644\u0648\u0644", // september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb january - "\u0634\u0628\u0627\u0637", // abb february - "\u0622\u0630\u0627\u0631", // abb march - "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0623\u064a\u0627\u0631", // abb may - "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june - "\u062a\u0645\u0648\u0632", // abb july - "\u0622\u0628", // abb august - "\u0623\u064a\u0644\u0648\u0644", // abb september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb december - "" // month 13 if applicable - } - }, - { "DayAbbreviations", - new String[] { - "\u0627\u0644\u0623\u062d\u062f", // abb Sunday - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", // abb Monday - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", // abb Tuesday - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", // abb Wednesday - "\u0627\u0644\u062e\u0645\u064a\u0633", // abb Thursday - "\u0627\u0644\u062c\u0645\u0639\u0629", // abb Friday - "\u0627\u0644\u0633\u0628\u062a" // abb Saturday - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java deleted file mode 100644 index b66c937c796..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 1998, 2020, 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. - */ - -/* - */ - -/* - * (C) Copyright IBM Corp. 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ar_LB extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // january - "\u0634\u0628\u0627\u0637", // february - "\u0622\u0630\u0627\u0631", // march - "\u0646\u064a\u0633\u0627\u0646", // april - "\u0623\u064a\u0627\u0631", // may - "\u062d\u0632\u064a\u0631\u0627\u0646", // june - "\u062a\u0645\u0648\u0632", // july - "\u0622\u0628", // august - "\u0623\u064a\u0644\u0648\u0644", // september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb january - "\u0634\u0628\u0627\u0637", // abb february - "\u0622\u0630\u0627\u0631", // abb march - "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0623\u064a\u0627\u0631", // abb may - "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june - "\u062a\u0645\u0648\u0632", // abb july - "\u0622\u0628", // abb august - "\u0623\u064a\u0644\u0648\u0644", // abb september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb december - "" // month 13 if applicable - } - }, - { "DayAbbreviations", - new String[] { - "\u0627\u0644\u0623\u062d\u062f", // abb Sunday - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", // abb Monday - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", // abb Tuesday - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", // abb Wednesday - "\u0627\u0644\u062e\u0645\u064a\u0633", // abb Thursday - "\u0627\u0644\u062c\u0645\u0639\u0629", // abb Friday - "\u0627\u0644\u0633\u0628\u062a" // abb Saturday - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java deleted file mode 100644 index 6b903349e0b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 1998, 2020, 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. - */ - -/* - */ - -/* - * (C) Copyright IBM Corp. 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ar_SY extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // january - "\u0634\u0628\u0627\u0637", // february - "\u0622\u0630\u0627\u0631", // march - "\u0646\u064a\u0633\u0627\u0646", // april - "\u0623\u064a\u0627\u0631", // may - "\u062d\u0632\u064a\u0631\u0627\u0646", // june - "\u062a\u0645\u0648\u0632", // july - "\u0622\u0628", // august - "\u0623\u064a\u0644\u0648\u0644", // september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb january - "\u0634\u0628\u0627\u0637", // abb february - "\u0622\u0630\u0627\u0631", // abb march - "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0623\u064a\u0627\u0631", // abb may - "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june - "\u062a\u0645\u0648\u0632", // abb july - "\u0622\u0628", // abb august - "\u0623\u064a\u0644\u0648\u0644", // abb september - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb october - "\u062a\u0634\u0631\u064a\u0646\u0020\u0627\u0644\u062b\u0627\u0646\u064a", // abb november - "\u0643\u0627\u0646\u0648\u0646\u0020\u0627\u0644\u0623\u0648\u0644", // abb december - "" // month 13 if applicable - } - }, - { "DayAbbreviations", - new String[] { - "\u0627\u0644\u0623\u062d\u062f", // abb Sunday - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", // abb Monday - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", // abb Tuesday - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", // abb Wednesday - "\u0627\u0644\u062e\u0645\u064a\u0633", // abb Thursday - "\u0627\u0644\u062c\u0645\u0639\u0629", // abb Friday - "\u0627\u0644\u0633\u0628\u062a" // abb Saturday - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java deleted file mode 100644 index 98e5ebfe21f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_be extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f", // january - "\u043b\u044e\u0442\u0430\u0433\u0430", // february - "\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430", // march - "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430", // april - "\u043c\u0430\u044f", // may - "\u0447\u0440\u0432\u0435\u043d\u044f", // june - "\u043b\u0456\u043f\u0435\u043d\u044f", // july - "\u0436\u043d\u0456\u045e\u043d\u044f", // august - "\u0432\u0435\u0440\u0430\u0441\u043d\u044f", // september - "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430", // october - "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430", // november - "\u0441\u043d\u0435\u0436\u043d\u044f", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0441\u0442\u0434", // abb january - "\u043b\u044e\u0442", // abb february - "\u0441\u043a\u0432", // abb march - "\u043a\u0440\u0441", // abb april - "\u043c\u0430\u0439", // abb may - "\u0447\u0440\u0432", // abb june - "\u043b\u043f\u043d", // abb july - "\u0436\u043d\u0432", // abb august - "\u0432\u0440\u0441", // abb september - "\u043a\u0441\u0442", // abb october - "\u043b\u0456\u0441", // abb november - "\u0441\u043d\u0436", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthNarrows", - new String[] { - "\u0441", - "\u043b", - "\u0441", - "\u043a", - "\u043c", - "\u0447", - "\u043b", - "\u0436", - "\u0432", - "\u043a", - "\u043b", - "\u0441", - "", - } - }, - { "DayNames", - new String[] { - "\u043d\u044f\u0434\u0437\u0435\u043b\u044f", // Sunday - "\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a", // Monday - "\u0430\u045e\u0442\u043e\u0440\u0430\u043a", // Tuesday - "\u0441\u0435\u0440\u0430\u0434\u0430", // Wednesday - "\u0447\u0430\u0446\u0432\u0435\u0440", // Thursday - "\u043f\u044f\u0442\u043d\u0456\u0446\u0430", // Friday - "\u0441\u0443\u0431\u043e\u0442\u0430" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u043d\u0434", // abb Sunday - "\u043f\u043d", // abb Monday - "\u0430\u0442", // abb Tuesday - "\u0441\u0440", // abb Wednesday - "\u0447\u0446", // abb Thursday - "\u043f\u0442", // abb Friday - "\u0441\u0431" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u043d", - "\u043f", - "\u0430", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - } - }, - { "Eras", - new String[] { // era strings - "\u0434\u0430 \u043d.\u0435.", - "\u043d.\u0435." - } - }, - { "short.Eras", - new String[] { - "\u0434\u0430 \u043d.\u044d.", - "\u043d.\u044d.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H.mm.ss z", // full time pattern - "H.mm.ss z", // long time pattern - "H.mm.ss", // medium time pattern - "H.mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d, MMMM yyyy", // full date pattern - "EEEE, d, MMMM yyyy", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java deleted file mode 100644 index c19b961c463..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_be_BY extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.##;-\u00A4#,##0.##", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java deleted file mode 100644 index 693bf6a9a5e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_bg extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u042f\u043d\u0443\u0430\u0440\u0438", // january - "\u0424\u0435\u0432\u0440\u0443\u0430\u0440\u0438", // february - "\u041c\u0430\u0440\u0442", // march - "\u0410\u043f\u0440\u0438\u043b", // april - "\u041c\u0430\u0439", // may - "\u042e\u043d\u0438", // june - "\u042e\u043b\u0438", // july - "\u0410\u0432\u0433\u0443\u0441\u0442", // august - "\u0421\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438", // september - "\u041e\u043a\u0442\u043e\u043c\u0432\u0440\u0438", // october - "\u041d\u043e\u0435\u043c\u0432\u0440\u0438", // november - "\u0414\u0435\u043a\u0435\u043c\u0432\u0440\u0438", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "I", // abb january - "II", // abb february - "III", // abb march - "IV", // abb april - "V", // abb may - "VI", // abb june - "VII", // abb july - "VIII", // abb august - "IX", // abb september - "X", // abb october - "XI", // abb november - "XII", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u044f", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u044e", - "\u044e", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "DayNames", - new String[] { - "\u041d\u0435\u0434\u0435\u043b\u044f", // Sunday - "\u041f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a", // Monday - "\u0412\u0442\u043e\u0440\u043d\u0438\u043a", // Tuesday - "\u0421\u0440\u044f\u0434\u0430", // Wednesday - "\u0427\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a", // Thursday - "\u041f\u0435\u0442\u044a\u043a", // Friday - "\u0421\u044a\u0431\u043e\u0442\u0430" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u041d\u0434", // abb Sunday - "\u041f\u043d", // abb Monday - "\u0412\u0442", // abb Tuesday - "\u0421\u0440", // abb Wednesday - "\u0427\u0442", // abb Thursday - "\u041f\u0442", // abb Friday - "\u0421\u0431" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u043d", - "\u043f", - "\u0432", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - } - }, - { "Eras", - new String[] { // era strings - "\u043f\u0440.\u043d.\u0435.", - "\u043d.\u0435." - } - }, - { "short.Eras", - new String[] { - "\u043f\u0440. \u043d. \u0435.", - "\u043e\u0442 \u043d. \u0435.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss zzzz", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "dd MMMM y, EEEE", // full date pattern - "dd MMMM y", // long date pattern - "dd.MM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java deleted file mode 100644 index 6a26bf48e95..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_bg_BG extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.##;-\u00A4#,##0.##", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java deleted file mode 100644 index ef7eafb8fa5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java +++ /dev/null @@ -1,303 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ca extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "de gener", - "de febrer", - "de mar\u00e7", - "d\u2019abril", - "de maig", - "de juny", - "de juliol", - "d\u2019agost", - "de setembre", - "d\u2019octubre", - "de novembre", - "de desembre", - "", - } - }, - { "MonthNarrows", - new String[] { - "G", - "F", - "M", - "A", - "M", - "J", - "G", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "gener", // january - "febrer", // february - "mar\u00e7", // march - "abril", // april - "maig", // may - "juny", // june - "juliol", // july - "agost", // august - "setembre", // september - "octubre", // october - "novembre", // november - "desembre", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "de gen.", - "de febr.", - "de mar\u00e7", - "d\u2019abr.", - "de maig", - "de juny", - "de jul.", - "d\u2019ag.", - "de set.", - "d\u2019oct.", - "de nov.", - "de des.", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "gen.", // abb january - "feb.", // abb february - "mar\u00e7", // abb march - "abr.", // abb april - "maig", // abb may - "juny", // abb june - "jul.", // abb july - "ag.", // abb august - "set.", // abb september - "oct.", // abb october - "nov.", // abb november - "des.", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthNarrows", - new String[] { - "g", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "DayNames", - new String[] { - "diumenge", // Sunday - "dilluns", // Monday - "dimarts", // Tuesday - "dimecres", // Wednesday - "dijous", // Thursday - "divendres", // Friday - "dissabte" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "Diumenge", - "Dilluns", - "Dimarts", - "Dimecres", - "Dijous", - "Divendres", - "Dissabte", - } - }, - { "DayAbbreviations", - new String[] { - "dg.", // abb Sunday - "dl.", // abb Monday - "dt.", // abb Tuesday - "dc.", // abb Wednesday - "dj.", // abb Thursday - "dv.", // abb Friday - "ds." // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "dg", - "dl", - "dt", - "dc", - "dj", - "dv", - "ds", - } - }, - { "DayNarrows", - new String[] { - "G", - "L", // Note: contributed item in CDLR - "T", - "C", - "J", - "V", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "g", - "l", - "t", - "c", - "j", - "v", - "s", - } - }, - { "short.Eras", - new String[] { - "aC", - "dC", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d' / 'MMMM' / 'yyyy", // full date pattern - "d' / 'MMMM' / 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java deleted file mode 100644 index 5a96828d412..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ca_ES extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0;-\u00A4 #,##0", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java deleted file mode 100644 index 2f68a4b5ec8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_cs extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "ledna", - "\u00fanora", - "b\u0159ezna", - "dubna", - "kv\u011btna", - "\u010dervna", - "\u010dervence", - "srpna", - "z\u00e1\u0159\u00ed", - "\u0159\u00edjna", - "listopadu", - "prosince", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "leden", // january - "\u00fanor", // february - "b\u0159ezen", // march - "duben", // april - "kv\u011bten", // may - "\u010derven", // june - "\u010dervenec", // july - "srpen", // august - "z\u00e1\u0159\u00ed", // september - "\u0159\u00edjen", // october - "listopad", // november - "prosinec", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "Led", - "\u00dano", - "B\u0159e", - "Dub", - "Kv\u011b", - "\u010cer", - "\u010cvc", - "Srp", - "Z\u00e1\u0159", - "\u0158\u00edj", - "Lis", - "Pro", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "I", // abb january - "II", // abb february - "III", // abb march - "IV", // abb april - "V", // abb may - "VI", // abb june - "VII", // abb july - "VIII", // abb august - "IX", // abb september - "X", // abb october - "XI", // abb november - "XII", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "l", - "\u00fa", - "b", - "d", - "k", - "\u010d", - "\u010d", - "s", - "z", - "\u0159", - "l", - "p", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "l", - "\u00fa", - "b", - "d", - "k", - "\u010d", - "\u010d", - "s", - "z", - "\u0159", - "l", - "p", - "", - } - }, - { "DayNames", - new String[] { - "Ned\u011ble", // Sunday - "Pond\u011bl\u00ed", // Monday - "\u00dater\u00fd", // Tuesday - "St\u0159eda", // Wednesday - "\u010ctvrtek", // Thursday - "P\u00e1tek", // Friday - "Sobota" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "ned\u011ble", - "pond\u011bl\u00ed", - "\u00fater\u00fd", - "st\u0159eda", - "\u010dtvrtek", - "p\u00e1tek", - "sobota", - } - }, - { "DayAbbreviations", - new String[] { - "Ne", // abb Sunday - "Po", // abb Monday - "\u00dat", // abb Tuesday - "St", // abb Wednesday - "\u010ct", // abb Thursday - "P\u00e1", // abb Friday - "So" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "ne", - "po", - "\u00fat", - "st", - "\u010dt", - "p\u00e1", - "so", - } - }, - { "DayNarrows", - new String[] { - "N", - "P", - "\u00da", - "S", - "\u010c", - "P", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "N", - "P", - "\u00da", - "S", - "\u010c", - "P", - "S", - } - }, - { "AmPmMarkers", - new String[] { - "dop.", // am marker - "odp." // pm marker - } - }, - { "Eras", - new String[] { // era strings - "p\u0159.Kr.", - "po Kr." - } - }, - { "short.Eras", - new String[] { - "p\u0159. n. l.", - "n. l.", - } - }, - { "narrow.Eras", - new String[] { - "p\u0159.n.l.", - "n. l.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java deleted file mode 100644 index 38a4929a6ff..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_cs_CZ extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.##;-#,##0.##", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java deleted file mode 100644 index 875c13231c0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_da extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januar", // january - "februar", // february - "marts", // march - "april", // april - "maj", // may - "juni", // june - "juli", // july - "august", // august - "september", // september - "oktober", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "maj", - "jun.", - "jul.", - "aug.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "maj", // abb may - "jun", // abb june - "jul", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "dec", // abb december - "" // abb month 13 if applicable - } - }, - { "DayNames", - new String[] { - "s\u00f8ndag", // Sunday - "mandag", // Monday - "tirsdag", // Tuesday - "onsdag", // Wednesday - "torsdag", // Thursday - "fredag", // Friday - "l\u00f8rdag" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "s\u00f8", // abb Sunday - "ma", // abb Monday - "ti", // abb Tuesday - "on", // abb Wednesday - "to", // abb Thursday - "fr", // abb Friday - "l\u00f8" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "short.Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "dd-MM-yyyy", // medium date pattern - "dd-MM-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java deleted file mode 100644 index d8586733eb5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_da_DK extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4 -#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java deleted file mode 100644 index 44c41fd6652..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_de extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Januar", // january - "Februar", // february - "M\u00e4rz", // march - "April", // april - "Mai", // may - "Juni", // june - "Juli", // july - "August", // august - "September", // september - "Oktober", // october - "November", // november - "Dezember", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "Jan", - "Feb", - "M\u00e4r", - "Apr", - "Mai", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Dez", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "Jan", // abb january - "Feb", // abb february - "M\u00e4r", // abb march - "Apr", // abb april - "Mai", // abb may - "Jun", // abb june - "Jul", // abb july - "Aug", // abb august - "Sep", // abb september - "Okt", // abb october - "Nov", // abb november - "Dez", // abb december - "" // abb month 13 if appliclicable - } - }, - { "DayNames", - new String[] { - "Sonntag", // Sunday - "Montag", // Monday - "Dienstag", // Tuesday - "Mittwoch", // Wednesday - "Donnerstag", // Thursday - "Freitag", // Friday - "Samstag" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "So", // abb Sunday - "Mo", // abb Monday - "Di", // abb Tuesday - "Mi", // abb Wednesday - "Do", // abb Thursday - "Fr", // abb Friday - "Sa" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "So", - "Mo", - "Di", - "Mi", - "Do", - "Fr", - "Sa", - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "D", - "M", - "D", - "F", - "S", - } - }, - { "Eras", - new String[] { // era strings - "v. Chr.", - "n. Chr." - } - }, - { "short.Eras", - new String[] { - "v. Chr.", - "n. Chr.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm' Uhr 'z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "dd.MM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java deleted file mode 100644 index cfeeb331813..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_de_AT extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "J\u00e4nner", // january - "Februar", // february - "M\u00e4rz", // march - "April", // april - "Mai", // may - "Juni", // june - "Juli", // july - "August", // august - "September", // september - "Oktober", // october - "November", // november - "Dezember", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "J\u00e4n", - "Feb", - "M\u00e4r", - "Apr", - "Mai", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Dez", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "J\u00e4n", // abb january - "Feb", // abb february - "M\u00e4r", // abb march - "Apr", // abb april - "Mai", // abb may - "Jun", // abb june - "Jul", // abb july - "Aug", // abb august - "Sep", // abb september - "Okt", // abb october - "Nov", // abb november - "Dez", // abb december - "" // abb month 13 if applicable - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;-\u00A4 #,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH:mm' Uhr 'z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd. MMMM yyyy", // full date pattern - "dd. MMMM yyyy", // long date pattern - "dd.MM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java deleted file mode 100644 index d6cdb878281..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_de_CH extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0 %" // percent pattern - } - }, - { "NumberElements", - new String[] { - ".", // decimal separator - "'", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java deleted file mode 100644 index b98fa44b7e8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_de_DE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java deleted file mode 100644 index 3227d89abd0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - */ - -/* - * (C) Copyright IBM Corp. 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by IBM. These materials are provided under - * terms of a License Agreement between IBM and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to IBM may not be removed. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_de_LU extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java deleted file mode 100644 index 0141b644cfb..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_el extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "\u03a0\u03c1\u03b9\u03bd R.O.C.", - "R.O.C.", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5", - "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5", - "\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5", - "\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5", - "\u039c\u03b1\u0390\u03bf\u03c5", - "\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5", - "\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5", - "\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5", - "\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5", - "\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", // january - "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", // february - "\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2", // march - "\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2", // april - "\u039c\u03ac\u03ca\u03bf\u03c2", // may - "\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2", // june - "\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2", // july - "\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2", // august - "\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", // september - "\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2", // october - "\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", // november - "\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0399\u03b1\u03bd", // abb january - "\u03a6\u03b5\u03b2", // abb february - "\u039c\u03b1\u03c1", // abb march - "\u0391\u03c0\u03c1", // abb april - "\u039c\u03b1\u03ca", // abb may - "\u0399\u03bf\u03c5\u03bd", // abb june - "\u0399\u03bf\u03c5\u03bb", // abb july - "\u0391\u03c5\u03b3", // abb august - "\u03a3\u03b5\u03c0", // abb september - "\u039f\u03ba\u03c4", // abb october - "\u039d\u03bf\u03b5", // abb november - "\u0394\u03b5\u03ba", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "\u0399\u03b1\u03bd", - "\u03a6\u03b5\u03b2", - "\u039c\u03ac\u03c1", - "\u0391\u03c0\u03c1", - "\u039c\u03ac\u03b9", - "\u0399\u03bf\u03cd\u03bd", - "\u0399\u03bf\u03cd\u03bb", - "\u0391\u03c5\u03b3", - "\u03a3\u03b5\u03c0", - "\u039f\u03ba\u03c4", - "\u039d\u03bf\u03ad", - "\u0394\u03b5\u03ba", - "", - } - }, - { "MonthNarrows", - new String[] { - "\u0399", - "\u03a6", - "\u039c", - "\u0391", - "\u039c", - "\u0399", - "\u0399", - "\u0391", - "\u03a3", - "\u039f", - "\u039d", - "\u0394", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "\u0399", - "\u03a6", - "\u039c", - "\u0391", - "\u039c", - "\u0399", - "\u0399", - "\u0391", - "\u03a3", - "\u039f", - "\u039d", - "\u0394", - "", - } - }, - { "DayNames", - new String[] { - "\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae", // Sunday - "\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1", // Monday - "\u03a4\u03c1\u03af\u03c4\u03b7", // Tuesday - "\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7", // Wednesday - "\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7", // Thursday - "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae", // Friday - "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae", - "\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1", - "\u03a4\u03c1\u03af\u03c4\u03b7", - "\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7", - "\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7", - "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae", - "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf", - } - }, - { "DayAbbreviations", - new String[] { - "\u039a\u03c5\u03c1", // abb Sunday - "\u0394\u03b5\u03c5", // abb Monday - "\u03a4\u03c1\u03b9", // abb Tuesday - "\u03a4\u03b5\u03c4", // abb Wednesday - "\u03a0\u03b5\u03bc", // abb Thursday - "\u03a0\u03b1\u03c1", // abb Friday - "\u03a3\u03b1\u03b2" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "\u039a\u03c5\u03c1", - "\u0394\u03b5\u03c5", - "\u03a4\u03c1\u03af", - "\u03a4\u03b5\u03c4", - "\u03a0\u03ad\u03bc", - "\u03a0\u03b1\u03c1", - "\u03a3\u03ac\u03b2", - } - }, - { "DayNarrows", - new String[] { - "\u039a", - "\u0394", - "\u03a4", - "\u03a4", - "\u03a0", - "\u03a0", - "\u03a3", - } - }, - { "standalone.DayNarrows", - new String[] { - "\u039a", - "\u0394", - "\u03a4", - "\u03a4", - "\u03a0", - "\u03a0", - "\u03a3", - } - }, - { "short.Eras", - new String[] { - "\u03c0.\u03a7.", - "\u03bc.\u03a7.", - } - }, - { "AmPmMarkers", - new String[] { - "\u03c0\u03bc", // am marker - "\u03bc\u03bc" // pm marker - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", // full time pattern - "h:mm:ss a z", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d MMM yyyy", // medium date pattern - "d/M/yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java deleted file mode 100644 index 9e50ed3ea01..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_el_CY extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", - "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", - "\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2", - "\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2", - "\u039c\u03ac\u03b9\u03bf\u03c2", - "\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2", - "\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2", - "\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2", - "\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", - "\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2", - "\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", - "\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2", - "", - } - }, - { "AmPmMarkers", - new String[] { - "\u03a0\u039c", - "\u039c\u039c", - } - }, - { "Eras", - new String[] { - "\u03c0.\u03a7.", - "\u03bc.\u03a7.", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ",", - ".", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "dd/MM/yyyy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java deleted file mode 100644 index d4038b59a69..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_el_GR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java deleted file mode 100644 index 6ca4c7f329f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_AU extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "h:mm:ss a z", // full time pattern - "h:mm:ss a", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java deleted file mode 100644 index b6c34fe2d36..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_CA extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "h:mm:ss 'o''clock' a z", // full time pattern - "h:mm:ss z a", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, MMMM d, yyyy", // full date pattern - "MMMM d, yyyy", // long date pattern - "d-MMM-yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java deleted file mode 100644 index e1f70e95fc9..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_GB extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "HH:mm:ss 'o''clock' z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "dd MMMM yyyy", // long date pattern - "dd-MMM-yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java deleted file mode 100644 index c5f06379836..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_IE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "HH:mm:ss 'o''clock' z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "dd MMMM yyyy", // full date pattern - "dd MMMM yyyy", // long date pattern - "dd-MMM-yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java deleted file mode 100644 index ed5f5cedadf..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 1999, 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 (c) 1999 International Business Machines. - * All Rights Reserved. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - - -/** - * The locale elements for English in India. - * - */ -public class FormatData_en_IN extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "\u0030", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", // full time pattern - "h:mm:ss a z", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM, yyyy", // full date pattern - "d MMMM, yyyy", // long date pattern - "d MMM, yyyy", // medium date pattern - "d/M/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java deleted file mode 100644 index 9724bbae825..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_MT extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "dd/MM/yyyy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java deleted file mode 100644 index 4645225afa2..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_NZ extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "h:mm:ss a z", // full time pattern - "h:mm:ss a", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d/MM/yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java deleted file mode 100644 index 193ae6bf98d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_PH extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00;(\u00a4#,##0.00)", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - } - }, - { "DatePatterns", - new String[] { - "EEEE, MMMM d, yyyy", - "MMMM d, yyyy", - "MM d, yy", - "M/d/yy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java deleted file mode 100644 index 53cab53e273..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_SG extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM, yyyy", // full date pattern - "d MMMM, yyyy", // long date pattern - "d MMM, yyyy", // medium date pattern - "d/M/yy", // short date pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java deleted file mode 100644 index 1e547e16aa9..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_en_ZA extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a", // full time pattern - "h:mm:ss a", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE dd MMMM yyyy", // full date pattern - "dd MMMM yyyy", // long date pattern - "dd MMM yyyy", // medium date pattern - "yyyy/MM/dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java deleted file mode 100644 index f927a5805ba..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "enero", // january - "febrero", // february - "marzo", // march - "abril", // april - "mayo", // may - "junio", // june - "julio", // july - "agosto", // august - "septiembre", // september - "octubre", // october - "noviembre", // november - "diciembre", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "ene", // abb january - "feb", // abb february - "mar", // abb march - "abr", // abb april - "may", // abb may - "jun", // abb june - "jul", // abb july - "ago", // abb august - "sep", // abb september - "oct", // abb october - "nov", // abb november - "dic", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "E", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "domingo", // Sunday - "lunes", // Monday - "martes", // Tuesday - "mi\u00e9rcoles", // Wednesday - "jueves", // Thursday - "viernes", // Friday - "s\u00e1bado" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "dom", // abb Sunday - "lun", // abb Monday - "mar", // abb Tuesday - "mi\u00e9", // abb Wednesday - "jue", // abb Thursday - "vie", // abb Friday - "s\u00e1b" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "D", - "L", - "M", - "X", - "J", - "V", - "S", - } - }, - { "Eras", - new String[] { - "antes de Cristo", - "anno D\u00f3mini", - } - }, - { "short.Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;(\u00A4#,##0.00)", // currency pattern - "#,##0%" // percent pattern - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH'H'mm'' z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd-MMM-yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java deleted file mode 100644 index 03018309b7f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_AR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH'h'''mm z", // full time pattern - "H:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java deleted file mode 100644 index 859868e54d4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_BO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd-MM-yyyy", // medium date pattern - "dd-MM-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java deleted file mode 100644 index 8015cd970ab..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 2014, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_CL extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss zzzz", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd-MM-yyyy", // medium date pattern - "dd-MM-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java deleted file mode 100644 index 0af9bd9165d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_CO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "d/MM/yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java deleted file mode 100644 index 30e94e11841..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_CR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java deleted file mode 100644 index 08d0a570b5b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_DO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java deleted file mode 100644 index 877c1160c96..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 1997, 2014, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_EC extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss zzzz", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java deleted file mode 100644 index 8d8a986a96e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_ES extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0 \u00A4;-#,##0 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java deleted file mode 100644 index f50561972be..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_GT extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "d/MM/yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java deleted file mode 100644 index b9281045f98..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_HN extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE dd' de 'MMMM' de 'yyyy", // full date pattern - "dd' de 'MMMM' de 'yyyy", // long date pattern - "MM-dd-yyyy", // medium date pattern - "MM-dd-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java deleted file mode 100644 index f943cfa01be..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_MX extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;-\u00A4#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "d/MM/yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java deleted file mode 100644 index 260f2dec798..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_NI extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE dd' de 'MMMM' de 'yyyy", // full date pattern - "dd' de 'MMMM' de 'yyyy", // long date pattern - "MM-dd-yyyy", // medium date pattern - "MM-dd-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java deleted file mode 100644 index 49d3a197804..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_PA extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "MM/dd/yyyy", // medium date pattern - "MM/dd/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java deleted file mode 100644 index 7f49bac3993..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 1997, 2019, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_PE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java deleted file mode 100644 index 09cb4e6236b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_PR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "MM-dd-yyyy", // medium date pattern - "MM-dd-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java deleted file mode 100644 index c22260cffb1..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_PY extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java deleted file mode 100644 index 2d1a51f3441..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_SV extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "MM-dd-yyyy", // medium date pattern - "MM-dd-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - } - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java deleted file mode 100644 index 2b6f499099c..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_US extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "AmPmMarkers", - new String[] { - "a.m.", - "p.m.", - } - }, - { "Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00;(\u00a4#,##0.00)", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "MMM d, yyyy", - "M/d/yy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java deleted file mode 100644 index 49cdac330cb..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_UY extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;(\u00A4#,##0.00)", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java deleted file mode 100644 index 571412e5954..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_es_VE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;\u00A4 -#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "hh:mm:ss a z", // full time pattern - "hh:mm:ss a z", // long time pattern - "hh:mm:ss a", // medium time pattern - "hh:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java deleted file mode 100644 index a9168a4ba28..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_et extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "jaanuar", // january - "veebruar", // february - "m\u00e4rts", // march - "aprill", // april - "mai", // may - "juuni", // june - "juuli", // july - "august", // august - "september", // september - "oktoober", // october - "november", // november - "detsember", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jaan", // abb january - "veebr", // abb february - "m\u00e4rts", // abb march - "apr", // abb april - "mai", // abb may - "juuni", // abb june - "juuli", // abb july - "aug", // abb august - "sept", // abb september - "okt", // abb october - "nov", // abb november - "dets", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "V", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "p\u00fchap\u00e4ev", // Sunday - "esmasp\u00e4ev", // Monday - "teisip\u00e4ev", // Tuesday - "kolmap\u00e4ev", // Wednesday - "neljap\u00e4ev", // Thursday - "reede", // Friday - "laup\u00e4ev" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "P", // abb Sunday - "E", // abb Monday - "T", // abb Tuesday - "K", // abb Wednesday - "N", // abb Thursday - "R", // abb Friday - "L" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "P", - "E", - "T", - "K", - "N", - "R", - "L", - } - }, - { "Eras", - new String[] { // era strings - "e.m.a.", - "m.a.j." - } - }, - { "short.Eras", - new String[] { - "e.m.a.", - "m.a.j.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d. MMMM yyyy", // full date pattern - "EEEE, d. MMMM yyyy. 'a'", // long date pattern - "d.MM.yyyy", // medium date pattern - "d.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java deleted file mode 100644 index 26881b589b3..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_et_EE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java deleted file mode 100644 index 9ecc89a9c27..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fi extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "tammikuuta", - "helmikuuta", - "maaliskuuta", - "huhtikuuta", - "toukokuuta", - "kes\u00e4kuuta", - "hein\u00e4kuuta", - "elokuuta", - "syyskuuta", - "lokakuuta", - "marraskuuta", - "joulukuuta", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "tammikuu", // january - "helmikuu", // february - "maaliskuu", // march - "huhtikuu", // april - "toukokuu", // may - "kes\u00e4kuu", // june - "hein\u00e4kuu", // july - "elokuu", // august - "syyskuu", // september - "lokakuu", // october - "marraskuu", // november - "joulukuu", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "tammikuuta", - "helmikuuta", - "maaliskuuta", - "huhtikuuta", - "toukokuuta", - "kes\u00e4kuuta", - "hein\u00e4kuuta", - "elokuuta", - "syyskuuta", - "lokakuuta", - "marraskuuta", - "joulukuuta", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "tammi", // abb january - "helmi", // abb february - "maalis", // abb march - "huhti", // abb april - "touko", // abb may - "kes\u00e4", // abb june - "hein\u00e4", // abb july - "elo", // abb august - "syys", // abb september - "loka", // abb october - "marras", // abb november - "joulu", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "T", - "H", - "M", - "H", - "T", - "K", - "H", - "E", - "S", - "L", - "M", - "J", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "T", - "H", - "M", - "H", - "T", - "K", - "H", - "E", - "S", - "L", - "M", - "J", - "", - } - }, - { "long.Eras", - new String[] { - "ennen Kristuksen syntym\u00e4\u00e4", - "j\u00e4lkeen Kristuksen syntym\u00e4n", - } - }, - { "Eras", - new String[] { - "eKr.", - "jKr.", - } - }, - { "narrow.Eras", - new String[] { - "eK", - "jK", - } - }, - { "DayNames", - new String[] { - "sunnuntai", // Sunday - "maanantai", // Monday - "tiistai", // Tuesday - "keskiviikko", // Wednesday - "torstai", // Thursday - "perjantai", // Friday - "lauantai" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "sunnuntai", - "maanantai", - "tiistai", - "keskiviikko", - "torstai", - "perjantai", - "lauantai", - } - }, - { "DayAbbreviations", - new String[] { - "su", // abb Sunday - "ma", // abb Monday - "ti", // abb Tuesday - "ke", // abb Wednesday - "to", // abb Thursday - "pe", // abb Friday - "la" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "su", - "ma", - "ti", - "ke", - "to", - "pe", - "la", - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "T", - "K", - "T", - "P", - "L", - } - }, - { "standalone.DayNarrows", - new String[] { - "S", - "M", - "T", - "K", - "T", - "P", - "L", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H.mm.ss z", // full time pattern - "'klo 'H.mm.ss", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - { "AmPmMarkers", - new String[] { - "ap.", // am marker - "ip." // pm marker - } - }, - { "narrow.AmPmMarkers", - new String[] { - "ap.", - "ip.", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java deleted file mode 100644 index cc16dc872a1..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fi_FI extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java deleted file mode 100644 index 662d5afde94..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fr extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "janvier", // january - "f\u00e9vrier", // february - "mars", // march - "avril", // april - "mai", // may - "juin", // june - "juillet", // july - "ao\u00fbt", // august - "septembre", // september - "octobre", // october - "novembre", // november - "d\u00e9cembre", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "janv.", // abb january - "f\u00e9vr.", // abb february - "mars", // abb march - "avr.", // abb april - "mai", // abb may - "juin", // abb june - "juil.", // abb july - "ao\u00fbt", // abb august - "sept.", // abb september - "oct.", // abb october - "nov.", // abb november - "d\u00e9c.", // abb december - "" // abb mo month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "dimanche", // Sunday - "lundi", // Monday - "mardi", // Tuesday - "mercredi", // Wednesday - "jeudi", // Thursday - "vendredi", // Friday - "samedi" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "dim.", // abb Sunday - "lun.", // abb Monday - "mar.", // abb Tuesday - "mer.", // abb Wednesday - "jeu.", // abb Thursday - "ven.", // abb Friday - "sam." // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "dim.", - "lun.", - "mar.", - "mer.", - "jeu.", - "ven.", - "sam.", - } - }, - { "DayNarrows", - new String[] { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - } - }, - { "Eras", - new String[] { // era strings - "BC", - "ap. J.-C." - } - }, - { "short.Eras", - new String[] { - "av. J.-C.", - "ap. J.-C.", - } - }, - { "buddhist.Eras", - new String[] { - "BC", - "\u00e8re bouddhiste", - } - }, - { "buddhist.short.Eras", - new String[] { - "BC", - "\u00e8re b.", - } - }, - { "buddhist.narrow.Eras", - new String[] { - "BC", - "E.B.", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0 %" // percent pattern - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH' h 'mm z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d MMM yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java deleted file mode 100644 index 88335059dfc..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fr_BE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H' h 'mm' min 'ss' s 'z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "dd-MMM-yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java deleted file mode 100644 index 7f215423ab7..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fr_CA extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;(#,##0.00\u00A4)", // currency pattern - "#,##0 %" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "H' h 'mm z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "yyyy-MM-dd", // medium date pattern - "yy-MM-dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java deleted file mode 100644 index 6206b7ad53d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_fr_CH extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0 %" // percent pattern - } - }, - { "NumberElements", - new String[] { - ".", // decimal separator - "'", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH.mm.' h' z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "d MMM yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java deleted file mode 100644 index 717a6f6ffe6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ga extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Ean\u00e1ir", - "Feabhra", - "M\u00e1rta", - "Aibre\u00e1n", - "Bealtaine", - "Meitheamh", - "I\u00fail", - "L\u00fanasa", - "Me\u00e1n F\u00f3mhair", - "Deireadh F\u00f3mhair", - "Samhain", - "Nollaig", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Ean", - "Feabh", - "M\u00e1rta", - "Aib", - "Beal", - "Meith", - "I\u00fail", - "L\u00fan", - "MF\u00f3mh", - "DF\u00f3mh", - "Samh", - "Noll", - "", - } - }, - { "MonthNarrows", - new String[] { - "E", - "F", - "M", - "A", - "B", - "M", - "I", - "L", - "M", - "D", - "S", - "N", - "", - } - }, - { "DayNames", - new String[] { - "D\u00e9 Domhnaigh", - "D\u00e9 Luain", - "D\u00e9 M\u00e1irt", - "D\u00e9 C\u00e9adaoin", - "D\u00e9ardaoin", - "D\u00e9 hAoine", - "D\u00e9 Sathairn", - } - }, - { "DayAbbreviations", - new String[] { - "Domh", - "Luan", - "M\u00e1irt", - "C\u00e9ad", - "D\u00e9ar", - "Aoine", - "Sath", - } - }, - { "AmPmMarkers", - new String[] { - "a.m.", - "p.m.", - } - }, - { "Eras", - new String[] { - "RC", - "AD", - } - }, - { "short.Eras", - new String[] { - "RC", - "AD", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4 #,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy MMMM dd", - "yyyy MMMM d", - "yyyy MMM d", - "yy/MM/dd", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - { "DateTimePatternChars", "RbMLkUnsSElFtTauKcZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java deleted file mode 100644 index 86870e44008..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ga_IE extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he.java deleted file mode 100644 index cfde6826e40..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_he extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u05d9\u05e0\u05d5\u05d0\u05e8", // january - "\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8", // february - "\u05de\u05e8\u05e5", // march - "\u05d0\u05e4\u05e8\u05d9\u05dc", // april - "\u05de\u05d0\u05d9", // may - "\u05d9\u05d5\u05e0\u05d9", // june - "\u05d9\u05d5\u05dc\u05d9", // july - "\u05d0\u05d5\u05d2\u05d5\u05e1\u05d8", // august - "\u05e1\u05e4\u05d8\u05de\u05d1\u05e8", // september - "\u05d0\u05d5\u05e7\u05d8\u05d5\u05d1\u05e8", // october - "\u05e0\u05d5\u05d1\u05de\u05d1\u05e8", // november - "\u05d3\u05e6\u05de\u05d1\u05e8", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u05d9\u05e0\u05d5", // abb january - "\u05e4\u05d1\u05e8", // abb february - "\u05de\u05e8\u05e5", // abb march - "\u05d0\u05e4\u05e8", // abb april - "\u05de\u05d0\u05d9", // abb may - "\u05d9\u05d5\u05e0", // abb june - "\u05d9\u05d5\u05dc", // abb july - "\u05d0\u05d5\u05d2", // abb august - "\u05e1\u05e4\u05d8", // abb september - "\u05d0\u05d5\u05e7", // abb october - "\u05e0\u05d5\u05d1", // abb november - "\u05d3\u05e6\u05de", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "\u05d9\u05e0\u05d5\u05f3", - "\u05e4\u05d1\u05e8\u05f3", - "\u05de\u05e8\u05e5", - "\u05d0\u05e4\u05e8\u05f3", - "\u05de\u05d0\u05d9", - "\u05d9\u05d5\u05e0\u05f3", - "\u05d9\u05d5\u05dc\u05f3", - "\u05d0\u05d5\u05d2\u05f3", - "\u05e1\u05e4\u05d8\u05f3", - "\u05d0\u05d5\u05e7\u05f3", - "\u05e0\u05d5\u05d1\u05f3", - "\u05d3\u05e6\u05de\u05f3", - "", - } - }, - { "MonthNarrows", - new String[] { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "", - } - }, - { "DayNames", - new String[] { - "\u05d9\u05d5\u05dd \u05e8\u05d0\u05e9\u05d5\u05df", // Sunday - "\u05d9\u05d5\u05dd \u05e9\u05e0\u05d9", // Monday - "\u05d9\u05d5\u05dd \u05e9\u05dc\u05d9\u05e9\u05d9", // Tuesday - "\u05d9\u05d5\u05dd \u05e8\u05d1\u05d9\u05e2\u05d9", // Wednesday - "\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9", // Thursday - "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9", // Friday - "\u05e9\u05d1\u05ea" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u05d0", // abb Sunday - "\u05d1", // abb Monday - "\u05d2", // abb Tuesday - "\u05d3", // abb Wednesday - "\u05d4", // abb Thursday - "\u05d5", // abb Friday - "\u05e9" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u05d0", - "\u05d1", - "\u05d2", - "\u05d3", - "\u05d4", - "\u05d5", - "\u05e9", - } - }, - { "standalone.DayNarrows", - new String[] { - "\u05d0", - "\u05d1", - "\u05d2", - "\u05d3", - "\u05d4", - "\u05d5", - "\u05e9", - } - }, - { "Eras", - new String[] { // era strings - "\u05dc\u05e1\u05d4\"\u05e0", - "\u05dc\u05e4\u05e1\u05d4\"\u05e0" - } - }, - { "short.Eras", - new String[] { - "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1", - "\u05dc\u05e1\u05d4\u05f4\u05e0", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{0} {1}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he_IL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he_IL.java deleted file mode 100644 index f03bae72d41..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_he_IL.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_he_IL extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java deleted file mode 100644 index 69e3369b289..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright (c) 1999, 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 (c) 1998 International Business Machines. - * All Rights Reserved. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -/** - * The locale elements for Hindi. - * - */ -public class FormatData_hi_IN extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u091c\u0928\u0935\u0930\u0940", // january - "\u092b\u093c\u0930\u0935\u0930\u0940", // february - "\u092e\u093e\u0930\u094d\u091a", // march - "\u0905\u092a\u094d\u0930\u0948\u0932", // april - "\u092e\u0908", // may - "\u091c\u0942\u0928", // june - "\u091c\u0941\u0932\u093e\u0908", // july - "\u0905\u0917\u0938\u094d\u0924", // august - "\u0938\u093f\u0924\u0902\u092c\u0930", // september - "\u0905\u0915\u094d\u200d\u0924\u0942\u092c\u0930", // october - "\u0928\u0935\u0902\u092c\u0930", // november - "\u0926\u093f\u0938\u0902\u092c\u0930", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", // These are same as the long ones. - new String[] { - "\u091c\u0928\u0935\u0930\u0940", // abb january - "\u092b\u093c\u0930\u0935\u0930\u0940", // abb february - "\u092e\u093e\u0930\u094d\u091a", // abb march - "\u0905\u092a\u094d\u0930\u0948\u0932", // abb april - "\u092e\u0908", // abb may - "\u091c\u0942\u0928", // abb june - "\u091c\u0941\u0932\u093e\u0908", // abb july - "\u0905\u0917\u0938\u094d\u0924", // abb august - "\u0938\u093f\u0924\u0902\u092c\u0930", // abb september - "\u0905\u0915\u094d\u200d\u0924\u0942\u092c\u0930", // abb october - "\u0928\u0935\u0902\u092c\u0930", // abb november - "\u0926\u093f\u0938\u0902\u092c\u0930", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u091c", - "\u092b\u093c", - "\u092e\u093e", - "\u0905", - "\u092e", - "\u091c\u0942", - "\u091c\u0941", - "\u0905", - "\u0938\u093f", - "\u0905", - "\u0928", - "\u0926\u093f", - "", - } - }, - { "DayNames", - new String[] { - "\u0930\u0935\u093f\u0935\u093e\u0930", // Sunday - "\u0938\u094b\u092e\u0935\u093e\u0930", // Monday - "\u092e\u0902\u0917\u0932\u0935\u093e\u0930", // Tuesday - "\u092c\u0941\u0927\u0935\u093e\u0930", // Wednesday - "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", // Thursday - "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", // Friday - "\u0936\u0928\u093f\u0935\u093e\u0930" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u0930\u0935\u093f", // abb Sunday - "\u0938\u094b\u092e", // abb Monday - "\u092e\u0902\u0917\u0932", // abb Tuesday - "\u092c\u0941\u0927", // abb Wednesday - "\u0917\u0941\u0930\u0941", // abb Thursday - "\u0936\u0941\u0915\u094d\u0930", // abb Friday - "\u0936\u0928\u093f" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u0930", - "\u0938\u094b", - "\u092e\u0902", - "\u092c\u0941", - "\u0917\u0941", - "\u0936\u0941", - "\u0936", - } - }, - { "AmPmMarkers", - new String[] { - "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928", // am marker - "\u0905\u092a\u0930\u093e\u0939\u094d\u0928" // pm marker - } - }, - { "Eras", - new String[] { // era strings - "\u0908\u0938\u093e\u092a\u0942\u0930\u094d\u0935", - "\u0938\u0928" - } - }, - { "short.Eras", - new String[] { - "\u0908\u0938\u093e\u092a\u0942\u0930\u094d\u0935", - "\u0938\u0928", - } - }, - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "\u0966", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", // full time pattern - "h:mm:ss a z", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM, yyyy", // full date pattern - "d MMMM, yyyy", // long date pattern - "d MMM, yyyy", // medium date pattern - "d/M/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java deleted file mode 100644 index 2446a856edd..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_hr extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras ={ - "prije R.O.C.", - "R.O.C.", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "sije\u010dnja", - "velja\u010de", - "o\u017eujka", - "travnja", - "svibnja", - "lipnja", - "srpnja", - "kolovoza", - "rujna", - "listopada", - "studenoga", - "prosinca", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "sije\u010danj", // january - "velja\u010da", // february - "o\u017eujak", // march - "travanj", // april - "svibanj", // may - "lipanj", // june - "srpanj", // july - "kolovoz", // august - "rujan", // september - "listopad", // october - "studeni", // november - "prosinac", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "sij", - "velj", - "o\u017eu", - "tra", - "svi", - "lip", - "srp", - "kol", - "ruj", - "lis", - "stu", - "pro", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "sij", // abb january - "vel", // abb february - "o\u017eu", // abb march - "tra", // abb april - "svi", // abb may - "lip", // abb june - "srp", // abb july - "kol", // abb august - "ruj", // abb september - "lis", // abb october - "stu", // abb november - "pro", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "1.", - "2.", - "3.", - "4.", - "5.", - "6.", - "7.", - "8.", - "9.", - "10.", - "11.", - "12.", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "1.", - "2.", - "3.", - "4.", - "5.", - "6.", - "7.", - "8.", - "9.", - "10.", - "11.", - "12.", - "", - } - }, - { "DayNames", - new String[] { - "nedjelja", // Sunday - "ponedjeljak", // Monday - "utorak", // Tuesday - "srijeda", // Wednesday - "\u010detvrtak", // Thursday - "petak", // Friday - "subota" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "nedjelja", - "ponedjeljak", - "utorak", - "srijeda", - "\u010detvrtak", - "petak", - "subota", - } - }, - { "DayAbbreviations", - new String[] { - "ned", // abb Sunday - "pon", // abb Monday - "uto", // abb Tuesday - "sri", // abb Wednesday - "\u010det", // abb Thursday - "pet", // abb Friday - "sub" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "ned", - "pon", - "uto", - "sri", - "\u010det", - "pet", - "sub", - } - }, - { "DayNarrows", - new String[] { - "N", - "P", - "U", - "S", - "\u010c", - "P", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "n", - "p", - "u", - "s", - "\u010d", - "p", - "s", - } - }, - { "Eras", - new String[] { - "Prije Krista", - "Poslije Krista", - } - }, - { "short.Eras", - new String[] { - "p. n. e.", - "A. D.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy. MMMM dd", // full date pattern - "yyyy. MMMM dd", // long date pattern - "yyyy.MM.dd", // medium date pattern - "yyyy.MM.dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java deleted file mode 100644 index 25bfbc3aea1..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_hr_HR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.##;-\u00A4 #,##0.##", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy. MMMM dd", // full date pattern - "yyyy. MMMM dd", // long date pattern - "dd.MM.yyyy.", // medium date pattern - "dd.MM.yy.", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java deleted file mode 100644 index 5ca61a9d081..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_hu extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "janu\u00e1r", // january - "febru\u00e1r", // february - "m\u00e1rcius", // march - "\u00e1prilis", // april - "m\u00e1jus", // may - "j\u00fanius", // june - "j\u00falius", // july - "augusztus", // august - "szeptember", // september - "okt\u00f3ber", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "janu\u00e1r", - "febru\u00e1r", - "m\u00e1rcius", - "\u00e1prilis", - "m\u00e1jus", - "j\u00fanius", - "j\u00falius", - "augusztus", - "szeptember", - "okt\u00f3ber", - "november", - "december", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "jan.", // abb january - "febr.", // abb february - "m\u00e1rc.", // abb march - "\u00e1pr.", // abb april - "m\u00e1j.", // abb may - "j\u00fan.", // abb june - "j\u00fal.", // abb july - "aug.", // abb august - "szept.", // abb september - "okt.", // abb october - "nov.", // abb november - "dec.", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan.", - "febr.", - "m\u00e1rc.", - "\u00e1pr.", - "m\u00e1j.", - "j\u00fan.", - "j\u00fal.", - "aug.", - "szept.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "\u00c1", - "M", - "J", - "J", - "A", - "Sz", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "J", - "F", - "M", - "\u00c1", - "M", - "J", - "J", - "A", - "Sz", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "vas\u00e1rnap", // Sunday - "h\u00e9tf\u0151", // Monday - "kedd", // Tuesday - "szerda", // Wednesday - "cs\u00fct\u00f6rt\u00f6k", // Thursday - "p\u00e9ntek", // Friday - "szombat" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "vas\u00e1rnap", - "h\u00e9tf\u0151", - "kedd", - "szerda", - "cs\u00fct\u00f6rt\u00f6k", - "p\u00e9ntek", - "szombat", - } - }, - { "DayAbbreviations", - new String[] { - "V", // abb Sunday - "H", // abb Monday - "K", // abb Tuesday - "Sze", // abb Wednesday - "Cs", // abb Thursday - "P", // abb Friday - "Szo" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "V", - "H", - "K", - "Sze", - "Cs", - "P", - "Szo", - } - }, - { "DayNarrows", - new String[] { - "V", - "H", - "K", - "Sz", - "Cs", - "P", - "Sz", - } - }, - { "standalone.DayNarrows", - new String[] { - "V", - "H", - "K", - "Sz", - "Cs", - "P", - "Sz", - } - }, - { "AmPmMarkers", - new String[] { - "DE", // am marker - "DU" // pm marker - } - }, - { "Eras", - new String[] { // era strings - "i.e.", - "i.u." - } - }, - { "short.Eras", - new String[] { - "i. e.", - "i. sz.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy. MMMM d.", // full date pattern - "yyyy. MMMM d.", // long date pattern - "yyyy.MM.dd.", // medium date pattern - "yyyy.MM.dd.", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - { "buddhist.Eras", - new String[] { - "BC", - "BK", - } - }, - { "buddhist.short.Eras", - new String[] { - "BC", - "BK", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java deleted file mode 100644 index 4ef26559c6d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_hu_HU extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id.java deleted file mode 100644 index c816077942a..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_id extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Januari", - "Februari", - "Maret", - "April", - "Mei", - "Juni", - "Juli", - "Agustus", - "September", - "Oktober", - "November", - "Desember", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Jan", - "Feb", - "Mar", - "Apr", - "Mei", - "Jun", - "Jul", - "Agu", - "Sep", - "Okt", - "Nov", - "Des", - "", - } - }, - { "DayNames", - new String[] { - "Minggu", - "Senin", - "Selasa", - "Rabu", - "Kamis", - "Jumat", - "Sabtu", - } - }, - { "DayAbbreviations", - new String[] { - "Min", - "Sen", - "Sel", - "Rab", - "Kam", - "Jum", - "Sab", - } - }, - { "Eras", - new String[] { - "BCE", - "CE", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ",", - ".", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy MMMM dd", - "yyyy MMMM d", - "yyyy MMM d", - "yy/MM/dd", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id_ID.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id_ID.java deleted file mode 100644 index ed3b6c77dce..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_id_ID.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_id_ID extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "H:mm:ss", - "H:mm:ss", - "H:mm:ss", - "H:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yy", - "dd/MM/yy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java deleted file mode 100644 index d381c6b621e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_is extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "jan\u00faar", // january - "febr\u00faar", // february - "mars", // march - "apr\u00edl", // april - "ma\u00ed", // may - "j\u00fan\u00ed", // june - "j\u00fal\u00ed", // july - "\u00e1g\u00fast", // august - "september", // september - "okt\u00f3ber", // october - "n\u00f3vember", // november - "desember", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan.", // abb january - "feb.", // abb february - "mar.", // abb march - "apr.", // abb april - "ma\u00ed", // abb may - "j\u00fan.", // abb june - "j\u00fal.", // abb july - "\u00e1g\u00fa.", // abb august - "sep.", // abb september - "okt.", // abb october - "n\u00f3v.", // abb november - "des.", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "\u00c1", - "L", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "\u00e1", - "s", - "o", - "n", - "d", - "", - } - }, - { "DayNames", - new String[] { - "sunnudagur", // Sunday - "m\u00e1nudagur", // Monday - "\u00feri\u00f0judagur", // Tuesday - "mi\u00f0vikudagur", // Wednesday - "fimmtudagur", // Thursday - "f\u00f6studagur", // Friday - "laugardagur" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "sun.", // abb Sunday - "m\u00e1n.", // abb Monday - "\u00feri.", // abb Tuesday - "mi\u00f0.", // abb Wednesday - "fim.", // abb Thursday - "f\u00f6s.", // abb Friday - "lau." // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "\u00de", - "M", - "F", - "F", - "L", - } - }, - { "standalone.DayNarrows", - new String[] { - "s", - "m", - "\u00fe", - "m", - "f", - "f", - "l", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java deleted file mode 100644 index 1410c13ac31..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_is_IS extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0. \u00A4;-#,##0. \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java deleted file mode 100644 index d765f3e9ec4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_it extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "gennaio", // january - "febbraio", // february - "marzo", // march - "aprile", // april - "maggio", // may - "giugno", // june - "luglio", // july - "agosto", // august - "settembre", // september - "ottobre", // october - "novembre", // november - "dicembre", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "Gennaio", - "Febbraio", - "Marzo", - "Aprile", - "Maggio", - "Giugno", - "Luglio", - "Agosto", - "Settembre", - "Ottobre", - "Novembre", - "Dicembre", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "gen", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "mag", // abb may - "giu", // abb june - "lug", // abb july - "ago", // abb august - "set", // abb september - "ott", // abb october - "nov", // abb november - "dic", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "G", - "F", - "M", - "A", - "M", - "G", - "L", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "G", - "F", - "M", - "A", - "M", - "G", - "L", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "domenica", // Sunday - "luned\u00ec", // Monday - "marted\u00ec", // Tuesday - "mercoled\u00ec", // Wednesday - "gioved\u00ec", // Thursday - "venerd\u00ec", // Friday - "sabato" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "Domenica", - "Luned\u00ec", - "Marted\u00ec", - "Mercoled\u00ec", - "Gioved\u00ec", - "Venerd\u00ec", - "Sabato", - } - }, - { "DayAbbreviations", - new String[] { - "dom", // abb Sunday - "lun", // abb Monday - "mar", // abb Tuesday - "mer", // abb Wednesday - "gio", // abb Thursday - "ven", // abb Friday - "sab" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "D", - "L", - "M", - "M", - "G", - "V", - "S", - } - }, - { "Eras", - new String[] { // era strings - "BC", - "dopo Cristo" - } - }, - { "short.Eras", - new String[] { - "aC", - "dC", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H.mm.ss z", // full time pattern - "H.mm.ss z", // long time pattern - "H.mm.ss", // medium time pattern - "H.mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d-MMM-yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java deleted file mode 100644 index 2962e07d1a4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_it_CH extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "NumberElements", - new String[] { - ".", // decimal separator - "'", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H.mm' h' z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "d-MMM-yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java deleted file mode 100644 index cf206442197..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_it_IT extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;-\u00A4 #,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java index 61df7263f69..fe210146db8 100644 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, 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 @@ -84,169 +84,12 @@ public class FormatData_ja extends ParallelListResourceBundle { */ @Override protected final Object[][] getContents() { - // era strings for Japanese imperial calendar - final String[] japaneseEras = { - "\u897f\u66a6", // Seireki (Gregorian) - "\u660e\u6cbb", // Meiji - "\u5927\u6b63", // Taisho - "\u662d\u548c", // Showa - "\u5e73\u6210", // Heisei - "\u4ee4\u548c", // Reiwa - }; - final String[] rocEras = { - "\u6c11\u56fd\u524d", - "\u6c11\u56fd", - }; - final String[] gregoryEras = { - "\u7d00\u5143\u524d", - "\u897f\u66a6", - }; return new Object[][] { - { "MonthNames", - new String[] { - "1\u6708", // january - "2\u6708", // february - "3\u6708", // march - "4\u6708", // april - "5\u6708", // may - "6\u6708", // june - "7\u6708", // july - "8\u6708", // august - "9\u6708", // september - "10\u6708", // october - "11\u6708", // november - "12\u6708", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "1", // abb january - "2", // abb february - "3", // abb march - "4", // abb april - "5", // abb may - "6", // abb june - "7", // abb july - "8", // abb august - "9", // abb september - "10", // abb october - "11", // abb november - "12", // abb december - "" // abb month 13 if applicable - } - }, - { "DayNames", - new String[] { - "\u65e5\u66dc\u65e5", // Sunday - "\u6708\u66dc\u65e5", // Monday - "\u706b\u66dc\u65e5", // Tuesday - "\u6c34\u66dc\u65e5", // Wednesday - "\u6728\u66dc\u65e5", // Thursday - "\u91d1\u66dc\u65e5", // Friday - "\u571f\u66dc\u65e5" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u65e5", // abb Sunday - "\u6708", // abb Monday - "\u706b", // abb Tuesday - "\u6c34", // abb Wednesday - "\u6728", // abb Thursday - "\u91d1", // abb Friday - "\u571f" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u65e5", - "\u6708", - "\u706b", - "\u6c34", - "\u6728", - "\u91d1", - "\u571f", - } - }, - { "AmPmMarkers", - new String[] { - "\u5348\u524d", // am marker - "\u5348\u5f8c" // pm marker - } - }, - { "Eras", gregoryEras }, - { "short.Eras", gregoryEras }, - { "buddhist.Eras", - new String[] { // era strings for Thai Buddhist calendar - "\u7d00\u5143\u524d", // Kigenzen - "\u4ecf\u66a6", // Butsureki - } - }, - { "japanese.Eras", japaneseEras }, { "japanese.FirstYear", new String[] { // first year name "\u5143", // "Gan"-nen } }, - { "NumberElements", - new String[] { - ".", // decimal separator - ",", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H'\u6642'mm'\u5206'ss'\u79d2' z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy'\u5e74'M'\u6708'd'\u65e5'", // full date pattern - "yyyy/MM/dd", // long date pattern - "yyyy/MM/dd", // medium date pattern - "yy/MM/dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "japanese.DatePatterns", - new String[] { - "GGGGyyyy'\u5e74'M'\u6708'd'\u65e5'", // full date pattern - "Gy.MM.dd", // long date pattern - "Gy.MM.dd", // medium date pattern - "Gy.MM.dd", // short date pattern - } - }, - { "japanese.TimePatterns", - new String[] { - "H'\u6642'mm'\u5206'ss'\u79d2' z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "japanese.DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, }; } } diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java deleted file mode 100644 index 291fc038cf6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ja_JP extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0;-\u00A4#,##0", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java deleted file mode 100644 index e9d6a0e955d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ko extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "\uc911\ud654\ubbfc\uad6d\uc804", - "\uc911\ud654\ubbfc\uad6d", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "1\uc6d4", // january - "2\uc6d4", // february - "3\uc6d4", // march - "4\uc6d4", // april - "5\uc6d4", // may - "6\uc6d4", // june - "7\uc6d4", // july - "8\uc6d4", // august - "9\uc6d4", // september - "10\uc6d4", // october - "11\uc6d4", // november - "12\uc6d4", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "1\uc6d4", // abb january - "2\uc6d4", // abb february - "3\uc6d4", // abb march - "4\uc6d4", // abb april - "5\uc6d4", // abb may - "6\uc6d4", // abb june - "7\uc6d4", // abb july - "8\uc6d4", // abb august - "9\uc6d4", // abb september - "10\uc6d4", // abb october - "11\uc6d4", // abb november - "12\uc6d4", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "1\uc6d4", - "2\uc6d4", - "3\uc6d4", - "4\uc6d4", - "5\uc6d4", - "6\uc6d4", - "7\uc6d4", - "8\uc6d4", - "9\uc6d4", - "10\uc6d4", - "11\uc6d4", - "12\uc6d4", - "", - } - }, - { "DayNames", - new String[] { - "\uc77c\uc694\uc77c", // Sunday - "\uc6d4\uc694\uc77c", // Monday - "\ud654\uc694\uc77c", // Tuesday - "\uc218\uc694\uc77c", // Wednesday - "\ubaa9\uc694\uc77c", // Thursday - "\uae08\uc694\uc77c", // Friday - "\ud1a0\uc694\uc77c" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\uc77c", // abb Sunday - "\uc6d4", // abb Monday - "\ud654", // abb Tuesday - "\uc218", // abb Wednesday - "\ubaa9", // abb Thursday - "\uae08", // abb Friday - "\ud1a0" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\uc77c", - "\uc6d4", - "\ud654", - "\uc218", - "\ubaa9", - "\uae08", - "\ud1a0", - } - }, - { "Eras", - new String[] { - "\uae30\uc6d0\uc804", - "\uc11c\uae30", - } - }, - { "buddhist.Eras", - new String[] { - "BC", - "\ubd88\uae30", - } - }, - { "japanese.Eras", - new String[] { - "\uc11c\uae30", - "\uba54\uc774\uc9c0", - "\ub2e4\uc774\uc1fc", - "\uc1fc\uc640", - "\ud5e4\uc774\uc138\uc774", - "\ub808\uc774\uc640", - } - }, - { "AmPmMarkers", - new String[] { - "\uc624\uc804", // am marker - "\uc624\ud6c4" // pm marker - } - }, - { "TimePatterns", - new String[] { - "a h'\uc2dc' mm'\ubd84' ss'\ucd08' z", // full time pattern - "a h'\uc2dc' mm'\ubd84' ss'\ucd08'", // long time pattern - "a h:mm:ss", // medium time pattern - "a h:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy'\ub144' M'\uc6d4' d'\uc77c' EEEE", // full date pattern - "yyyy'\ub144' M'\uc6d4' d'\uc77c' '('EE')'", // long date pattern - "yyyy. M. d", // medium date pattern - "yy. M. d", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "buddhist.DatePatterns", - new String[] { - "GGGG y\ub144 M\uc6d4 d\uc77c EEEE", - "GGGG y\ub144 M\uc6d4 d\uc77c", - "GGGG y. M. d", - "GGGG y. M. d", - } - }, - { "japanese.DatePatterns", - new String[] { - "GGGG y\ub144 M\uc6d4 d\uc77c EEEE", - "GGGG y\ub144 M\uc6d4 d\uc77c", - "GGGG y. M. d", - "GGGG y. M. d", - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java deleted file mode 100644 index 4cfb78e7b52..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ko_KR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0;-\u00A4#,##0", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java deleted file mode 100644 index 954689b58b6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java +++ /dev/null @@ -1,306 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_lt extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "sausio", - "vasaris", - "kovas", - "balandis", - "gegu\u017e\u0117", - "bir\u017eelis", - "liepa", - "rugpj\u016btis", - "rugs\u0117jis", - "spalis", - "lapkritis", - "gruodis", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "Sausio", // january - "Vasario", // february - "Kovo", // march - "Baland\u017eio", // april - "Gegu\u017e\u0117s", // may - "Bir\u017eelio", // june - "Liepos", // july - "Rugpj\u016b\u010dio", // august - "Rugs\u0117jo", // september - "Spalio", // october - "Lapkri\u010dio", // november - "Gruod\u017eio", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "Sau", // abb january - "Vas", // abb february - "Kov", // abb march - "Bal", // abb april - "Geg", // abb may - "Bir", // abb june - "Lie", // abb july - "Rgp", // abb august - "Rgs", // abb september - "Spa", // abb october - "Lap", // abb november - "Grd", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "Saus.", - "Vas.", - "Kov.", - "Bal.", - "Geg.", - "Bir.", - "Liep.", - "Rugp.", - "Rugs.", - "Spal.", - "Lapkr.", - "Gruod.", - "", - } - }, - { "MonthNarrows", - new String[] { - "S", - "V", - "K", - "B", - "G", - "B", - "L", - "R", - "R", - "S", - "L", - "G", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "S", - "V", - "K", - "B", - "G", - "B", - "L", - "R", - "R", - "S", - "L", - "G", - "", - } - }, - { "DayNames", - new String[] { - "Sekmadienis", // Sunday - "Pirmadienis", // Monday - "Antradienis", // Tuesday - "Tre\u010diadienis", // Wednesday - "Ketvirtadienis", // Thursday - "Penktadienis", // Friday - "\u0160e\u0161tadienis" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "sekmadienis", - "pirmadienis", - "antradienis", - "tre\u010diadienis", - "ketvirtadienis", - "penktadienis", - "\u0161e\u0161tadienis", - } - }, - { "DayAbbreviations", - new String[] { - "Sk", // abb Sunday - "Pr", // abb Monday - "An", // abb Tuesday - "Tr", // abb Wednesday - "Kt", // abb Thursday - "Pn", // abb Friday - "\u0160t" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "Sk", - "Pr", - "An", - "Tr", - "Kt", - "Pn", - "\u0160t", - } - }, - { "DayNarrows", - new String[] { - "S", - "P", - "A", - "T", - "K", - "P", - "\u0160", - } - }, - { "standalone.DayNarrows", - new String[] { - "S", - "P", - "A", - "T", - "K", - "P", - "\u0160", - } - }, - { "Eras", - new String[] { // era strings - "pr.Kr.", - "po.Kr." - } - }, - { "short.Eras", - new String[] { - "pr. Kr.", - "po Kr.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH.mm.ss z", // full time pattern - "HH.mm.ss z", // long time pattern - "HH.mm.ss", // medium time pattern - "HH.mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy, MMMM d", // full date pattern - "EEEE, yyyy, MMMM d", // long date pattern - "yyyy-MM-dd", // medium date pattern - "yy.M.d", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java deleted file mode 100644 index 128c46300f1..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_lt_LT extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "##,##0.##;-##,##0.##", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java deleted file mode 100644 index da06b0e94a5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_lv extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "janv\u0101ris", // january - "febru\u0101ris", // february - "marts", // march - "apr\u012blis", // april - "maijs", // may - "j\u016bnijs", // june - "j\u016blijs", // july - "augusts", // august - "septembris", // september - "oktobris", // october - "novembris", // november - "decembris", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "janv.", - "febr.", - "marts", - "apr.", - "maijs", - "j\u016bn.", - "j\u016bl.", - "aug.", - "sept.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "Jan", // abb january - "Feb", // abb february - "Mar", // abb march - "Apr", // abb april - "Maijs", // abb may - "J\u016bn", // abb june - "J\u016bl", // abb july - "Aug", // abb august - "Sep", // abb september - "Okt", // abb october - "Nov", // abb november - "Dec", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "sv\u0113tdiena", // Sunday - "pirmdiena", // Monday - "otrdiena", // Tuesday - "tre\u0161diena", // Wednesday - "ceturtdiena", // Thursday - "piektdiena", // Friday - "sestdiena" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "Sv", // abb Sunday - "P", // abb Monday - "O", // abb Tuesday - "T", // abb Wednesday - "C", // abb Thursday - "Pk", // abb Friday - "S" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "S", - "P", - "O", - "T", - "C", - "P", - "S", - } - }, - { "Eras", - new String[] { // era strings - "pm\u0113", - "m\u0113" - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy, d MMMM", // full date pattern - "EEEE, yyyy, d MMMM", // long date pattern - "yyyy.d.M", // medium date pattern - "yy.d.M", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java deleted file mode 100644 index 9db535ec8b4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_lv_LV extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java deleted file mode 100644 index 34bd4d19c71..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_mk extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0458\u0430\u043d\u0443\u0430\u0440\u0438", // january - "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", // february - "\u043c\u0430\u0440\u0442", // march - "\u0430\u043f\u0440\u0438\u043b", // april - "\u043c\u0430\u0458", // may - "\u0458\u0443\u043d\u0438", // june - "\u0458\u0443\u043b\u0438", // july - "\u0430\u0432\u0433\u0443\u0441\u0442", // august - "\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438", // september - "\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438", // october - "\u043d\u043e\u0435\u043c\u0432\u0440\u0438", // november - "\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0458\u0430\u043d.", // abb january - "\u0444\u0435\u0432.", // abb february - "\u043c\u0430\u0440.", // abb march - "\u0430\u043f\u0440.", // abb april - "\u043c\u0430\u0458.", // abb may - "\u0458\u0443\u043d.", // abb june - "\u0458\u0443\u043b.", // abb july - "\u0430\u0432\u0433.", // abb august - "\u0441\u0435\u043f\u0442.", // abb september - "\u043e\u043a\u0442.", // abb october - "\u043d\u043e\u0435\u043c.", // abb november - "\u0434\u0435\u043a\u0435\u043c.", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u0458", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u0458", - "\u0458", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "DayNames", - new String[] { - "\u043d\u0435\u0434\u0435\u043b\u0430", // Sunday - "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a", // Monday - "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", // Tuesday - "\u0441\u0440\u0435\u0434\u0430", // Wednesday - "\u0447\u0435\u0442\u0432\u0440\u0442\u043e\u043a", // Thursday - "\u043f\u0435\u0442\u043e\u043a", // Friday - "\u0441\u0430\u0431\u043e\u0442\u0430" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u043d\u0435\u0434.", // abb Sunday - "\u043f\u043e\u043d.", // abb Monday - "\u0432\u0442.", // abb Tuesday - "\u0441\u0440\u0435.", // abb Wednesday - "\u0447\u0435\u0442.", // abb Thursday - "\u043f\u0435\u0442.", // abb Friday - "\u0441\u0430\u0431." // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u043d", - "\u043f", - "\u0432", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - } - }, - { "Eras", - new String[] { // era strings - "\u043f\u0440.\u043d.\u0435.", - "\u0430\u0435." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d, MMMM yyyy", // full date pattern - "d, MMMM yyyy", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java deleted file mode 100644 index 481eaea1e45..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_mk_MK extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;(#,##0.###)", // decimal pattern - "\u00A4 #,##0.##;-\u00A4 #,##0.##", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java deleted file mode 100644 index c66b2c2340b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ms extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Januari", - "Februari", - "Mac", - "April", - "Mei", - "Jun", - "Julai", - "Ogos", - "September", - "Oktober", - "November", - "Disember", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Jan", - "Feb", - "Mac", - "Apr", - "Mei", - "Jun", - "Jul", - "Ogos", - "Sep", - "Okt", - "Nov", - "Dis", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "O", - "S", - "O", - "N", - "D", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "O", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "O", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "Ahad", - "Isnin", - "Selasa", - "Rabu", - "Khamis", - "Jumaat", - "Sabtu", - } - }, - { "DayAbbreviations", - new String[] { - "Ahd", - "Isn", - "Sel", - "Rab", - "Kha", - "Jum", - "Sab", - } - }, - { "DayNarrows", - new String[] { - "A", - "I", - "S", - "R", - "K", - "J", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "A", - "I", - "S", - "R", - "K", - "J", - "S", - } - }, - { "Eras", - new String[] { - "BCE", - "CE", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4 #,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy MMMM dd", - "yyyy MMMM d", - "yyyy MMM d", - "yy/MM/dd", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java deleted file mode 100644 index c6bf88a45cf..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ms_MY extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00;(\u00a4#,##0.00)", - "#,##0%", - } - }, - { "TimePatterns", - new String[] { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE dd MMM yyyy", - "dd MMMM yyyy", - "dd MMMM yyyy", - "dd/MM/yyyy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java deleted file mode 100644 index 20b1efa207d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_mt extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Jannar", - "Frar", - "Marzu", - "April", - "Mejju", - "\u0120unju", - "Lulju", - "Awwissu", - "Settembru", - "Ottubru", - "Novembru", - "Di\u010bembru", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Jan", - "Fra", - "Mar", - "Apr", - "Mej", - "\u0120un", - "Lul", - "Aww", - "Set", - "Ott", - "Nov", - "Di\u010b", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "\u0120", - "L", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "Il-\u0126add", - "It-Tnejn", - "It-Tlieta", - "L-Erbg\u0127a", - "Il-\u0126amis", - "Il-\u0120img\u0127a", - "Is-Sibt", - } - }, - { "DayAbbreviations", - new String[] { - "\u0126ad", - "Tne", - "Tli", - "Erb", - "\u0126am", - "\u0120im", - "Sib", - } - }, - { "DayNarrows", - new String[] { - "\u0126", - "T", - "T", - "E", - "\u0126", - "\u0120", - "S", - } - }, - { "AmPmMarkers", - new String[] { - "QN", - "WN", - } - }, - { "Eras", - new String[] { - "QK", - "WK", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4 #,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, d 'ta\u2019' MMMM yyyy", - "d 'ta\u2019' MMMM yyyy", - "dd MMM yyyy", - "dd/MM/yyyy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java deleted file mode 100644 index cbbd356235a..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_mt_MT extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java deleted file mode 100644 index f433220c994..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_nl extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januari", // january - "februari", // february - "maart", // march - "april", // april - "mei", // may - "juni", // june - "juli", // july - "augustus", // august - "september", // september - "oktober", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mrt", // abb march - "apr", // abb april - "mei", // abb may - "jun", // abb june - "jul", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "dec", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "zondag", // Sunday - "maandag", // Monday - "dinsdag", // Tuesday - "woensdag", // Wednesday - "donderdag", // Thursday - "vrijdag", // Friday - "zaterdag" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "zo", // abb Sunday - "ma", // abb Monday - "di", // abb Tuesday - "wo", // abb Wednesday - "do", // abb Thursday - "vr", // abb Friday - "za" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "Z", - "M", - "D", - "W", - "D", - "V", - "Z", - } - }, - { "Eras", - new String[] { // era strings for GregorianCalendar - "v. Chr.", - "n. Chr." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousandsnds) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss' uur' z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d-MMM-yyyy", // medium date pattern - "d-M-yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java deleted file mode 100644 index 191619a4005..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_nl_BE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "H.mm' u. 'z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d-MMM-yyyy", // medium date pattern - "d/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java deleted file mode 100644 index ecfa1f5ee95..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_nl_NL extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4 #,##0.00-", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java deleted file mode 100644 index 0f99dd39fb5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_no extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januar", // january - "februar", // february - "mars", // march - "april", // april - "mai", // may - "juni", // june - "juli", // july - "august", // august - "september", // september - "oktober", // october - "november", // november - "desember", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "mai", // abb may - "jun", // abb june - "jul", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "des", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "mai", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "des", - "", - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "s\u00f8ndag", // Sunday - "mandag", // Monday - "tirsdag", // Tuesday - "onsdag", // Wednesday - "torsdag", // Thursday - "fredag", // Friday - "l\u00f8rdag" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "s\u00f8ndag", - "mandag", - "tirsdag", - "onsdag", - "torsdag", - "fredag", - "l\u00f8rdag", - } - }, - { "DayAbbreviations", - new String[] { - "s\u00f8", // abb Sunday - "ma", // abb Monday - "ti", // abb Tuesday - "on", // abb Wednesday - "to", // abb Thursday - "fr", // abb Friday - "l\u00f8" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "s\u00f8.", - "ma.", - "ti.", - "on.", - "to.", - "fr.", - "l\u00f8.", - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - } - }, - { "standalone.DayNarrows", - new String[] { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "'kl 'HH.mm z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "dd.MMM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java deleted file mode 100644 index f182cfac339..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_no_NO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;\u00A4 -#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java deleted file mode 100644 index c14c28a447b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_no_NO_NY extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januar", // january - "februar", // february - "mars", // march - "april", // april - "mai", // may - "juni", // june - "juli", // july - "august", // august - "september", // september - "oktober", // october - "november", // november - "desember", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "mai", // abb may - "jun", // abb june - "jul", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "des", // abb december - "" // abb month 13 if applicable - } - }, - { "DayNames", - new String[] { - "sundag", // Sunday - "m\u00e5ndag", // Monday - "tysdag", // Tuesday - "onsdag", // Wednesday - "torsdag", // Thursday - "fredag", // Friday - "laurdag" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "su", // abb Sunday - "m\u00e5", // abb Monday - "ty", // abb Tuesday - "on", // abb Wednesday - "to", // abb Thursday - "fr", // abb Friday - "lau" // abb Saturday - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "'kl 'HH.mm z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d. MMMM yyyy", // full date pattern - "d. MMMM yyyy", // long date pattern - "dd.MMM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java deleted file mode 100644 index 75c0ced1618..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_pl extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "stycznia", - "lutego", - "marca", - "kwietnia", - "maja", - "czerwca", - "lipca", - "sierpnia", - "wrze\u015bnia", - "pa\u017adziernika", - "listopada", - "grudnia", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "stycze\u0144", // january - "luty", // february - "marzec", // march - "kwiecie\u0144", // april - "maj", // may - "czerwiec", // june - "lipiec", // july - "sierpie\u0144", // august - "wrzesie\u0144", // september - "pa\u017adziernik", // october - "listopad", // november - "grudzie\u0144", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "sty", // abb january - "lut", // abb february - "mar", // abb march - "kwi", // abb april - "maj", // abb may - "cze", // abb june - "lip", // abb july - "sie", // abb august - "wrz", // abb september - "pa\u017a", // abb october - "lis", // abb november - "gru", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "sty", - "lut", - "mar", - "kwi", - "maj", - "cze", - "lip", - "sie", - "wrz", - "pa\u017a", - "lis", - "gru", - "", - } - }, - { "MonthNarrows", - new String[] { - "s", - "l", - "m", - "k", - "m", - "c", - "l", - "s", - "w", - "p", - "l", - "g", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "s", - "l", - "m", - "k", - "m", - "c", - "l", - "s", - "w", - "p", - "l", - "g", - "", - } - }, - { "DayNames", - new String[] { - "niedziela", // Sunday - "poniedzia\u0142ek", // Monday - "wtorek", // Tuesday - "\u015broda", // Wednesday - "czwartek", // Thursday - "pi\u0105tek", // Friday - "sobota" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "niedziela", - "poniedzia\u0142ek", - "wtorek", - "\u015broda", - "czwartek", - "pi\u0105tek", - "sobota", - } - }, - { "DayAbbreviations", - new String[] { - "N", // abb Sunday - "Pn", // abb Monday - "Wt", // abb Tuesday - "\u015ar", // abb Wednesday - "Cz", // abb Thursday - "Pt", // abb Friday - "So" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "niedz.", - "pon.", - "wt.", - "\u015br.", - "czw.", - "pt.", - "sob.", - } - }, - { "DayNarrows", - new String[] { - "N", - "P", - "W", - "\u015a", - "C", - "P", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "N", - "P", - "W", - "\u015a", - "C", - "P", - "S", - } - }, - { "Eras", - new String[] { // era strings - "p.n.e.", - "n.e." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "yyyy-MM-dd", // medium date pattern - "yy-MM-dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java deleted file mode 100644 index 8b06f7d7919..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_pl_PL extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "yyyy-MM-dd", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - } - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java deleted file mode 100644 index e086106edf0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_pt extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Janeiro", // january - "Fevereiro", // february - "Mar\u00e7o", // march - "Abril", // april - "Maio", // may - "Junho", // june - "Julho", // july - "Agosto", // august - "Setembro", // september - "Outubro", // october - "Novembro", // november - "Dezembro", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan", // abb january - "fev", // abb february - "mar", // abb march - "abr", // abb april - "mai", // abb may - "jun", // abb june - "jul", // abb july - "ago", // abb august - "set", // abb september - "out", // abb october - "nov", // abb november - "dez", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "Domingo", // Sunday - "Segunda-feira", // Monday - "Ter\u00e7a-feira", // Tuesday - "Quarta-feira", // Wednesday - "Quinta-feira", // Thursday - "Sexta-feira", // Friday - "S\u00e1bado" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "Dom", // abb Sunday - "Seg", // abb Monday - "Ter", // abb Tuesday - "Qua", // abb Wednesday - "Qui", // abb Thursday - "Sex", // abb Friday - "S\u00e1b" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "D", - "S", - "T", - "Q", - "Q", - "S", - "S", - } - }, - { "long.Eras", - new String[] { - "Antes de Cristo", - "Ano do Senhor", - } - }, - { "Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "NumberElements", - new String[] { - ",", // decimal al separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH'H'mm'm' z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "d/MMM/yyyy", // medium date pattern - "dd-MM-yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java deleted file mode 100644 index e1d48eb7b70..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_pt_BR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.00;-\u00A4 #,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "HH'h'mm'min'ss's' z", // full time pattern - "H'h'm'min's's' z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d' de 'MMMM' de 'yyyy", // full date pattern - "d' de 'MMMM' de 'yyyy", // long date pattern - "dd/MM/yyyy", // medium date pattern - "dd/MM/yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java deleted file mode 100644 index 6abd5140411..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_pt_PT extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java deleted file mode 100644 index cab5053f93d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ro extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "ianuarie", // january - "februarie", // february - "martie", // march - "aprilie", // april - "mai", // may - "iunie", // june - "iulie", // july - "august", // august - "septembrie", // september - "octombrie", // october - "noiembrie", // november - "decembrie", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "ianuarie", - "februarie", - "martie", - "aprilie", - "mai", - "iunie", - "iulie", - "august", - "septembrie", - "octombrie", - "noiembrie", - "decembrie", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Ian", // abb january - "Feb", // abb february - "Mar", // abb march - "Apr", // abb april - "Mai", // abb may - "Iun", // abb june - "Iul", // abb july - "Aug", // abb august - "Sep", // abb september - "Oct", // abb october - "Nov", // abb november - "Dec", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "ian.", - "feb.", - "mar.", - "apr.", - "mai", - "iun.", - "iul.", - "aug.", - "sept.", - "oct.", - "nov.", - "dec.", - "", - } - }, - { "MonthNarrows", - new String[] { - "I", - "F", - "M", - "A", - "M", - "I", - "I", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "I", - "F", - "M", - "A", - "M", - "I", - "I", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "duminic\u0103", // Sunday - "luni", // Monday - "mar\u0163i", // Tuesday - "miercuri", // Wednesday - "joi", // Thursday - "vineri", // Friday - "s\u00e2mb\u0103t\u0103" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "duminic\u0103", - "luni", - "mar\u021bi", - "miercuri", - "joi", - "vineri", - "s\u00e2mb\u0103t\u0103", - } - }, - { "DayAbbreviations", - new String[] { - "D", // abb Sunday - "L", // abb Monday - "Ma", // abb Tuesday - "Mi", // abb Wednesday - "J", // abb Thursday - "V", // abb Friday - "S" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "Du", - "Lu", - "Ma", - "Mi", - "Jo", - "Vi", - "S\u00e2", - } - }, - { "DayNarrows", - new String[] { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - } - }, - { "Eras", - new String[] { // era strings - "d.C.", - "\u00ee.d.C." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "dd MMMM yyyy", // full date pattern - "dd MMMM yyyy", // long date pattern - "dd.MM.yyyy", // medium date pattern - "dd.MM.yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java deleted file mode 100644 index 51d9d11b5f6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ro_RO extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java deleted file mode 100644 index 620ce9b1db9..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ru extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - {"MonthNames", - new String[] { - "\u044f\u043d\u0432\u0430\u0440\u044f", // january - "\u0444\u0435\u0432\u0440\u0430\u043b\u044f", // february - "\u043c\u0430\u0440\u0442\u0430", // march - "\u0430\u043f\u0440\u0435\u043b\u044f", // april - "\u043c\u0430\u044f", // may - "\u0438\u044e\u043d\u044f", // june - "\u0438\u044e\u043b\u044f", // july - "\u0430\u0432\u0433\u0443\u0441\u0442\u0430", // august - "\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f", // september - "\u043e\u043a\u0442\u044f\u0431\u0440\u044f", // october - "\u043d\u043e\u044f\u0431\u0440\u044f", // november - "\u0434\u0435\u043a\u0430\u0431\u0440\u044f", // december - "", // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "\u042f\u043d\u0432\u0430\u0440\u044c", // january - "\u0424\u0435\u0432\u0440\u0430\u043b\u044c", // february - "\u041c\u0430\u0440\u0442", // march - "\u0410\u043f\u0440\u0435\u043b\u044c", // april - "\u041c\u0430\u0439", // may - "\u0418\u044e\u043d\u044c", // june - "\u0418\u044e\u043b\u044c", // july - "\u0410\u0432\u0433\u0443\u0441\u0442", // august - "\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c", // september - "\u041e\u043a\u0442\u044f\u0431\u0440\u044c", // october - "\u041d\u043e\u044f\u0431\u0440\u044c", // november - "\u0414\u0435\u043a\u0430\u0431\u0440\u044c", // december - "", // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u044f\u043d\u0432", // abb january - "\u0444\u0435\u0432", // abb february - "\u043c\u0430\u0440", // abb march - "\u0430\u043f\u0440", // abb april - "\u043c\u0430\u044f", // abb may - "\u0438\u044e\u043d", // abb june - "\u0438\u044e\u043b", // abb july - "\u0430\u0432\u0433", // abb august - "\u0441\u0435\u043d", // abb september - "\u043e\u043a\u0442", // abb october - "\u043d\u043e\u044f", // abb november - "\u0434\u0435\u043a", // abb december - "", // month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "\u042f\u043d\u0432.", // abb january - "\u0424\u0435\u0432\u0440.", // abb february - "\u041c\u0430\u0440\u0442", // abb march - "\u0410\u043f\u0440.", // abb april - "\u041c\u0430\u0439", // abb may - "\u0418\u044e\u043d\u044c", // abb june - "\u0418\u044e\u043b\u044c", // abb july - "\u0410\u0432\u0433.", // abb august - "\u0421\u0435\u043d\u0442.", // abb september - "\u041e\u043a\u0442.", // abb october - "\u041d\u043e\u044f\u0431.", // abb november - "\u0414\u0435\u043a.", // abb december - "", // month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u042f", - "\u0424", - "\u041c", - "\u0410", - "\u041c", - "\u0418", - "\u0418", - "\u0410", - "\u0421", - "\u041e", - "\u041d", - "\u0414", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "\u042f", - "\u0424", - "\u041c", - "\u0410", - "\u041c", - "\u0418", - "\u0418", - "\u0410", - "\u0421", - "\u041e", - "\u041d", - "\u0414", - "", - } - }, - { "DayNames", - new String[] { - "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435", // Sunday - "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a", // Monday - "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", // Tuesday - "\u0441\u0440\u0435\u0434\u0430", // Wednesday - "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", // Thursday - "\u043f\u044f\u0442\u043d\u0438\u0446\u0430", // Friday - "\u0441\u0443\u0431\u0431\u043e\u0442\u0430" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "\u0412\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435", - "\u041f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a", - "\u0412\u0442\u043e\u0440\u043d\u0438\u043a", - "\u0421\u0440\u0435\u0434\u0430", - "\u0427\u0435\u0442\u0432\u0435\u0440\u0433", - "\u041f\u044f\u0442\u043d\u0438\u0446\u0430", - "\u0421\u0443\u0431\u0431\u043e\u0442\u0430", - } - }, - { "DayAbbreviations", - new String[] { - "\u0412\u0441", // abb Sunday - "\u041f\u043d", // abb Monday - "\u0412\u0442", // abb Tuesday - "\u0421\u0440", // abb Wednesday - "\u0427\u0442", // abb Thursday - "\u041f\u0442", // abb Friday - "\u0421\u0431" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "\u0412\u0441", - "\u041f\u043d", - "\u0412\u0442", - "\u0421\u0440", - "\u0427\u0442", - "\u041f\u0442", - "\u0421\u0431", - } - }, - { "DayNarrows", - new String[] { - "\u0412", - "\u041f\u043d", - "\u0412\u0442", - "\u0421", - "\u0427", - "\u041f", - "\u0421", // contributed item in CLDR - } - }, - { "standalone.DayNarrows", - new String[] { - "\u0412", - "\u041f", - "\u0412", - "\u0421", - "\u0427", - "\u041f", - "\u0421", - } - }, - { "Eras", - new String[] { // era strings - "\u0434\u043e \u043d.\u044d.", - "\u043d.\u044d." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "d MMMM yyyy '\u0433.'", // full date pattern - "d MMMM yyyy '\u0433.'", // long date pattern - "dd.MM.yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java deleted file mode 100644 index e1d26256d73..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_ru_RU extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java deleted file mode 100644 index 37bd853dfcf..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sk extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "janu\u00e1ra", - "febru\u00e1ra", - "marca", - "apr\u00edla", - "m\u00e1ja", - "j\u00fana", - "j\u00fala", - "augusta", - "septembra", - "okt\u00f3bra", - "novembra", - "decembra", - "", - } - }, - { "standalone.MonthNames", - new String[] { - "janu\u00e1r", // january - "febru\u00e1r", // february - "marec", // march - "apr\u00edl", // april - "m\u00e1j", // may - "j\u00fan", // june - "j\u00fal", // july - "august", // august - "september", // september - "okt\u00f3ber", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "m\u00e1j", - "j\u00fan", - "j\u00fal", - "aug", - "sep", - "okt", - "nov", - "dec", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "m\u00e1j", // abb may - "j\u00fan", // abb june - "j\u00fal", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "dec", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "DayNames", - new String[] { - "Nede\u013ea", // Sunday - "Pondelok", // Monday - "Utorok", // Tuesday - "Streda", // Wednesday - "\u0160tvrtok", // Thursday - "Piatok", // Friday - "Sobota" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "nede\u013ea", - "pondelok", - "utorok", - "streda", - "\u0161tvrtok", - "piatok", - "sobota", - } - }, - { "DayAbbreviations", - new String[] { - "Ne", // abb Sunday - "Po", // abb Monday - "Ut", // abb Tuesday - "St", // abb Wednesday - "\u0160t", // abb Thursday - "Pi", // abb Friday - "So" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "ne", - "po", - "ut", - "st", - "\u0161t", - "pi", - "so", - } - }, - { "DayNarrows", - new String[] { - "N", - "P", - "U", - "S", - "\u0160", - "P", - "S", - } - }, - { "standalone.DayNarrows", - new String[] { - "N", - "P", - "U", - "S", - "\u0160", - "P", - "S", - } - }, - { "Eras", - new String[] { // era strings - "pred n.l.", - "n.l." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, yyyy, MMMM d", // full date pattern - "EEEE, yyyy, MMMM d", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java deleted file mode 100644 index 05b8cc0ccba..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sk_SK extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java deleted file mode 100644 index d5f62f6c516..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sl extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januar", // january - "februar", // february - "marec", // march - "april", // april - "maj", // may - "junij", // june - "julij", // july - "avgust", // august - "september", // september - "oktober", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "maj", - "jun.", - "jul.", - "avg.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "maj", // abb may - "jun", // abb june - "jul", // abb july - "avg", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "dec", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "DayNames", - new String[] { - "Nedelja", // Sunday - "Ponedeljek", // Monday - "Torek", // Tuesday - "Sreda", // Wednesday - "\u010cetrtek", // Thursday - "Petek", // Friday - "Sobota" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "Ned", // abb Sunday - "Pon", // abb Monday - "Tor", // abb Tuesday - "Sre", // abb Wednesday - "\u010cet", // abb Thursday - "Pet", // abb Friday - "Sob" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "ned", - "pon", - "tor", - "sre", - "\u010det", - "pet", - "sob", - } - }, - { "DayNarrows", - new String[] { - "n", - "p", - "t", - "s", - "\u010d", - "p", - "s", - } - }, - { "Eras", - new String[] { // era strings - "pr.n.\u0161.", - "po Kr." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd. MMMM y", // full date pattern - "dd. MMMM y", // long date pattern - "d.M.yyyy", // medium date pattern - "d.M.y", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java deleted file mode 100644 index fbfe1a95af0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sl_SI extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4 #,##0.##;-\u00A4 #,##0.##", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java deleted file mode 100644 index d00a8d9dab6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sq extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "janar", // january - "shkurt", // february - "mars", // march - "prill", // april - "maj", // may - "qershor", // june - "korrik", // july - "gusht", // august - "shtator", // september - "tetor", // october - "n\u00ebntor", // november - "dhjetor", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "Jan", // abb january - "Shk", // abb february - "Mar", // abb march - "Pri", // abb april - "Maj", // abb may - "Qer", // abb june - "Kor", // abb july - "Gsh", // abb august - "Sht", // abb september - "Tet", // abb october - "N\u00ebn", // abb november - "Dhj", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "S", - "M", - "P", - "M", - "Q", - "K", - "G", - "S", - "T", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "e diel", // Sunday - "e h\u00ebn\u00eb", // Monday - "e mart\u00eb", // Tuesday - "e m\u00ebrkur\u00eb", // Wednesday - "e enjte", // Thursday - "e premte", // Friday - "e shtun\u00eb" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "Die", // abb Sunday - "H\u00ebn", // abb Monday - "Mar", // abb Tuesday - "M\u00ebr", // abb Wednesday - "Enj", // abb Thursday - "Pre", // abb Friday - "Sht" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "D", - "H", - "M", - "M", - "E", - "P", - "S", - } - }, - { "AmPmMarkers", - new String[] { - "PD", // am marker - "MD" // pm marker - } - }, - { "Eras", - new String[] { // era strings - "p.e.r.", - "n.e.r." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "h.mm.ss.a z", // full time pattern - "h.mm.ss.a z", // long time pattern - "h:mm:ss.a", // medium time pattern - "h.mm.a", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy-MM-dd", // full date pattern - "yyyy-MM-dd", // long date pattern - "yyyy-MM-dd", // medium date pattern - "yy-MM-dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java deleted file mode 100644 index 09e9906df00..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sq_AL extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.###;-\u00A4#,##0.###", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java deleted file mode 100644 index 7faae421880..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr extends ParallelListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "\u041f\u0440\u0435 \u0420\u041a", - "\u0420\u041a", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "\u0458\u0430\u043d\u0443\u0430\u0440", - "\u0444\u0435\u0431\u0440\u0443\u0430\u0440", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440\u0438\u043b", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d", - "\u0458\u0443\u043b", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440", - "\u043e\u043a\u0442\u043e\u0431\u0430\u0440", - "\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440", - "\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "\u0458\u0430\u043d", - "\u0444\u0435\u0431", - "\u043c\u0430\u0440", - "\u0430\u043f\u0440", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d", - "\u0458\u0443\u043b", - "\u0430\u0432\u0433", - "\u0441\u0435\u043f", - "\u043e\u043a\u0442", - "\u043d\u043e\u0432", - "\u0434\u0435\u0446", - "", - } - }, - { "MonthNarrows", - new String[] { - "\u0458", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u0458", - "\u0458", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "MonthNarrows", - new String[] { - "\u0458", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u0458", - "\u0458", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "DayNames", - new String[] { - "\u043d\u0435\u0434\u0435\u0459\u0430", - "\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a", - "\u0443\u0442\u043e\u0440\u0430\u043a", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a", - "\u043f\u0435\u0442\u0430\u043a", - "\u0441\u0443\u0431\u043e\u0442\u0430", - } - }, - { "DayAbbreviations", - new String[] { - "\u043d\u0435\u0434", - "\u043f\u043e\u043d", - "\u0443\u0442\u043e", - "\u0441\u0440\u0435", - "\u0447\u0435\u0442", - "\u043f\u0435\u0442", - "\u0441\u0443\u0431", - } - }, - { "DayNarrows", - new String[] { - "\u043d", - "\u043f", - "\u0443", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - } - }, - { "Eras", - new String[] { - "\u043f. \u043d. \u0435.", - "\u043d. \u0435", - } - }, - { "short.Eras", - new String[] { - "\u043f. \u043d. \u0435.", - "\u043d. \u0435.", - } - }, - { "narrow.Eras", - new String[] { - "\u043f.\u043d.\u0435.", - "\u043d.\u0435.", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4 #,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ",", - ".", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd.MMMM.yyyy.", - "dd.MM.yyyy.", - "dd.MM.yyyy.", - "d.M.yy.", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java deleted file mode 100644 index e8c32bc069e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2006, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_BA extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0458\u0430\u043d\u0443\u0430\u0440", - "\u0444\u0435\u0431\u0440\u0443\u0430\u0440", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440\u0438\u043b", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d\u0438", - "\u0458\u0443\u043b\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440", - "\u043e\u043a\u0442\u043e\u0431\u0430\u0440", - "\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440", - "\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440", - "", - } - }, - { "DayNames", - new String[] { - "\u043d\u0435\u0434\u0435\u0459\u0430", - "\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a", - "\u0443\u0442\u043e\u0440\u0430\u043a", - "\u0441\u0440\u0438\u0458\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a", - "\u043f\u0435\u0442\u0430\u043a", - "\u0441\u0443\u0431\u043e\u0442\u0430", - } - }, - { "DayAbbreviations", - new String[] { - "\u043d\u0435\u0434", - "\u043f\u043e\u043d", - "\u0443\u0442\u043e", - "\u0441\u0440\u0438", - "\u0447\u0435\u0442", - "\u043f\u0435\u0442", - "\u0441\u0443\u0431", - } - }, - { "TimePatterns", - new String[] { - "HH '\u0447\u0430\u0441\u043e\u0432\u0430', mm '\u043c\u0438\u043d\u0443\u0442\u0430', ss' \u0441\u0435\u043a\u0443\u043d\u0434\u0438'", - "HH.mm.ss z", - "HH:mm:ss", - "HH:mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd. MMMM yyyy.", - "dd. MMMM yyyy.", - "yyyy-MM-dd", - "yy-MM-dd", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java deleted file mode 100644 index 6965c028275..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2006, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_CS extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java deleted file mode 100644 index 13b979cb6e8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (c) 1997, 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-2011 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_Latn extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "januar", - "februar", - "mart", - "april", - "maj", - "jun", - "jul", - "avgust", - "septembar", - "oktobar", - "novembar", - "decembar", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "avg", - "sep", - "okt", - "nov", - "dec", - "", - } - }, - { "MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "DayNames", - new String[] { - "nedelja", - "ponedeljak", - "utorak", - "sreda", - "\u010detvrtak", - "petak", - "subota", - } - }, - { "DayAbbreviations", - new String[] { - "ned", - "pon", - "uto", - "sre", - "\u010det", - "pet", - "sub", - } - }, - { "DayNarrows", - new String[] { - "n", - "p", - "u", - "s", - "\u010d", - "p", - "s", - } - }, - { "Eras", - new String[] { - "p. n. e.", - "n. e", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4\u00a0#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ",", - ".", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd. MMMM y.", - "dd. MMMM y.", - "dd.MM.y.", - "d.M.yy.", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java deleted file mode 100644 index c6ad77151c8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 1997, 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-2011 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_Latn_ME extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "TimePatterns", - new String[] { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - } - }, - { "DatePatterns", - new String[] { - "EEEE, dd. MMMM y.", - "d.MM.yyyy.", - "dd.MM.y.", - "d.M.yy.", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java deleted file mode 100644 index 4d88af55115..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2007, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_ME extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java deleted file mode 100644 index 84a2fcbc479..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2007, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sr_RS extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java deleted file mode 100644 index 29e63d9a458..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java +++ /dev/null @@ -1,319 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sv extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "f\u00f6re R.K.", - "R.K.", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "januari", // january - "februari", // february - "mars", // march - "april", // april - "maj", // may - "juni", // june - "juli", // july - "augusti", // august - "september", // september - "oktober", // october - "november", // november - "december", // december - "" // month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "jan", // abb january - "feb", // abb february - "mar", // abb march - "apr", // abb april - "maj", // abb may - "jun", // abb june - "jul", // abb july - "aug", // abb august - "sep", // abb september - "okt", // abb october - "nov", // abb november - "dec", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "dec", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "DayNames", - new String[] { - "s\u00f6ndag", // Sunday - "m\u00e5ndag", // Monday - "tisdag", // Tuesday - "onsdag", // Wednesday - "torsdag", // Thursday - "fredag", // Friday - "l\u00f6rdag" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "s\u00f6", // abb Sunday - "m\u00e5", // abb Monday - "ti", // abb Tuesday - "on", // abb Wednesday - "to", // abb Thursday - "fr", // abb Friday - "l\u00f6" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "s\u00f6n", - "m\u00e5n", - "tis", - "ons", - "tor", - "fre", - "l\u00f6r", - } - }, - { "DayNarrows", - new String[] { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - } - }, - { "standalone.DayNames", - new String[] { - "s\u00f6ndag", - "m\u00e5ndag", - "tisdag", - "onsdag", - "torsdag", - "fredag", - "l\u00f6rdag", - } - }, - { "standalone.DayNarrows", - new String[] { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - } - }, - { "Eras", - new String[] { - "f\u00f6re Kristus", - "efter Kristus", - } - }, - { "short.Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "narrow.Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "AmPmMarkers", - new String[] { - "fm", // am marker - "em" // pm marker - } - }, - { "narrow.AmPmMarkers", - new String[] { - "f", - "e", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00a4 #,##0.00;-\u00a4 #,##0.00", // currency pattern - "#,##0 %" // percent pattern - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "'kl 'H:mm z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "'den 'd MMMM yyyy", // full date pattern - "'den 'd MMMM yyyy", // long date pattern - "yyyy-MMM-dd", // medium date pattern - "yyyy-MM-dd", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java deleted file mode 100644 index 7e8e3522b84..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_sv_SE extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0 %" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java deleted file mode 100644 index cdb9580d041..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_th extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - String[] timePatterns = new String[] { - "H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35 'ss' \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35'", // full time pattern - "H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35'", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm' \u0e19.'", // short time pattern (modified) -- add ' \u0e19.' - // (it means something like "o'clock" in english) - }; - String[] datePatterns = new String[] { - "EEEE'\u0e17\u0e35\u0e48 'd MMMM G yyyy", // full date pattern - "d MMMM yyyy", // long date pattern - "d MMM yyyy", // medium date pattern - "d/M/yyyy", // short date pattern - }; - String[] dateTimePatterns = new String[] { - "{1}, {0}" // date-time pattern - }; - - return new Object[][] { - { "MonthNames", - new String[] { - "\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21", // january - "\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c", // february - "\u0e21\u0e35\u0e19\u0e32\u0e04\u0e21", // march - "\u0e40\u0e21\u0e29\u0e32\u0e22\u0e19", // april - "\u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21", // may - "\u0e21\u0e34\u0e16\u0e38\u0e19\u0e32\u0e22\u0e19", // june - "\u0e01\u0e23\u0e01\u0e0e\u0e32\u0e04\u0e21", // july - "\u0e2a\u0e34\u0e07\u0e2b\u0e32\u0e04\u0e21", // august - "\u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19", // september - "\u0e15\u0e38\u0e25\u0e32\u0e04\u0e21", // october - "\u0e1e\u0e24\u0e28\u0e08\u0e34\u0e01\u0e32\u0e22\u0e19", // november - "\u0e18\u0e31\u0e19\u0e27\u0e32\u0e04\u0e21", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "\u0e21.\u0e04.", // abb january - "\u0e01.\u0e1e.", // abb february - "\u0e21\u0e35.\u0e04.", // abb march - "\u0e40\u0e21.\u0e22.", // abb april - "\u0e1e.\u0e04.", // abb may - "\u0e21\u0e34.\u0e22.", // abb june - "\u0e01.\u0e04.", // abb july - "\u0e2a.\u0e04.", // abb august - "\u0e01.\u0e22.", // abb september - "\u0e15.\u0e04.", // abb october - "\u0e1e.\u0e22.", // abb november - "\u0e18.\u0e04.", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u0e21.\u0e04.", - "\u0e01.\u0e1e.", - "\u0e21\u0e35.\u0e04.", - "\u0e40\u0e21.\u0e22.", - "\u0e1e.\u0e04.", - "\u0e21\u0e34.\u0e22", - "\u0e01.\u0e04.", - "\u0e2a.\u0e04.", - "\u0e01.\u0e22.", - "\u0e15.\u0e04.", - "\u0e1e.\u0e22.", - "\u0e18.\u0e04.", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "\u0e21.\u0e04.", - "\u0e01.\u0e1e.", - "\u0e21\u0e35.\u0e04.", - "\u0e40\u0e21.\u0e22.", - "\u0e1e.\u0e04.", - "\u0e21\u0e34.\u0e22.", - "\u0e01.\u0e04.", - "\u0e2a.\u0e04.", - "\u0e01.\u0e22.", - "\u0e15.\u0e04.", - "\u0e1e.\u0e22.", - "\u0e18.\u0e04.", - "", - } - }, - { "DayNames", - new String[] { - "\u0e27\u0e31\u0e19\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c", // Sunday - "\u0e27\u0e31\u0e19\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c", // Monday - "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23", // Tuesday - "\u0e27\u0e31\u0e19\u0e1e\u0e38\u0e18", // Wednesday - "\u0e27\u0e31\u0e19\u0e1e\u0e24\u0e2b\u0e31\u0e2a\u0e1a\u0e14\u0e35", // Thursday - "\u0e27\u0e31\u0e19\u0e28\u0e38\u0e01\u0e23\u0e4c", // Friday - "\u0e27\u0e31\u0e19\u0e40\u0e2a\u0e32\u0e23\u0e4c" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u0e2d\u0e32.", // abb Sunday - "\u0e08.", // abb Monday - "\u0e2d.", // abb Tuesday - "\u0e1e.", // abb Wednesday - "\u0e1e\u0e24.", // abb Thursday - "\u0e28.", // abb Friday - "\u0e2a." // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u0e2d", - "\u0e08", - "\u0e2d", - "\u0e1e", - "\u0e1e", - "\u0e28", - "\u0e2a", - } - }, - { "AmPmMarkers", - new String[] { - "\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07", // am marker - "\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07" // pm marker - } - }, - { "buddhist.Eras", - new String[] { // era strings - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48", - "\u0E1E.\u0E28." // Thai calendar requires equivalent of B.E., Buddhist Era - } - }, - { "buddhist.short.Eras", - new String[] { // era strings - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48", - "\u0E1E.\u0E28." // Thai calendar requires equivalent of B.E., Buddhist Era - } - }, - { "Eras", - new String[] { // era strings - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48", - "\u0e04.\u0e28." - } - }, - { "short.Eras", - new String[] { - "\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.", - "\u0e04.\u0e28.", - } - }, - { "narrow.Eras", - new String[] { - "\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.", - "\u0e04.\u0e28.", - } - }, - { "japanese.Eras", - new String[] { - "\u0e04.\u0e28.", - "\u0e40\u0e21\u0e08\u0e34", - "\u0e17\u0e30\u0e2d\u0e34\u0e42\u0e0a", - "\u0e42\u0e0a\u0e27\u0e30", - "\u0e40\u0e2e\u0e40\u0e0b", - "\u0e40\u0e23\u0e27\u0e30", - } - }, - { "japanese.short.Eras", - new String[] { - "\u0e04.\u0e28.", - "\u0e21", - "\u0e17", - "\u0e0a", - "\u0e2e", - "R", - } - }, - { "buddhist.TimePatterns", - timePatterns - }, - { "buddhist.DatePatterns", - datePatterns - }, - { "buddhist.DateTimePatterns", - dateTimePatterns - }, - { "TimePatterns", - timePatterns - }, - { "DatePatterns", - datePatterns - }, - { "DateTimePatterns", - dateTimePatterns - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java deleted file mode 100644 index 48d041caa0e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_th_TH extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00a4#,##0.00;\u00a4-#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java deleted file mode 100644 index 585cc65e46e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright (c) 1996, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_tr extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "Ocak", // january - "\u015eubat", // february - "Mart", // march - "Nisan", // april - "May\u0131s", // may - "Haziran", // june - "Temmuz", // july - "A\u011fustos", // august - "Eyl\u00fcl", // september - "Ekim", // october - "Kas\u0131m", // november - "Aral\u0131k", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "Ocak", - "\u015eubat", - "Mart", - "Nisan", - "May\u0131s", - "Haziran", - "Temmuz", - "A\u011fustos", - "Eyl\u00fcl", - "Ekim", - "Kas\u0131m", - "Aral\u0131k", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "Oca", // abb january - "\u015eub", // abb february - "Mar", // abb march - "Nis", // abb april - "May", // abb may - "Haz", // abb june - "Tem", // abb july - "A\u011fu", // abb august - "Eyl", // abb september - "Eki", // abb october - "Kas", // abb november - "Ara", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "Oca", - "\u015eub", - "Mar", - "Nis", - "May", - "Haz", - "Tem", - "A\u011fu", - "Eyl", - "Eki", - "Kas", - "Ara", - "", - } - }, - { "MonthNarrows", - new String[] { - "O", - "\u015e", - "M", - "N", - "M", - "H", - "T", - "A", - "E", - "E", - "K", - "A", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "O", - "\u015e", - "M", - "N", - "M", - "H", - "T", - "A", - "E", - "E", - "K", - "A", - "", - } - }, - { "DayNames", - new String[] { - "Pazar", // Sunday - "Pazartesi", // Monday - "Sal\u0131", // Tuesday - "\u00c7ar\u015famba", // Wednesday - "Per\u015fembe", // Thursday - "Cuma", // Friday - "Cumartesi" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "Pazar", - "Pazartesi", - "Sal\u0131", - "\u00c7ar\u015famba", - "Per\u015fembe", - "Cuma", - "Cumartesi", - } - }, - { "DayAbbreviations", - new String[] { - "Paz", // abb Sunday - "Pzt", // abb Monday - "Sal", // abb Tuesday - "\u00c7ar", // abb Wednesday - "Per", // abb Thursday - "Cum", // abb Friday - "Cmt" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "Paz", - "Pzt", - "Sal", - "\u00c7ar", - "Per", - "Cum", - "Cmt", - } - }, - { "DayNarrows", - new String[] { - "P", - "P", - "S", - "\u00c7", - "P", - "C", - "C", - } - }, - { "standalone.DayNarrows", - new String[] { - "P", - "P", - "S", - "\u00c7", - "P", - "C", - "C", - } - }, - { "long.Eras", - new String[] { - "Milattan \u00d6nce", - "Milattan Sonra", - } - }, - { "Eras", - new String[] { - "M\u00d6", - "MS", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00a4;-#,##0.00 \u00a4", // currency pattern - "% #,##0" // percent pattern - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "dd MMMM yyyy EEEE", // full date pattern - "dd MMMM yyyy EEEE", // long date pattern - "dd.MMM.yyyy", // medium date pattern - "dd.MM.yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java deleted file mode 100644 index babd8009ef1..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_tr_TR extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java deleted file mode 100644 index 426df953fba..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright (c) 1997, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_uk extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "\u0441\u0456\u0447\u043d\u044f", // january - "\u043b\u044e\u0442\u043e\u0433\u043e", // february - "\u0431\u0435\u0440\u0435\u0437\u043d\u044f", // march - "\u043a\u0432\u0456\u0442\u043d\u044f", // april - "\u0442\u0440\u0430\u0432\u043d\u044f", // may - "\u0447\u0435\u0440\u0432\u043d\u044f", // june - "\u043b\u0438\u043f\u043d\u044f", // july - "\u0441\u0435\u0440\u043f\u043d\u044f", // august - "\u0432\u0435\u0440\u0435\u0441\u043d\u044f", // september - "\u0436\u043e\u0432\u0442\u043d\u044f", // october - "\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434\u0430", // november - "\u0433\u0440\u0443\u0434\u043d\u044f", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "\u0421\u0456\u0447\u0435\u043d\u044c", - "\u041b\u044e\u0442\u0438\u0439", - "\u0411\u0435\u0440\u0435\u0437\u0435\u043d\u044c", - "\u041a\u0432\u0456\u0442\u0435\u043d\u044c", - "\u0422\u0440\u0430\u0432\u0435\u043d\u044c", - "\u0427\u0435\u0440\u0432\u0435\u043d\u044c", - "\u041b\u0438\u043f\u0435\u043d\u044c", - "\u0421\u0435\u0440\u043f\u0435\u043d\u044c", - "\u0412\u0435\u0440\u0435\u0441\u0435\u043d\u044c", - "\u0416\u043e\u0432\u0442\u0435\u043d\u044c", - "\u041b\u0438\u0441\u0442\u043e\u043f\u0430\u0434", - "\u0413\u0440\u0443\u0434\u0435\u043d\u044c", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "\u0441\u0456\u0447.", - "\u043b\u044e\u0442.", - "\u0431\u0435\u0440.", - "\u043a\u0432\u0456\u0442.", - "\u0442\u0440\u0430\u0432.", - "\u0447\u0435\u0440\u0432.", - "\u043b\u0438\u043f.", - "\u0441\u0435\u0440\u043f.", - "\u0432\u0435\u0440.", - "\u0436\u043e\u0432\u0442.", - "\u043b\u0438\u0441\u0442.", - "\u0433\u0440\u0443\u0434.", - "", - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "\u0441\u0456\u0447", // abb january - "\u043b\u044e\u0442", // abb february - "\u0431\u0435\u0440", // abb march - "\u043a\u0432\u0456\u0442", // abb april - "\u0442\u0440\u0430\u0432", // abb may - "\u0447\u0435\u0440\u0432", // abb june - "\u043b\u0438\u043f", // abb july - "\u0441\u0435\u0440\u043f", // abb august - "\u0432\u0435\u0440", // abb september - "\u0436\u043e\u0432\u0442", // abb october - "\u043b\u0438\u0441\u0442", // abb november - "\u0433\u0440\u0443\u0434", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "\u0421", - "\u041b", - "\u0411", - "\u041a", - "\u0422", - "\u0427", - "\u041b", - "\u0421", - "\u0412", - "\u0416", - "\u041b", - "\u0413", - "", - } - }, - { "DayNames", - new String[] { - "\u043d\u0435\u0434\u0456\u043b\u044f", // Sunday - "\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a", // Monday - "\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a", // Tuesday - "\u0441\u0435\u0440\u0435\u0434\u0430", // Wednesday - "\u0447\u0435\u0442\u0432\u0435\u0440", // Thursday - "\u043f'\u044f\u0442\u043d\u0438\u0446\u044f", // Friday - "\u0441\u0443\u0431\u043e\u0442\u0430" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "\u043d\u0434", // abb Sunday - "\u043f\u043d", // abb Monday - "\u0432\u0442", // abb Tuesday - "\u0441\u0440", // abb Wednesday - "\u0447\u0442", // abb Thursday - "\u043f\u0442", // abb Friday - "\u0441\u0431" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "\u041d", - "\u041f", - "\u0412", - "\u0421", - "\u0427", - "\u041f", - "\u0421", - } - }, - { "Eras", - new String[] { // era strings - "\u0434\u043e \u043d.\u0435.", - "\u043f\u0456\u0441\u043b\u044f \u043d.\u0435." - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - "\u00a0", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "H:mm:ss z", // full time pattern - "H:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, d MMMM yyyy \u0440.", // full date pattern - "d MMMM yyyy", // long date pattern - "d MMM yyyy", // medium date pattern - "dd.MM.yy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java deleted file mode 100644 index a0af11ba007..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_uk_UA extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java deleted file mode 100644 index 58e62648ee5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2003, 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. - */ - -/* - ******************************************************************************* - * (C) Copyright IBM Corp. 1996-2003 - All Rights Reserved * - * * - * The original version of this source code and documentation is copyrighted * - * and owned by IBM, These materials are provided under terms of a License * - * Agreement between IBM and Sun. This technology is protected by multiple * - * US and International patents. This notice and attribution to IBM may not * - * to removed. * - ******************************************************************************* - * - * This locale data is based on the ICU's Vietnamese locale data (rev. 1.38) - * found at: - * - * http://oss.software.ibm.com/cvs/icu/icu/source/data/locales/vi.txt?rev=1.38 - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_vi extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "MonthNames", - new String[] { - "th\u00e1ng m\u1ed9t", // january - "th\u00e1ng hai", // february - "th\u00e1ng ba", // march - "th\u00e1ng t\u01b0", // april - "th\u00e1ng n\u0103m", // may - "th\u00e1ng s\u00e1u", // june - "th\u00e1ng b\u1ea3y", // july - "th\u00e1ng t\u00e1m", // august - "th\u00e1ng ch\u00edn", // september - "th\u00e1ng m\u01b0\u1eddi", // october - "th\u00e1ng m\u01b0\u1eddi m\u1ed9t", // november - "th\u00e1ng m\u01b0\u1eddi hai", // december - "" // month 13 if applicable - } - }, - { "MonthAbbreviations", - new String[] { - "thg 1", // abb january - "thg 2", // abb february - "thg 3", // abb march - "thg 4", // abb april - "thg 5", // abb may - "thg 6", // abb june - "thg 7", // abb july - "thg 8", // abb august - "thg 9", // abb september - "thg 10", // abb october - "thg 11", // abb november - "thg 12", // abb december - "" // abb month 13 if applicable - } - }, - { "MonthNarrows", - new String[] { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "", - } - }, - { "DayNames", - new String[] { - "Ch\u1ee7 nh\u1eadt", // Sunday - "Th\u1ee9 hai", // Monday - "Th\u1ee9 ba", // Tuesday - "Th\u1ee9 t\u01b0", // Wednesday - "Th\u1ee9 n\u0103m", // Thursday - "Th\u1ee9 s\u00e1u", // Friday - "Th\u1ee9 b\u1ea3y" // Saturday - } - }, - { "DayAbbreviations", - new String[] { - "CN", // abb Sunday - "Th 2", // abb Monday - "Th 3", // abb Tuesday - "Th 4", // abb Wednesday - "Th 5", // abb Thursday - "Th 6", // abb Friday - "Th 7" // abb Saturday - } - }, - { "DayNarrows", - new String[] { - "CN", - "T2", - "T3", - "T4", - "T5", - "T6", - "T7", - } - }, - { "standalone.DayNarrows", - new String[] { - "CN", - "T2", - "T3", - "T4", - "T5", - "T6", - "T7", - } - }, - { "AmPmMarkers", - new String[] { - "SA", // am marker - "CH" // pm marker - } - }, - { "Eras", - new String[] { // era strings - "tr. CN", - "sau CN" - } - }, - { "NumberElements", - new String[] { - ",", // decimal separator - ".", // group (thousands) separator - ";", // list separator - "%", // percent sign - "0", // native 0 digit - "#", // pattern digit - "-", // minus sign - "E", // exponential - "\u2030", // per mille - "\u221e", // infinity - "\ufffd" // NaN - } - }, - { "TimePatterns", - new String[] { - "HH:mm:ss z", // full time pattern - "HH:mm:ss z", // long time pattern - "HH:mm:ss", // medium time pattern - "HH:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "EEEE, 'ng\u00E0y' dd MMMM 'n\u0103m' yyyy", // full date pattern - "'Ng\u00E0y' dd 'th\u00E1ng' M 'n\u0103m' yyyy", // long date pattern - "dd-MM-yyyy", // medium date pattern - "dd/MM/yyyy", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{0} {1}" // date-time pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java deleted file mode 100644 index 4a7a2675c59..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2003, 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. - */ - -/* - ******************************************************************************* - * (C) Copyright IBM Corp. 1996-2003 - All Rights Reserved * - * * - * The original version of this source code and documentation is copyrighted * - * and owned by IBM, These materials are provided under terms of a License * - * Agreement between IBM and Sun. This technology is protected by multiple * - * US and International patents. This notice and attribution to IBM may not * - * to removed. * - ******************************************************************************* - * - * This locale data is based on the ICU's Vietnamese locale data (rev. 1.38) - * found at: - * - * http://oss.software.ibm.com/cvs/icu/icu/source/data/locales/vi.txt?rev=1.38 - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_vi_VN extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java deleted file mode 100644 index e902bfcbd26..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java +++ /dev/null @@ -1,327 +0,0 @@ -/* - * Copyright (c) 1996, 2019, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_zh extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "\u6c11\u56fd\u524d", - "\u6c11\u56fd", - }; - final String[] gregoryEras = { - "\u516c\u5143\u524d", - "\u516c\u5143", - }; - return new Object[][] { - { "MonthNames", - new String[] { - "\u4e00\u6708", // january - "\u4e8c\u6708", // february - "\u4e09\u6708", // march - "\u56db\u6708", // april - "\u4e94\u6708", // may - "\u516d\u6708", // june - "\u4e03\u6708", // july - "\u516b\u6708", // august - "\u4e5d\u6708", // september - "\u5341\u6708", // october - "\u5341\u4e00\u6708", // november - "\u5341\u4e8c\u6708", // december - "" // month 13 if applicable - } - }, - { "standalone.MonthNames", - new String[] { - "\u4e00\u6708", - "\u4e8c\u6708", - "\u4e09\u6708", - "\u56db\u6708", - "\u4e94\u6708", - "\u516d\u6708", - "\u4e03\u6708", - "\u516b\u6708", - "\u4e5d\u6708", - "\u5341\u6708", - "\u5341\u4e00\u6708", - "\u5341\u4e8c\u6708", - "", - } - }, - { "MonthAbbreviations", - new String[] { - "\u4e00\u6708", // abb january - "\u4e8c\u6708", // abb february - "\u4e09\u6708", // abb march - "\u56db\u6708", // abb april - "\u4e94\u6708", // abb may - "\u516d\u6708", // abb june - "\u4e03\u6708", // abb july - "\u516b\u6708", // abb august - "\u4e5d\u6708", // abb september - "\u5341\u6708", // abb october - "\u5341\u4e00\u6708", // abb november - "\u5341\u4e8c\u6708", // abb december - "" // abb month 13 if applicable - } - }, - { "standalone.MonthAbbreviations", - new String[] { - "\u4e00\u6708", - "\u4e8c\u6708", - "\u4e09\u6708", - "\u56db\u6708", - "\u4e94\u6708", - "\u516d\u6708", - "\u4e03\u6708", - "\u516b\u6708", - "\u4e5d\u6708", - "\u5341\u6708", - "\u5341\u4e00\u6708", - "\u5341\u4e8c\u6708", - "", - } - }, - { "MonthNarrows", - new String[] { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "", - } - }, - { "standalone.MonthNarrows", - new String[] { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - "", - } - }, - { "DayNames", - new String[] { - "\u661f\u671f\u65e5", // Sunday - "\u661f\u671f\u4e00", // Monday - "\u661f\u671f\u4e8c", // Tuesday - "\u661f\u671f\u4e09", // Wednesday - "\u661f\u671f\u56db", // Thursday - "\u661f\u671f\u4e94", // Friday - "\u661f\u671f\u516d" // Saturday - } - }, - { "standalone.DayNames", - new String[] { - "\u661f\u671f\u65e5", - "\u661f\u671f\u4e00", - "\u661f\u671f\u4e8c", - "\u661f\u671f\u4e09", - "\u661f\u671f\u56db", - "\u661f\u671f\u4e94", - "\u661f\u671f\u516d", - } - }, - { "DayAbbreviations", - new String[] { - "\u661f\u671f\u65e5", // abb Sunday - "\u661f\u671f\u4e00", // abb Monday - "\u661f\u671f\u4e8c", // abb Tuesday - "\u661f\u671f\u4e09", // abb Wednesday - "\u661f\u671f\u56db", // abb Thursday - "\u661f\u671f\u4e94", // abb Friday - "\u661f\u671f\u516d" // abb Saturday - } - }, - { "standalone.DayAbbreviations", - new String[] { - "\u5468\u65e5", - "\u5468\u4e00", - "\u5468\u4e8c", - "\u5468\u4e09", - "\u5468\u56db", - "\u5468\u4e94", - "\u5468\u516d", - } - }, - { "DayNarrows", - new String[] { - "\u65e5", - "\u4e00", - "\u4e8c", - "\u4e09", - "\u56db", - "\u4e94", - "\u516d", - } - }, - { "standalone.DayNarrows", - new String[] { - "\u65e5", - "\u4e00", - "\u4e8c", - "\u4e09", - "\u56db", - "\u4e94", - "\u516d", - } - }, - { "AmPmMarkers", - new String[] { - "\u4e0a\u5348", // am marker - "\u4e0b\u5348" // pm marker - } - }, - { "Eras", gregoryEras }, - { "short.Eras", gregoryEras }, - { "buddhist.Eras", - new String[] { - "BC", - "\u4f5b\u5386", - } - }, - { "japanese.Eras", - new String[] { - "\u516c\u5143", - "\u660e\u6cbb", - "\u5927\u6b63", - "\u662d\u548c", - "\u5e73\u6210", - "\u4ee4\u548c", - } - }, - { "TimePatterns", - new String[] { - "ahh'\u65f6'mm'\u5206'ss'\u79d2' z", // full time pattern - "ahh'\u65f6'mm'\u5206'ss'\u79d2'", // long time pattern - "H:mm:ss", // medium time pattern - "ah:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy'\u5e74'M'\u6708'd'\u65e5' EEEE", // full date pattern - "yyyy'\u5e74'M'\u6708'd'\u65e5'", // long date pattern - "yyyy-M-d", // medium date pattern - "yy-M-d", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "buddhist.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGyyyy-M-d", - "GGGGy-M-d", - } - }, - { "japanese.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGyy-MM-dd", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java deleted file mode 100644 index b0c6d88e8b4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_zh_CN extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - protected final Object[][] getContents() { - return new Object[][] { - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;-\u00A4#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java deleted file mode 100644 index ea8665e1868..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 1998, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; -import java.util.Locale; -import java.util.ResourceBundle; -import sun.util.locale.provider.LocaleProviderAdapter; -import sun.util.locale.provider.ResourceBundleBasedAdapter; - -public class FormatData_zh_HK extends ParallelListResourceBundle { - - // reparent to zh_TW for traditional Chinese names - public FormatData_zh_HK() { - ResourceBundle bundle = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()) - .getLocaleData().getDateFormatData(Locale.TAIWAN); - setParent(bundle); - } - - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - return new Object[][] { - { "MonthAbbreviations", - new String[] { - "1\u6708", // abb january - "2\u6708", // abb february - "3\u6708", // abb march - "4\u6708", // abb april - "5\u6708", // abb may - "6\u6708", // abb june - "7\u6708", // abb july - "8\u6708", // abb august - "9\u6708", // abb september - "10\u6708", // abb october - "11\u6708", // abb november - "12\u6708", // abb december - "" // abb month 13 if applicable - } - }, - { "DayAbbreviations", - new String[] { - "\u65e5", // abb Sunday - "\u4e00", // abb Monday - "\u4e8c", // abb Tuesday - "\u4e09", // abb Wednesday - "\u56db", // abb Thursday - "\u4e94", // abb Friday - "\u516d" // abb Saturday - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;(\u00A4#,##0.00)", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "ahh'\u6642'mm'\u5206'ss'\u79d2' z", // full time pattern - "ahh'\u6642'mm'\u5206'ss'\u79d2'", // long time pattern - "ahh:mm:ss", // medium time pattern - "ah:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy'\u5e74'MM'\u6708'dd'\u65e5' EEEE", // full date pattern - "yyyy'\u5e74'MM'\u6708'dd'\u65e5' EEEE", // long date pattern - "yyyy'\u5e74'M'\u6708'd'\u65e5'", // medium date pattern - "yy'\u5e74'M'\u6708'd'\u65e5'", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java deleted file mode 100644 index 0decb3cd826..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2005, 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-2007 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_zh_SG extends ParallelListResourceBundle { - protected final Object[][] getContents() { - return new Object[][] { - { "DayAbbreviations", - new String[] { - "\u5468\u65e5", - "\u5468\u4e00", - "\u5468\u4e8c", - "\u5468\u4e09", - "\u5468\u56db", - "\u5468\u4e94", - "\u5468\u516d", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###", - "\u00a4#,##0.00", - "#,##0%", - } - }, - { "NumberElements", - new String[] { - ".", - ",", - ";", - "%", - "0", - "#", - "-", - "E", - "\u2030", - "\u221e", - "NaN", - } - }, - { "TimePatterns", - new String[] { - "a hh:mm:ss", - "a hh:mm:ss", - "a hh:mm", - "a hh:mm", - } - }, - { "DatePatterns", - new String[] { - "dd MMMM yyyy", - "dd MMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}", - } - }, - { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java deleted file mode 100644 index fd4b8872b80..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright (c) 1996, 2019, 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -/* - * 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. - */ - -package sun.text.resources.ext; - -import sun.util.resources.ParallelListResourceBundle; - -public class FormatData_zh_TW extends ParallelListResourceBundle { - /** - * Overrides ParallelListResourceBundle - */ - @Override - protected final Object[][] getContents() { - final String[] rocEras = { - "\u6c11\u570b\u524d", - "\u6c11\u570b", - }; - final String[] gregoryEras = { - "\u897f\u5143\u524d", - "\u897f\u5143", - }; - return new Object[][] { - { "Eras", gregoryEras }, - { "short.Eras", gregoryEras }, - { "standalone.MonthAbbreviations", - new String[] { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - "", - } - }, - { "MonthNarrows", - new String[] { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "", - } - }, - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "\u00A4#,##0.00;-\u00A4#,##0.00", // currency pattern - "#,##0%" // percent pattern - } - }, - { "TimePatterns", - new String[] { - "ahh'\u6642'mm'\u5206'ss'\u79d2' z", // full time pattern - "ahh'\u6642'mm'\u5206'ss'\u79d2'", // long time pattern - "a hh:mm:ss", // medium time pattern - "a h:mm", // short time pattern - } - }, - { "DatePatterns", - new String[] { - "yyyy'\u5e74'M'\u6708'd'\u65e5' EEEE", // full date pattern - "yyyy'\u5e74'M'\u6708'd'\u65e5'", // long date pattern - "yyyy/M/d", // medium date pattern - "yyyy/M/d", // short date pattern - } - }, - { "DateTimePatterns", - new String[] { - "{1} {0}" // date-time pattern - } - }, - { "buddhist.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/M/d", - "GGGGy/M/d", - } - }, - { "japanese.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/M/d", - "GGGGy/M/d", - } - }, - { "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java deleted file mode 100644 index a26f3383c6d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java +++ /dev/null @@ -1,379 +0,0 @@ -/* - * 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 - * 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_ar extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644", - "\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b", - "\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639", - }; - - final String[] sharedQuarterNarrows = { - "\u0661", - "\u0662", - "\u0663", - "\u0664", - }; - - final String[] sharedAmPmMarkers = { - "\u0635", - "\u0645", - }; - - final String[] sharedDayNames = { - "\u0627\u0644\u0623\u062d\u062f", - "\u0627\u0644\u0627\u062b\u0646\u064a\u0646", - "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062e\u0645\u064a\u0633", - "\u0627\u0644\u062c\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062a", - }; - - final String[] sharedDayNarrows = { - "\u062d", - "\u0646", - "\u062b", - "\u0631", - "\u062e", - "\u062c", - "\u0633", - }; - - final String[] sharedEras = { - "", - "\u0647\u0640", - }; - - final String[] sharedMonthNames = { - "\u0645\u062d\u0631\u0645", - "\u0635\u0641\u0631", - "\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644", - "\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631", - "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649", - "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629", - "\u0631\u062c\u0628", - "\u0634\u0639\u0628\u0627\u0646", - "\u0631\u0645\u0636\u0627\u0646", - "\u0634\u0648\u0627\u0644", - "\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629", - "\u0630\u0648 \u0627\u0644\u062d\u062c\u0629", - "", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE\u060c d MMMM\u060c y G", - "d MMMM\u060c y G", - "dd\u200f/MM\u200f/y G", - "d\u200f/M\u200f/y GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a", - }; - - final String[] sharedJavaTimeShortEras = { - "\u0645", - "\u0645\u064a\u062c\u064a", - "\u062a\u064a\u0634\u0648", - "\u0634\u0648\u0648\u0627", - "\u0647\u064a\u0633\u064a", - "\u0631\u064a\u0648\u0627", - }; - - final String[] sharedShortEras = { - "Before R.O.C.", - "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a", - }; - - final String[] sharedMonthAbbreviations = { - "\u064a\u0646\u0627\u064a\u0631", - "\u0641\u0628\u0631\u0627\u064a\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064a\u0644", - "\u0645\u0627\u064a\u0648", - "\u064a\u0648\u0646\u064a\u0648", - "\u064a\u0648\u0644\u064a\u0648", - "\u0623\u063a\u0633\u0637\u0633", - "\u0633\u0628\u062a\u0645\u0628\u0631", - "\u0623\u0643\u062a\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062f\u064a\u0633\u0645\u0628\u0631", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a" }, - { "calendarname.gregorian", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a" }, - { "calendarname.gregory", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a" }, - { "calendarname.islamic", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0647\u062c\u0631\u064a" }, - { "calendarname.islamic-civil", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0625\u0633\u0644\u0627\u0645\u064a \u0627\u0644\u0645\u062f\u0646\u064a" }, - { "calendarname.islamic-umalqura", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0625\u0633\u0644\u0627\u0645\u064a (\u0623\u0645 \u0627\u0644\u0642\u0631\u0649)" }, - { "calendarname.japanese", - "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u064a\u0627\u0628\u0627\u0646\u064a" }, - { "calendarname.roc", - "\u062a\u0642\u0648\u064a\u0645 \u0645\u064a\u0646\u062c\u0648" }, - { "field.dayperiod", - "\u0635/\u0645" }, - { "field.era", - "\u0627\u0644\u0639\u0635\u0631" }, - { "field.hour", - "\u0627\u0644\u0633\u0627\u0639\u0627\u062a" }, - { "field.minute", - "\u0627\u0644\u062f\u0642\u0627\u0626\u0642" }, - { "field.month", - "\u0627\u0644\u0634\u0647\u0631" }, - { "field.second", - "\u0627\u0644\u062b\u0648\u0627\u0646\u064a" }, - { "field.week", - "\u0627\u0644\u0623\u0633\u0628\u0648\u0639" }, - { "field.weekday", - "\u0627\u0644\u064a\u0648\u0645" }, - { "field.year", - "\u0627\u0644\u0633\u0646\u0629" }, - { "field.zone", - "\u0627\u0644\u062a\u0648\u0642\u064a\u062a" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE\u060c d MMMM\u060c y GGGG", - "d MMMM\u060c y GGGG", - "d MMM\u060c y GGGG", - "d\u200f/M\u200f/y G", - } - }, - { "islamic.DayAbbreviations", - sharedDayNames }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - sharedMonthNames }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.MonthNarrows", - new String[] { - "\u0661", - "\u0662", - "\u0663", - "\u0664", - "\u0665", - "\u0666", - "\u0667", - "\u0668", - "\u0669", - "\u0661\u0660", - "\u0661\u0661", - "\u0661\u0662", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterNames }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE\u060c d MMMM\u060c y G", - "d MMMM\u060c y G", - "d MMM\u060c y G", - "d\u200f/M\u200f/y GGGGG", - } - }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - sharedJavaTimeShortEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeShortEras }, - { "java.time.long.Eras", - new String[] { - "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f", - "\u0645\u064a\u0644\u0627\u062f\u064a", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u0642.\u0645", - "\u0645", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "EEEE\u060c d MMMM\u060c y GGGG", - "d MMMM\u060c y GGGG", - "dd\u200f/MM\u200f/y GGGG", - "d\u200f/M\u200f/y G", - } - }, - { "roc.DayAbbreviations", - sharedDayNames }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - sharedMonthAbbreviations }, - { "roc.MonthNames", - sharedMonthAbbreviations }, - { "roc.MonthNarrows", - new String[] { - "\u064a", - "\u0641", - "\u0645", - "\u0623", - "\u0648", - "\u0646", - "\u0644", - "\u063a", - "\u0633", - "\u0643", - "\u0628", - "\u062f", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterNames }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - { "timezone.gmtFormat", - "\u062c\u0631\u064a\u0646\u062a\u0634{0}" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java deleted file mode 100644 index b1471d64718..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2015, 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_ar_JO extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedMonthNames = { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064a\u0633\u0627\u0646", - "\u0623\u064a\u0627\u0631", - "\u062d\u0632\u064a\u0631\u0627\u0646", - "\u062a\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064a\u0644\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - "", - }; - - return new Object[][] { - { "roc.MonthAbbreviations", - sharedMonthNames }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.MonthNarrows", - new String[] { - "\u0643", - "\u0634", - "\u0622", - "\u0646", - "\u0623", - "\u062d", - "\u062a", - "\u0622", - "\u0623", - "\u062a", - "\u062a", - "\u0643", - "", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java deleted file mode 100644 index e4b587240e6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2015, 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_ar_LB extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedMonthNames = { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064a\u0633\u0627\u0646", - "\u0623\u064a\u0627\u0631", - "\u062d\u0632\u064a\u0631\u0627\u0646", - "\u062a\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064a\u0644\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - "", - }; - - return new Object[][] { - { "roc.MonthAbbreviations", - sharedMonthNames }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.MonthNarrows", - new String[] { - "\u0643", - "\u0634", - "\u0622", - "\u0646", - "\u0623", - "\u062d", - "\u062a", - "\u0622", - "\u0623", - "\u062a", - "\u062a", - "\u0643", - "", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java deleted file mode 100644 index 0fcd7abfbdf..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2015, 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_ar_SY extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedMonthNames = { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064a\u0633\u0627\u0646", - "\u0623\u064a\u0627\u0631", - "\u062d\u0632\u064a\u0631\u0627\u0646", - "\u062a\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064a\u0644\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - "", - }; - - return new Object[][] { - { "roc.MonthAbbreviations", - sharedMonthNames }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.MonthNarrows", - new String[] { - "\u0643", - "\u0634", - "\u0622", - "\u0646", - "\u0623", - "\u062d", - "\u062a", - "\u0622", - "\u0623", - "\u062a", - "\u062a", - "\u0643", - "", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java deleted file mode 100644 index 2e530eb4dbc..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java +++ /dev/null @@ -1,315 +0,0 @@ -/* - * 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 - * 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_be extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1-\u0448\u044b \u043a\u0432.", - "2-\u0433\u0456 \u043a\u0432.", - "3-\u0446\u0456 \u043a\u0432.", - "4-\u0442\u044b \u043a\u0432.", - }; - - final String[] sharedQuarterNames = { - "1-\u0448\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "2-\u0433\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "3-\u0446\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "4-\u0442\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - }; - - final String[] sharedAmPmMarkers = { - "\u0434\u0430 \u043f\u0430\u045e\u0434\u043d\u044f", - "\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u045e\u0434\u043d\u044f", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d.M.y GGGG", - "d.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "\u043d\u0434", - "\u043f\u043d", - "\u0430\u045e", - "\u0441\u0440", - "\u0447\u0446", - "\u043f\u0442", - "\u0441\u0431", - }; - - final String[] sharedDayNames = { - "\u043d\u044f\u0434\u0437\u0435\u043b\u044f", - "\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a", - "\u0430\u045e\u0442\u043e\u0440\u0430\u043a", - "\u0441\u0435\u0440\u0430\u0434\u0430", - "\u0447\u0430\u0446\u0432\u0435\u0440", - "\u043f\u044f\u0442\u043d\u0456\u0446\u0430", - "\u0441\u0443\u0431\u043e\u0442\u0430", - }; - - final String[] sharedDayNarrows = { - "\u043d", - "\u043f", - "\u0430", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - }; - - final String[] sharedTimePatterns = { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - }; - - final String[] sharedAbbreviatedAmPmMarkers = { - "\u0440\u0430\u043d\u0456\u0446\u044b", - "\u0432\u0435\u0447\u0430\u0440\u0430", - }; - - final String[] sharedNarrowAmPmMarkers = { - "\u0440\u0430\u043d.", - "\u0432\u0435\u0447.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d.M.y G", - "d.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0431\u0443\u0434\u044b\u0439\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" }, - { "calendarname.gregorian", - "\u0433\u0440\u044b\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" }, - { "calendarname.gregory", - "\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", - "\u044d\u0440\u0430" }, - { "field.hour", - "\u0433\u0430\u0434\u0437\u0456\u043d\u0430" }, - { "field.minute", - "\u0445\u0432\u0456\u043b\u0456\u043d\u0430" }, - { "field.month", - "\u043c\u0435\u0441\u044f\u0446" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", - "\u0442\u044b\u0434\u0437\u0435\u043d\u044c" }, - { "field.weekday", - "\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", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - new String[] { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "d.M.yy", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "\u0434\u0430 \u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b", - "\u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u0434\u0430 \u043d.\u0435.", - "\u043d.\u0435.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "\u0441\u0442\u0443", - "\u043b\u044e\u0442", - "\u0441\u0430\u043a", - "\u043a\u0440\u0430", - "\u043c\u0430\u044f", - "\u0447\u044d\u0440", - "\u043b\u0456\u043f", - "\u0436\u043d\u0456", - "\u0432\u0435\u0440", - "\u043a\u0430\u0441", - "\u043b\u0456\u0441", - "\u0441\u043d\u0435", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f", - "\u043b\u044e\u0442\u0430\u0433\u0430", - "\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430", - "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430", - "\u043c\u0430\u044f", - "\u0447\u044d\u0440\u0432\u0435\u043d\u044f", - "\u043b\u0456\u043f\u0435\u043d\u044f", - "\u0436\u043d\u0456\u045e\u043d\u044f", - "\u0432\u0435\u0440\u0430\u0441\u043d\u044f", - "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430", - "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430", - "\u0441\u043d\u0435\u0436\u043d\u044f", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u0441", - "\u043b", - "\u0441", - "\u043a", - "\u043c", - "\u0447", - "\u043b", - "\u0436", - "\u0432", - "\u043a", - "\u043b", - "\u0441", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "timezone.hourFormat", - "+HH.mm;-HH.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java deleted file mode 100644 index 6615e82e845..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java +++ /dev/null @@ -1,316 +0,0 @@ -/* - * 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 - * 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_bg extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1. \u0442\u0440\u0438\u043c.", - "2. \u0442\u0440\u0438\u043c.", - "3. \u0442\u0440\u0438\u043c.", - "4. \u0442\u0440\u0438\u043c.", - }; - - final String[] sharedQuarterNames = { - "1. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435", - "2. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435", - "3. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435", - "4. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435", - }; - - final String[] sharedAmPmMarkers = { - "\u043f\u0440.\u043e\u0431.", - "\u0441\u043b.\u043e\u0431.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y '\u0433'. GGGG", - "d MMMM y '\u0433'. GGGG", - "d.MM.y '\u0433'. GGGG", - "d.MM.yy GGGG", - }; - - final String[] sharedDayAbbreviations = { - "\u043d\u0434", - "\u043f\u043d", - "\u0432\u0442", - "\u0441\u0440", - "\u0447\u0442", - "\u043f\u0442", - "\u0441\u0431", - }; - - final String[] sharedDayNames = { - "\u043d\u0435\u0434\u0435\u043b\u044f", - "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a", - "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", - "\u0441\u0440\u044f\u0434\u0430", - "\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a", - "\u043f\u0435\u0442\u044a\u043a", - "\u0441\u044a\u0431\u043e\u0442\u0430", - }; - - final String[] sharedDayNarrows = { - "\u043d", - "\u043f", - "\u0432", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y '\u0433'. G", - "d MMMM y '\u0433'. G", - "d.MM.y '\u0433'. G", - "d.MM.yy G", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0431\u0443\u0434\u0438\u0441\u0442\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregorian", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregory", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic", - "\u0438\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic-civil", - "\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.japanese", - "\u044f\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.roc", - "\u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u0442\u0430\u0439" }, - { "field.dayperiod", - "\u043f\u0440.\u043e\u0431./\u0441\u043b.\u043e\u0431." }, - { "field.era", - "\u0435\u0440\u0430" }, - { "field.hour", - "\u0447\u0430\u0441" }, - { "field.minute", - "\u043c\u0438\u043d\u0443\u0442\u0430" }, - { "field.month", - "\u043c\u0435\u0441\u0435\u0446" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", - "\u0441\u0435\u0434\u043c\u0438\u0446\u0430" }, - { "field.weekday", - "\u0434\u0435\u043d \u043e\u0442 \u0441\u0435\u0434\u043c\u0438\u0446\u0430\u0442\u0430" }, - { "field.year", - "\u0433\u043e\u0434\u0438\u043d\u0430" }, - { "field.zone", - "\u0447\u0430\u0441\u043e\u0432\u0430 \u0437\u043e\u043d\u0430" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "\u043c\u0443\u0445\u0430\u0440\u0430\u043c", - "\u0441\u0430\u0444\u0430\u0440", - "\u0440\u0430\u0431\u0438-1", - "\u0440\u0430\u0431\u0438-2", - "\u0434\u0436\u0443\u043c\u0430\u0434\u0430-1", - "\u0434\u0436\u0443\u043c\u0430\u0434\u0430-2", - "\u0440\u0430\u0434\u0436\u0430\u0431", - "\u0448\u0430\u0431\u0430\u043d", - "\u0440\u0430\u043c\u0430\u0437\u0430\u043d", - "\u0428\u0430\u0432\u0430\u043b", - "\u0414\u0445\u0443\u043b-\u041a\u0430\u0430\u0434\u0430", - "\u0414\u0445\u0443\u043b-\u0445\u0438\u0434\u0436\u0430", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "\u043f\u0440\u0435\u0434\u0438 \u0425\u0440\u0438\u0441\u0442\u0430", - "\u0441\u043b\u0435\u0434 \u0425\u0440\u0438\u0441\u0442\u0430", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u043f\u0440.\u043d.\u0435.", - "\u043d.\u0435.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "\u044f\u043d\u0443", - "\u0444\u0435\u0432", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440", - "\u043c\u0430\u0439", - "\u044e\u043d\u0438", - "\u044e\u043b\u0438", - "\u0430\u0432\u0433", - "\u0441\u0435\u043f", - "\u043e\u043a\u0442", - "\u043d\u043e\u0435", - "\u0434\u0435\u043a", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u044f\u043d\u0443\u0430\u0440\u0438", - "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440\u0438\u043b", - "\u043c\u0430\u0439", - "\u044e\u043d\u0438", - "\u044e\u043b\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438", - "\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438", - "\u043d\u043e\u0435\u043c\u0432\u0440\u0438", - "\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u044f", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u044e", - "\u044e", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "timezone.gmtFormat", - "\u0413\u0440\u0438\u043d\u0443\u0438\u0447{0}" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java deleted file mode 100644 index fa17a859bfd..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java +++ /dev/null @@ -1,323 +0,0 @@ -/* - * 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 - * 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_ca extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1T", - "2T", - "3T", - "4T", - }; - - final String[] sharedQuarterNames = { - "1r trimestre", - "2n trimestre", - "3r trimestre", - "4t trimestre", - }; - - final String[] sharedAmPmMarkers = { - "a. m.", - "p. m.", - }; - - final String[] sharedDayAbbreviations = { - "dg.", - "dl.", - "dt.", - "dc.", - "dj.", - "dv.", - "ds.", - }; - - final String[] sharedDayNames = { - "diumenge", - "dilluns", - "dimarts", - "dimecres", - "dijous", - "divendres", - "dissabte", - }; - - final String[] sharedDayNarrows = { - "dg", - "dl", - "dt", - "dc", - "dj", - "dv", - "ds", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "eB", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM 'de' y G", - "d MMMM 'de' y G", - "d/M/y G", - "d/M/yy GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "calendari budista" }, - { "calendarname.gregorian", - "calendari gregori\u00e0" }, - { "calendarname.gregory", - "calendari gregori\u00e0" }, - { "calendarname.islamic", - "calendari musulm\u00e0" }, - { "calendarname.islamic-civil", - "calendari civil isl\u00e0mic" }, - { "calendarname.japanese", - "calendari japon\u00e8s" }, - { "calendarname.roc", - "calendari de la Rep\u00fablica de Xina" }, - { "field.dayperiod", - "a. m./p. m." }, - { "field.era", - "era" }, - { "field.hour", - "hora" }, - { "field.minute", - "minut" }, - { "field.month", - "mes" }, - { "field.second", - "segon" }, - { "field.week", - "setmana" }, - { "field.weekday", - "dia de la setmana" }, - { "field.year", - "any" }, - { "field.zone", - "fus horari" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE d MMMM 'de' y GGGG", - "d MMMM 'de' y GGGG", - "d/M/y GGGG", - "d/M/yy G", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - new String[] { - "EEEE, dd MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd/MM/y GGGGG", - } - }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "abans de Crist", - "despr\u00e9s de Crist", - } - }, - { "java.time.roc.DatePatterns", - new String[] { - "EEEE d MMMM 'de' y G", - "d MMMM 'de' y G", - "dd/MM/y G", - "dd/MM/y GGGGG", - } - }, - { "java.time.short.Eras", - new String[] { - "aC", - "dC", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "EEEE d MMMM 'de' y GGGG", - "d MMMM 'de' y GGGG", - "dd/MM/y GGGG", - "dd/MM/y G", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "gen.", - "febr.", - "mar\u00e7", - "abr.", - "maig", - "juny", - "jul.", - "ag.", - "set.", - "oct.", - "nov.", - "des.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "de gener", - "de febrer", - "de mar\u00e7", - "d\u2019abril", - "de maig", - "de juny", - "de juliol", - "d\u2019agost", - "de setembre", - "d\u2019octubre", - "de novembre", - "de desembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "GN", - "FB", - "M\u00c7", - "AB", - "MG", - "JN", - "JL", - "AG", - "ST", - "OC", - "NV", - "DS", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java deleted file mode 100644 index 64d72dab0fa..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * 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 - * 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_cs extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1. \u010dtvrtlet\u00ed", - "2. \u010dtvrtlet\u00ed", - "3. \u010dtvrtlet\u00ed", - "4. \u010dtvrtlet\u00ed", - }; - - final String[] sharedAmPmMarkers = { - "dop.", - "odp.", - }; - - final String[] sharedDatePatterns = { - "EEEE d. MMMM y GGGG", - "d. MMMM y GGGG", - "d. M. y GGGG", - "dd.MM.yy G", - }; - - final String[] sharedDayAbbreviations = { - "ne", - "po", - "\u00fat", - "st", - "\u010dt", - "p\u00e1", - "so", - }; - - final String[] sharedDayNames = { - "ned\u011ble", - "pond\u011bl\u00ed", - "\u00fater\u00fd", - "st\u0159eda", - "\u010dtvrtek", - "p\u00e1tek", - "sobota", - }; - - final String[] sharedDayNarrows = { - "N", - "P", - "\u00da", - "S", - "\u010c", - "P", - "S", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d. MMMM y G", - "d. MMMM y G", - "d. M. y G", - "dd.MM.yy GGGGG", - }; - - final String[] sharedEras = { - "P\u0159ed R. O. C.", - "", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Buddhistick\u00fd kalend\u00e1\u0159" }, - { "calendarname.gregorian", - "Gregori\u00e1nsk\u00fd kalend\u00e1\u0159" }, - { "calendarname.gregory", - "Gregori\u00e1nsk\u00fd kalend\u00e1\u0159" }, - { "calendarname.islamic", - "Muslimsk\u00fd kalend\u00e1\u0159" }, - { "calendarname.islamic-civil", - "Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159" }, - { "calendarname.japanese", - "Japonsk\u00fd kalend\u00e1\u0159" }, - { "calendarname.roc", - "Kalend\u00e1\u0159 \u010c\u00ednsk\u00e9 republiky" }, - { "field.dayperiod", - "\u010d\u00e1st dne" }, - { "field.era", - "letopo\u010det" }, - { "field.hour", - "hodina" }, - { "field.minute", - "minuta" }, - { "field.month", - "m\u011bs\u00edc" }, - { "field.second", - "sekunda" }, - { "field.week", - "t\u00fdden" }, - { "field.weekday", - "den v t\u00fddnu" }, - { "field.year", - "rok" }, - { "field.zone", - "\u010dasov\u00e9 p\u00e1smo" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d. MMMM y G", - "d. MMMM y G", - "d. M. y G", - "dd.MM.yy GGGGG", - } - }, - { "java.time.long.Eras", - new String[] { - "p\u0159. n. l.", - "n. l.", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "p\u0159.Kr.", - "po Kr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "led", - "\u00fano", - "b\u0159e", - "dub", - "kv\u011b", - "\u010dvn", - "\u010dvc", - "srp", - "z\u00e1\u0159", - "\u0159\u00edj", - "lis", - "pro", - "", - } - }, - { "roc.MonthNames", - new String[] { - "ledna", - "\u00fanora", - "b\u0159ezna", - "dubna", - "kv\u011btna", - "\u010dervna", - "\u010dervence", - "srpna", - "z\u00e1\u0159\u00ed", - "\u0159\u00edjna", - "listopadu", - "prosince", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+H:mm;-H:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java deleted file mode 100644 index 1e5acf8832e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java +++ /dev/null @@ -1,315 +0,0 @@ -/* - * 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 - * 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_da extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1. kvt.", - "2. kvt.", - "3. kvt.", - "4. kvt.", - }; - - final String[] sharedQuarterNames = { - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - }; - - final String[] sharedDatePatterns = { - "EEEE d. MMMM y GGGG", - "d. MMMM y GGGG", - "d. MMM y GGGG", - "d/M/y", - }; - - final String[] sharedDayAbbreviations = { - "s\u00f8n.", - "man.", - "tir.", - "ons.", - "tor.", - "fre.", - "l\u00f8r.", - }; - - final String[] sharedDayNames = { - "s\u00f8ndag", - "mandag", - "tirsdag", - "onsdag", - "torsdag", - "fredag", - "l\u00f8rdag", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - }; - - final String[] sharedTimePatterns = { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d. MMMM y G", - "d. MMMM y G", - "d. MMM y G", - "d/M/y", - }; - - final String[] sharedJavaTimeLongEras = { - "f.Kr.", - "e.Kr.", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "buddhistisk kalender" }, - { "calendarname.gregorian", - "gregoriansk kalender" }, - { "calendarname.gregory", - "gregoriansk kalender" }, - { "calendarname.islamic", - "islamisk kalender" }, - { "calendarname.islamic-civil", - "verdslig islamisk kalender" }, - { "calendarname.islamic-umalqura", - "islamisk kalender (Umm al-Qura)" }, - { "calendarname.japanese", - "japansk kalender" }, - { "calendarname.roc", - "kalender for Republikken Kina" }, - { "field.dayperiod", - "AM/PM" }, - { "field.era", - "\u00e6ra" }, - { "field.hour", - "time" }, - { "field.minute", - "minut" }, - { "field.month", - "m\u00e5ned" }, - { "field.second", - "sekund" }, - { "field.week", - "uge" }, - { "field.weekday", - "ugedag" }, - { "field.year", - "\u00e5r" }, - { "field.zone", - "tidszone" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "maj", - "jun.", - "jul.", - "aug.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januar", - "februar", - "marts", - "april", - "maj", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "december", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH.mm;-HH.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java deleted file mode 100644 index 218afae3246..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * 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 - * 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_de extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1. Quartal", - "2. Quartal", - "3. Quartal", - "4. Quartal", - }; - - final String[] sharedAmPmMarkers = { - "vorm.", - "nachm.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d. MMMM y GGGG", - "d. MMMM y GGGG", - "dd.MM.y GGGG", - "dd.MM.yy G", - }; - - final String[] sharedDayAbbreviations = { - "So.", - "Mo.", - "Di.", - "Mi.", - "Do.", - "Fr.", - "Sa.", - }; - - final String[] sharedDayNames = { - "Sonntag", - "Montag", - "Dienstag", - "Mittwoch", - "Donnerstag", - "Freitag", - "Samstag", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "D", - "M", - "D", - "F", - "S", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedNarrowAmPmMarkers = { - "vm.", - "nm.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d. MMMM y G", - "d. MMMM y G", - "dd.MM.y G", - "dd.MM.yy GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "v. Chr.", - "n. Chr.", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Buddhistischer Kalender" }, - { "calendarname.gregorian", - "Gregorianischer Kalender" }, - { "calendarname.gregory", - "Gregorianischer Kalender" }, - { "calendarname.islamic", - "Islamischer Kalender" }, - { "calendarname.islamic-civil", - "B\u00fcrgerlicher islamischer Kalender" }, - { "calendarname.islamic-umalqura", - "Islamischer Kalender (Umm al-Qura" }, - { "calendarname.japanese", - "Japanischer Kalender" }, - { "calendarname.roc", - "Kalender der Republik China" }, - { "field.dayperiod", - "Tagesh\u00e4lfte" }, - { "field.era", - "Epoche" }, - { "field.hour", - "Stunde" }, - { "field.month", - "Monat" }, - { "field.second", - "Sekunde" }, - { "field.week", - "Woche" }, - { "field.weekday", - "Wochentag" }, - { "field.year", - "Jahr" }, - { "field.zone", - "Zeitzone" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "Jan.", - "Feb.", - "M\u00e4rz", - "Apr.", - "Mai", - "Juni", - "Juli", - "Aug.", - "Sep.", - "Okt.", - "Nov.", - "Dez.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "Januar", - "Februar", - "M\u00e4rz", - "April", - "Mai", - "Juni", - "Juli", - "August", - "September", - "Oktober", - "November", - "Dezember", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java deleted file mode 100644 index d2a4a1e0b73..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2015, 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_de_AT extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - return new Object[][] { - { "roc.MonthAbbreviations", - new String[] { - "J\u00e4n.", - "Feb.", - "M\u00e4rz", - "Apr.", - "Mai", - "Juni", - "Juli", - "Aug.", - "Sep.", - "Okt.", - "Nov.", - "Dez.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "J\u00e4nner", - "Februar", - "M\u00e4rz", - "April", - "Mai", - "Juni", - "Juli", - "August", - "September", - "Oktober", - "November", - "Dezember", - "", - } - }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java deleted file mode 100644 index 501b58379f8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java +++ /dev/null @@ -1,327 +0,0 @@ -/* - * 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 - * 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_el extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "\u03a41", - "\u03a42", - "\u03a43", - "\u03a44", - }; - - final String[] sharedQuarterNames = { - "1\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf", - "2\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf", - "3\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf", - "4\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf", - }; - - final String[] sharedAmPmMarkers = { - "\u03c0.\u03bc.", - "\u03bc.\u03bc.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "d/M/y G", - }; - - final String[] sharedDayAbbreviations = { - "\u039a\u03c5\u03c1", - "\u0394\u03b5\u03c5", - "\u03a4\u03c1\u03af", - "\u03a4\u03b5\u03c4", - "\u03a0\u03ad\u03bc", - "\u03a0\u03b1\u03c1", - "\u03a3\u03ac\u03b2", - }; - - final String[] sharedDayNames = { - "\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae", - "\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1", - "\u03a4\u03c1\u03af\u03c4\u03b7", - "\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7", - "\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7", - "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae", - "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf", - }; - - final String[] sharedDayNarrows = { - "\u039a", - "\u0394", - "\u03a4", - "\u03a4", - "\u03a0", - "\u03a0", - "\u03a3", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedNarrowAmPmMarkers = { - "\u03c0\u03bc", - "\u03bc\u03bc", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "d/M/y GGGGG", - }; - - final String[] sharedEras = { - "\u03a0\u03c1\u03b9\u03bd R.O.C.", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0392\u03bf\u03c5\u03b4\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.gregorian", - "\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.gregory", - "\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.islamic", - "\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.islamic-civil", - "\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.japanese", - "\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" }, - { "calendarname.roc", - "\u0397\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf \u03c4\u03b7\u03c2 \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1\u03c2 \u03c4\u03b7\u03c2 \u039a\u03af\u03bd\u03b1\u03c2" }, - { "field.dayperiod", - "\u03c0.\u03bc./\u03bc.\u03bc." }, - { "field.era", - "\u03c0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" }, - { "field.hour", - "\u03ce\u03c1\u03b1" }, - { "field.minute", - "\u03bb\u03b5\u03c0\u03c4\u03cc" }, - { "field.month", - "\u03bc\u03ae\u03bd\u03b1\u03c2" }, - { "field.second", - "\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" }, - { "field.week", - "\u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" }, - { "field.weekday", - "\u03ba\u03b1\u03b8\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae" }, - { "field.year", - "\u03ad\u03c4\u03bf\u03c2" }, - { "field.zone", - "\u03b6\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d MMMM, y G", - "d MMMM, y G", - "d MMM, y G", - "d/M/yy", - } - }, - { "java.time.long.Eras", - new String[] { - "\u03c0\u03c1\u03bf \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03cd", - "\u03bc\u03b5\u03c4\u03ac \u03a7\u03c1\u03b9\u03c3\u03c4\u03cc\u03bd", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u03c0.\u03a7.", - "\u03bc.\u03a7.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "\u0399\u03b1\u03bd", - "\u03a6\u03b5\u03b2", - "\u039c\u03b1\u03c1", - "\u0391\u03c0\u03c1", - "\u039c\u03b1\u0390", - "\u0399\u03bf\u03c5\u03bd", - "\u0399\u03bf\u03c5\u03bb", - "\u0391\u03c5\u03b3", - "\u03a3\u03b5\u03c0", - "\u039f\u03ba\u03c4", - "\u039d\u03bf\u03b5", - "\u0394\u03b5\u03ba", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5", - "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5", - "\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5", - "\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5", - "\u039c\u03b1\u0390\u03bf\u03c5", - "\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5", - "\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5", - "\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5", - "\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5", - "\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u0399", - "\u03a6", - "\u039c", - "\u0391", - "\u039c", - "\u0399", - "\u0399", - "\u0391", - "\u03a3", - "\u039f", - "\u039d", - "\u0394", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java deleted file mode 100644 index a2a444b4a8e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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_en_AU extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "am", - "pm", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd/MM/y G", - }; - - final String[] sharedDayAbbreviations = { - "Sun.", - "Mon.", - "Tue.", - "Wed.", - "Thu.", - "Fri.", - "Sat.", - }; - - final String[] sharedDayNarrows = { - "Su.", - "M.", - "Tu.", - "W.", - "Th.", - "F.", - "Sa.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd/MM/y GGGGG", - }; - - final String[] sharedMonthNarrows = { - "Jan.", - "Feb.", - "Mar.", - "Apr.", - "May", - "Jun.", - "Jul.", - "Aug.", - "Sep.", - "Oct.", - "Nov.", - "Dec.", - "", - }; - - return new Object[][] { - { "field.dayperiod", - "am/pm" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - sharedMonthNarrows }, - { "roc.MonthNarrows", - sharedMonthNarrows }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java deleted file mode 100644 index caf541ad944..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2015, 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_en_CA extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "EEEE, MMMM d, y GGGG", - "MMMM d, y GGGG", - "MMM d, y GGGG", - "G y-MM-dd", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "MMM d, y G", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java deleted file mode 100644 index 894b74cbe3f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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 - * 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_en_GB extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "am", - "pm", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd/MM/y G", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd/MM/y GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "am/pm" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java deleted file mode 100644 index fef27be727c..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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_en_IE extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "GGGG y MMMM d", - "GGGG y MMM d", - "G y-MM-dd", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "G y MMMM d", - "G y MMM d", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE d MMMM y G", - "MMMM d, y G", - "MMM d, y G", - "M/d/y GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java deleted file mode 100644 index 0c2d23db317..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2015, 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_en_IN extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "GGGG y MMMM d", - "dd-MMM-y GGGG", - "G y-MM-dd", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "G y MMMM d", - "dd-MMM-y G", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE d MMMM y G", - "MMMM d, y G", - "dd-MMM-y G", - "M/d/y GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java deleted file mode 100644 index af6d84646ba..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2015, 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_en_MT extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "dd MMMM y GGGG", - "dd MMM y GGGG", - "G y-MM-dd", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "dd MMMM y G", - "dd MMM y G", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, MMMM d, y G", - "dd MMMM y G", - "dd MMM y G", - "M/d/y GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java deleted file mode 100644 index cedbd26f8c5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2015, 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_en_NZ extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "d/MM/y GGGG", - "d/MM/y G", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "d/MM/y G", - "d/MM/y GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "d/MM/y G", - "d/MM/y GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java deleted file mode 100644 index 9f743599d4e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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 - * 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_en_SG extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "d/M/yy G", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "d/M/yy GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "MMM d, y G", - "d/M/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java deleted file mode 100644 index 69ba92b9f8f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2015, 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_en_ZA extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "EEEE, dd MMMM y GGGG", - "dd MMMM y GGGG", - "dd MMM y GGGG", - "G y/MM/dd", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, dd MMMM y G", - "dd MMMM y G", - "dd MMM y G", - "GGGGG y/MM/dd", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java deleted file mode 100644 index a19188834c0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java +++ /dev/null @@ -1,322 +0,0 @@ -/* - * 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 - * 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 extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "T1", - "T2", - "T3", - "T4", - }; - - final String[] sharedQuarterNames = { - "1.er trimestre", - "2.\u00ba trimestre", - "3.er trimestre", - "4.\u00ba trimestre", - }; - - final String[] sharedAmPmMarkers = { - "a. m.", - "p. m.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d 'de' MMMM 'de' y GGGG", - "d 'de' MMMM 'de' y GGGG", - "d/M/y GGGG", - "d/M/yy GGGG", - }; - - final String[] sharedDayAbbreviations = { - "dom.", - "lun.", - "mar.", - "mi\u00e9.", - "jue.", - "vie.", - "s\u00e1b.", - }; - - final String[] sharedDayNames = { - "domingo", - "lunes", - "martes", - "mi\u00e9rcoles", - "jueves", - "viernes", - "s\u00e1bado", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "X", - "J", - "V", - "S", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss (zzzz)", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "d/M/y G", - "d/M/yy G", - }; - - final String[] sharedEras = { - "antes de R.O.C.", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "calendario budista" }, - { "calendarname.gregorian", - "calendario gregoriano" }, - { "calendarname.gregory", - "calendario gregoriano" }, - { "calendarname.islamic", - "calendario isl\u00e1mico" }, - { "calendarname.islamic-civil", - "calendario civil isl\u00e1mico" }, - { "calendarname.japanese", - "calendario japon\u00e9s" }, - { "calendarname.roc", - "calendario de la Rep\u00fablica de China" }, - { "field.dayperiod", - "a. m./p. m." }, - { "field.era", - "era" }, - { "field.hour", - "hora" }, - { "field.minute", - "minuto" }, - { "field.month", - "mes" }, - { "field.second", - "segundo" }, - { "field.week", - "semana" }, - { "field.weekday", - "d\u00eda de la semana" }, - { "field.year", - "a\u00f1o" }, - { "field.zone", - "zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "dd/MM/y G", - "dd/MM/yy GGGGG", - } - }, - { "java.time.long.Eras", - new String[] { - "antes de Cristo", - "despu\u00e9s de Cristo", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "antes de Cristo", - "anno D\u00f3mini", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sept.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "enero", - "febrero", - "marzo", - "abril", - "mayo", - "junio", - "julio", - "agosto", - "septiembre", - "octubre", - "noviembre", - "diciembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "E", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java deleted file mode 100644 index fb9111a1663..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * 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_AR extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java deleted file mode 100644 index c540c54358e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * 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_BO extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java deleted file mode 100644 index 9ff73c416d9..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * 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_CL extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1.\u00b0 trimestre", - "2.\u00b0 trimestre", - "3.\u00b0 trimestre", - "4.\u00ba trimestre", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "dd-MM-y GGGG", - "dd-MM-y G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "dd-MM-y G", - "dd-MM-y GGGGG", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "dd-MM-y G", - "dd-MM-y GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java deleted file mode 100644 index fd5aa17577b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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_CO extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "d/MM/y GGGG", - "d/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "d/MM/y G", - "d/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "d/MM/y G", - "d/MM/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java deleted file mode 100644 index b8530cd0a8b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * 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_CR extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java deleted file mode 100644 index 3bd08aa334f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * 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() { - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "dd/MM/y GGGG", - "G y-MM-dd", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "dd/MM/y G", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "field.dayperiod", - "a.m./p.m." }, - { "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" }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java deleted file mode 100644 index 4a1e4a5ced7..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * 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_EC extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java deleted file mode 100644 index d5662cdfe1d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2015, 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_GT extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "d/MM/y GGGG", - "d/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "d/MM/y G", - "d/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "d/MM/y G", - "d/MM/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java deleted file mode 100644 index 9e0a481afbc..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2015, 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_HN extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE dd 'de' MMMM 'de' y GGGG", - "dd 'de' MMMM 'de' y GGGG", - "GGGG y MMM d", - "G y-MM-dd", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE dd 'de' MMMM 'de' y G", - "dd 'de' MMMM 'de' y G", - "G y MMM d", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE dd 'de' MMMM 'de' y G", - "dd 'de' MMMM 'de' y G", - "dd/MM/y G", - "dd/MM/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java deleted file mode 100644 index 4487bc676c0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * 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_MX extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1er. trim.", - "2\u00ba. trim.", - "3er. trim.", - "4\u00ba trim.", - }; - - final String[] sharedQuarterNames = { - "1er. trimestre", - "2\u00ba. trimestre", - "3er. trimestre", - "4\u00ba trimestre", - }; - - final String[] sharedQuarterNarrows = { - "1T", - "2T", - "3T", - "4T", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "d MMM, y GGGG", - "G y-MM-dd", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "d MMM, y G", - "GGGGG y-MM-dd", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.gregorian", - "Calendario gregoriano" }, - { "calendarname.gregory", - "Calendario gregoriano" }, - { "calendarname.roc", - "calendario minguo" }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "d MMM, y G", - "dd/MM/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene", - "feb", - "mar", - "abr", - "may", - "jun", - "jul", - "ago", - "sep", - "oct", - "nov", - "dic", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java deleted file mode 100644 index 313705ba3a8..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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_PA extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1er. trimestre", - "2do. trimestre", - "3er. trimestre", - "4.\u00ba trimestre", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "MM/dd/y GGGG", - "MM/dd/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "MM/dd/y G", - "MM/dd/yy GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "MM/dd/y G", - "MM/dd/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java deleted file mode 100644 index a63e59eed44..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright (c) 2015, 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_PE extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "d/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "d/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "dd/MM/y G", - "d/MM/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "set.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "enero", - "febrero", - "marzo", - "abril", - "mayo", - "junio", - "julio", - "agosto", - "setiembre", - "octubre", - "noviembre", - "diciembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java deleted file mode 100644 index ddd6450ed41..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * 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_PR extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "MM/dd/y GGGG", - "MM/dd/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "MM/dd/y G", - "MM/dd/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "MM/dd/y G", - "MM/dd/yy GGGGG", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java deleted file mode 100644 index ebd09ebc5de..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * 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_PY extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java deleted file mode 100644 index f12835c1996..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * 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() { - final String[] sharedAmPmMarkers = { - "AM", - "PM", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedAbbreviatedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sep.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java deleted file mode 100644 index bcae639ef76..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (c) 2015, 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_UY extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "set.", - "oct.", - "nov.", - "dic.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "enero", - "febrero", - "marzo", - "abril", - "mayo", - "junio", - "julio", - "agosto", - "setiembre", - "octubre", - "noviembre", - "diciembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java deleted file mode 100644 index df4ad91ae02..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * 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() { - final String[] sharedQuarterNames = { - "1er trimestre", - "2do trimestre", - "3er trimestre", - "4to trimestre", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd/MM/yy G", - }; - - final String[] sharedDayNarrows = { - "d", - "l", - "m", - "m", - "j", - "v", - "s", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "dd/MM/yy GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.zone", - "Zona horaria" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthNarrows", - new String[] { - "e", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java deleted file mode 100644 index 5dc9739f706..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * 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 - * 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_et extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - }; - - final String[] sharedDatePatterns = { - "EEEE, d. MMMM y GGGG", - "d. MMMM y GGGG", - "dd.MM.y GGGG", - "dd.MM.y G", - }; - - final String[] sharedDayNarrows = { - "P", - "E", - "T", - "K", - "N", - "R", - "L", - }; - - final String[] sharedDayNames = { - "p\u00fchap\u00e4ev", - "esmasp\u00e4ev", - "teisip\u00e4ev", - "kolmap\u00e4ev", - "neljap\u00e4ev", - "reede", - "laup\u00e4ev", - }; - - final String[] sharedTimePatterns = { - "H:mm.ss zzzz", - "H:mm.ss z", - "H:mm.ss", - "H:mm", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d. MMMM y G", - "d. MMMM y G", - "dd.MM.y G", - "dd.MM.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "budistlik kalender" }, - { "calendarname.gregorian", - "Gregoriuse kalender" }, - { "calendarname.gregory", - "Gregoriuse kalender" }, - { "calendarname.islamic", - "islamikalender" }, - { "calendarname.islamic-civil", - "islami ilmalik kalender" }, - { "calendarname.japanese", - "Jaapani kalender" }, - { "calendarname.roc", - "Hiina Vabariigi kalender" }, - { "field.dayperiod", - "enne/p\u00e4rast l\u00f5unat" }, - { "field.era", - "ajastu" }, - { "field.hour", - "tund" }, - { "field.minute", - "minut" }, - { "field.month", - "kuu" }, - { "field.second", - "sekund" }, - { "field.week", - "n\u00e4dal" }, - { "field.weekday", - "n\u00e4dalap\u00e4ev" }, - { "field.year", - "aasta" }, - { "field.zone", - "ajav\u00f6\u00f6nd" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayNarrows }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "enne Kristust", - "p\u00e4rast Kristust", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "e.m.a.", - "m.a.j.", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayNarrows }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "jaan", - "veebr", - "m\u00e4rts", - "apr", - "mai", - "juuni", - "juuli", - "aug", - "sept", - "okt", - "nov", - "dets", - "", - } - }, - { "roc.MonthNames", - new String[] { - "jaanuar", - "veebruar", - "m\u00e4rts", - "aprill", - "mai", - "juuni", - "juuli", - "august", - "september", - "oktoober", - "november", - "detsember", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "V", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "timezone.hourFormat", - "+HH:mm;\u2212HH:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java deleted file mode 100644 index 2456945df4b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java +++ /dev/null @@ -1,333 +0,0 @@ -/* - * 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 - * 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_fi extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1. nelj.", - "2. nelj.", - "3. nelj.", - "4. nelj.", - }; - - final String[] sharedQuarterNames = { - "1. nelj\u00e4nnes", - "2. nelj\u00e4nnes", - "3. nelj\u00e4nnes", - "4. nelj\u00e4nnes", - }; - - final String[] sharedAmPmMarkers = { - "ap.", - "ip.", - }; - - final String[] sharedDatePatterns = { - "EEEE d. MMMM y GGGG", - "d. MMMM y GGGG", - "d.M.y GGGG", - "d.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "su", - "ma", - "ti", - "ke", - "to", - "pe", - "la", - }; - - final String[] sharedDayNames = { - "sunnuntaina", - "maanantaina", - "tiistaina", - "keskiviikkona", - "torstaina", - "perjantaina", - "lauantaina", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "T", - "K", - "T", - "P", - "L", - }; - - final String[] sharedTimePatterns = { - "H.mm.ss zzzz", - "H.mm.ss z", - "H.mm.ss", - "H.mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "cccc d. MMMM y G", - "d. MMMM y G", - "d.M.y G", - "d.M.y GGGGG", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - final String[] sharedMonthNames = { - "tammikuuta", - "helmikuuta", - "maaliskuuta", - "huhtikuuta", - "toukokuuta", - "kes\u00e4kuuta", - "hein\u00e4kuuta", - "elokuuta", - "syyskuuta", - "lokakuuta", - "marraskuuta", - "joulukuuta", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "buddhalainen kalenteri" }, - { "calendarname.gregorian", - "gregoriaaninen kalenteri" }, - { "calendarname.gregory", - "gregoriaaninen kalenteri" }, - { "calendarname.islamic", - "islamilainen kalenteri" }, - { "calendarname.islamic-civil", - "islamilainen siviilikalenteri, perjantai-epookki" }, - { "calendarname.islamic-umalqura", - "islamilainen Umm al-Qura -kalenteri" }, - { "calendarname.japanese", - "japanilainen kalenteri" }, - { "calendarname.roc", - "Kiinan tasavallan kalenteri" }, - { "field.dayperiod", - "vuorokaudenaika" }, - { "field.era", - "aikakausi" }, - { "field.hour", - "tunti" }, - { "field.minute", - "minuutti" }, - { "field.month", - "kuukausi" }, - { "field.second", - "sekunti" }, - { "field.week", - "viikko" }, - { "field.weekday", - "viikonp\u00e4iv\u00e4" }, - { "field.year", - "vuosi" }, - { "field.zone", - "aikavy\u00f6hyke" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "muharram", - "safar", - "rabi\u2019 al-awwal", - "rabi\u2019 al-akhir", - "d\u017eumada-l-ula", - "d\u017eumada-l-akhira", - "rad\u017eab", - "\u0161a\u2019ban", - "ramadan", - "\u0161awwal", - "dhu-l-qa\u2019da", - "dhu-l-hidd\u017ea", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.DatePatterns", - new String[] { - "cccc d. MMMM y", - "d. MMMM y", - "d.M.y", - "d.M.y", - } - }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "ennen Kristuksen syntym\u00e4\u00e4", - "j\u00e4lkeen Kristuksen syntym\u00e4n", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "eKr.", - "jKr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - sharedMonthNames }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.MonthNarrows", - new String[] { - "T", - "H", - "M", - "H", - "T", - "K", - "H", - "E", - "S", - "L", - "M", - "J", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.gmtFormat", - "UTC{0}" }, - { "timezone.hourFormat", - "+H.mm;-H.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java deleted file mode 100644 index 1bebe8ee829..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java +++ /dev/null @@ -1,338 +0,0 @@ -/* - * 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 - * 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_fr extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "T1", - "T2", - "T3", - "T4", - }; - - final String[] sharedQuarterNames = { - "1er trimestre", - "2e trimestre", - "3e trimestre", - "4e trimestre", - }; - - final String[] sharedAmPmMarkers = { - "AM", - "PM", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd/MM/y G", - }; - - final String[] sharedDayAbbreviations = { - "dim.", - "lun.", - "mar.", - "mer.", - "jeu.", - "ven.", - "sam.", - }; - - final String[] sharedDayNames = { - "dimanche", - "lundi", - "mardi", - "mercredi", - "jeudi", - "vendredi", - "samedi", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd/MM/y GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\u00e8re bouddhiste", - }; - - final String[] sharedEras = { - "avant RdC", - "RdC", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "calendrier bouddhiste" }, - { "calendarname.gregorian", - "calendrier gr\u00e9gorien" }, - { "calendarname.gregory", - "calendrier gr\u00e9gorien" }, - { "calendarname.islamic", - "calendrier musulman" }, - { "calendarname.islamic-civil", - "calendrier musulman (tabulaire, \u00e9poque civile)" }, - { "calendarname.japanese", - "calendrier japonais" }, - { "calendarname.roc", - "calendrier r\u00e9publicain chinois" }, - { "field.dayperiod", - "cadran" }, - { "field.era", - "\u00e8re" }, - { "field.hour", - "heure" }, - { "field.minute", - "minute" }, - { "field.month", - "mois" }, - { "field.second", - "seconde" }, - { "field.week", - "semaine" }, - { "field.weekday", - "jour de la semaine" }, - { "field.year", - "ann\u00e9e" }, - { "field.zone", - "fuseau horaire" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthAbbreviations", - new String[] { - "mouh.", - "saf.", - "rab. aw.", - "rab. th.", - "joum. oul.", - "joum. tha.", - "raj.", - "chaa.", - "ram.", - "chaw.", - "dhou. q.", - "dhou. h.", - "", - } - }, - { "islamic.MonthNames", - new String[] { - "mouharram", - "safar", - "rabia al awal", - "rabia ath-thani", - "joumada al oula", - "joumada ath-thania", - "rajab", - "chaabane", - "ramadan", - "chawwal", - "dhou al qi`da", - "dhou al-hijja", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "avant J\u00e9sus-Christ", - "apr\u00e8s J\u00e9sus-Christ", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "BC", - "ap. J.-C.", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "janv.", - "f\u00e9vr.", - "mars", - "avr.", - "mai", - "juin", - "juil.", - "ao\u00fbt", - "sept.", - "oct.", - "nov.", - "d\u00e9c.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janvier", - "f\u00e9vrier", - "mars", - "avril", - "mai", - "juin", - "juillet", - "ao\u00fbt", - "septembre", - "octobre", - "novembre", - "d\u00e9cembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.gmtFormat", - "UTC{0}" }, - { "timezone.hourFormat", - "+HH:mm;\u2212HH:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java deleted file mode 100644 index 587befa05bf..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2015, 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_fr_BE extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedTimePatterns = { - "H 'h' mm 'min' ss 's' zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "d/MM/yy GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - new String[] { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "d/MM/yy G", - } - }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - new String[] { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "d/MM/yy GGGGG", - } - }, - { "roc.DatePatterns", - new String[] { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "d/MM/yy G", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java deleted file mode 100644 index dbf796fba1f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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_fr_CA extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "yy-MM-dd GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - new String[] { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "y-MM-dd G", - } - }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "y-MM-dd GGGGG", - } - }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - new String[] { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "yy-MM-dd GGGGG", - } - }, - { "roc.DatePatterns", - new String[] { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "yy-MM-dd G", - } - }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java deleted file mode 100644 index 74a8d790ab7..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2015, 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_fr_CH extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedTimePatterns = { - "HH.mm:ss 'h' zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd.MM.yy GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - new String[] { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd.MM.yy G", - } - }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - new String[] { - "EEEE, d MMMM y G", - "G y MMMM d", - "G y MMM d", - "dd.MM.yy GGGGG", - } - }, - { "roc.DatePatterns", - new String[] { - "EEEE, d MMMM y GGGG", - "GGGG y MMMM d", - "GGGG y MMM d", - "dd.MM.yy G", - } - }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java deleted file mode 100644 index 33594de7548..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * 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 - * 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_ga extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "R1", - "R2", - "R3", - "R4", - }; - - final String[] sharedQuarterNames = { - "1\u00fa r\u00e1ithe", - "2\u00fa r\u00e1ithe", - "3\u00fa r\u00e1ithe", - "4\u00fa r\u00e1ithe", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd/MM/y G", - }; - - final String[] sharedDayAbbreviations = { - "Domh", - "Luan", - "M\u00e1irt", - "C\u00e9ad", - "D\u00e9ar", - "Aoine", - "Sath", - }; - - final String[] sharedDayNames = { - "D\u00e9 Domhnaigh", - "D\u00e9 Luain", - "D\u00e9 M\u00e1irt", - "D\u00e9 C\u00e9adaoin", - "D\u00e9ardaoin", - "D\u00e9 hAoine", - "D\u00e9 Sathairn", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "C", - "D", - "A", - "S", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd/MM/y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "F\u00e9ilire B\u00fada\u00edoch" }, - { "calendarname.gregorian", - "F\u00e9ilire Ghr\u00e9ag\u00f3ra" }, - { "calendarname.gregory", - "F\u00e9ilire Ghr\u00e9ag\u00f3ra" }, - { "calendarname.islamic", - "F\u00e9ilire Iosl\u00e1mach" }, - { "calendarname.japanese", - "F\u00e9ilire Seap\u00e1nach" }, - { "calendarname.roc", - "F\u00e9ilire T\u00e9av\u00e1nach" }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.era", - "R\u00e9" }, - { "field.hour", - "Uair" }, - { "field.minute", - "N\u00f3im\u00e9ad" }, - { "field.month", - "M\u00ed" }, - { "field.second", - "Soicind" }, - { "field.week", - "Seachtain" }, - { "field.weekday", - "L\u00e1 na seachtaine" }, - { "field.year", - "Bliain" }, - { "field.zone", - "Crios Ama" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "Roimh Chr\u00edost", - "Anno Domini", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "RC", - "AD", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "Ean", - "Feabh", - "M\u00e1rta", - "Aib", - "Beal", - "Meith", - "I\u00fail", - "L\u00fan", - "MF\u00f3mh", - "DF\u00f3mh", - "Samh", - "Noll", - "", - } - }, - { "roc.MonthNames", - new String[] { - "Ean\u00e1ir", - "Feabhra", - "M\u00e1rta", - "Aibre\u00e1n", - "Bealtaine", - "Meitheamh", - "I\u00fail", - "L\u00fanasa", - "Me\u00e1n F\u00f3mhair", - "Deireadh F\u00f3mhair", - "Samhain", - "Nollaig", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "E", - "F", - "M", - "A", - "B", - "M", - "I", - "L", - "M", - "D", - "S", - "N", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "timezone.gmtFormat", - "MAG{0}" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_he.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_he.java deleted file mode 100644 index 0b1df1c6b6d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_he.java +++ /dev/null @@ -1,333 +0,0 @@ -/* - * 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 - * 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_he extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "\u05e8\u05d1\u05e2\u05d5\u05df 1", - "\u05e8\u05d1\u05e2\u05d5\u05df 2", - "\u05e8\u05d1\u05e2\u05d5\u05df 3", - "\u05e8\u05d1\u05e2\u05d5\u05df 4", - }; - - final String[] sharedAmPmMarkers = { - "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6", - "\u05d0\u05d7\u05d4\u05f4\u05e6", - }; - - final String[] sharedDayAbbreviations = { - "\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", - }; - - final String[] sharedDayNames = { - "\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", - }; - - final String[] sharedDayNarrows = { - "\u05d0\u05f3", - "\u05d1\u05f3", - "\u05d2\u05f3", - "\u05d3\u05f3", - "\u05d4\u05f3", - "\u05d5\u05f3", - "\u05e9\u05f3", - }; - - final String[] sharedEras = { - "", - "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d \u05d1MMMM y G", - "d \u05d1MMMM y G", - "d \u05d1MMM y G", - "d.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "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.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\u05e0\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.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE, d \u05d1MMMM y GGGG", - "d \u05d1MMMM y GGGG", - "d \u05d1MMM y GGGG", - "dd/MM/yy G", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "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", - "\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\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.QuarterAbbreviations", - sharedQuarterNames }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "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", - sharedJavaTimeDatePatterns }, - { "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", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u05dc\u05e1\u05d4\"\u05e0", - "\u05dc\u05e4\u05e1\u05d4\"\u05e0", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "EEEE, d \u05d1MMMM y GGGG", - "d \u05d1MMMM y GGGG", - "d \u05d1MMM y GGGG", - "d.M.y G", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "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.QuarterAbbreviations", - sharedQuarterNames }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "timezone.gmtFormat", - "GMT{0}\u200e" }, - { "timezone.hourFormat", - "\u200e+HH:mm;-HH:mm\u200e" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java deleted file mode 100644 index 5f5ad9e4af4..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java +++ /dev/null @@ -1,344 +0,0 @@ -/* - * 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 - * 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_hi_IN extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "\u0924\u093f1", - "\u0924\u093f2", - "\u0924\u093f3", - "\u0924\u093f4", - }; - - final String[] sharedQuarterNames = { - "\u092a\u0939\u0932\u0940 \u0924\u093f\u092e\u093e\u0939\u0940", - "\u0926\u0942\u0938\u0930\u0940 \u0924\u093f\u092e\u093e\u0939\u0940", - "\u0924\u0940\u0938\u0930\u0940 \u0924\u093f\u092e\u093e\u0939\u0940", - "\u091a\u094c\u0925\u0940 \u0924\u093f\u092e\u093e\u0939\u0940", - }; - - final String[] sharedAmPmMarkers = { - "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928", - "\u0905\u092a\u0930\u093e\u0939\u094d\u0928", - }; - - final String[] sharedDatePatterns = { - "GGGG EEEE, d MMMM y", - "GGGG d MMMM y", - "GGGG d MMM y", - "GGGG d/M/y", - }; - - final String[] sharedDayAbbreviations = { - "\u0930\u0935\u093f", - "\u0938\u094b\u092e", - "\u092e\u0902\u0917\u0932", - "\u092c\u0941\u0927", - "\u0917\u0941\u0930\u0941", - "\u0936\u0941\u0915\u094d\u0930", - "\u0936\u0928\u093f", - }; - - final String[] sharedDayNames = { - "\u0930\u0935\u093f\u0935\u093e\u0930", - "\u0938\u094b\u092e\u0935\u093e\u0930", - "\u092e\u0902\u0917\u0932\u0935\u093e\u0930", - "\u092c\u0941\u0927\u0935\u093e\u0930", - "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", - "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", - "\u0936\u0928\u093f\u0935\u093e\u0930", - }; - - final String[] sharedDayNarrows = { - "\u0930", - "\u0938\u094b", - "\u092e\u0902", - "\u092c\u0941", - "\u0917\u0941", - "\u0936\u0941", - "\u0936", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedAbbreviatedAmPmMarkers = { - "\u092a\u0942\u0930\u094d\u0935", - "\u0905\u092a\u0930", - }; - - final String[] sharedNarrowAmPmMarkers = { - "\u092a\u0942", - "\u0905", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G EEEE, d MMMM y", - "G d MMMM y", - "G d MMM y", - "G d/M/y", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u092c\u094c\u0926\u094d\u0927 \u092a\u0902\u091a\u093e\u0902\u0917" }, - { "calendarname.gregorian", - "\u0917\u094d\u0930\u0947\u0917\u094b\u0930\u093f\u092f\u0928 \u0915\u0948\u0932\u0947\u0902\u0921\u0930" }, - { "calendarname.gregory", - "\u0917\u094d\u0930\u0947\u0917\u094b\u0930\u093f\u092f\u0928 \u0915\u0948\u0932\u0947\u0902\u0921\u0930" }, - { "calendarname.islamic", - "\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" }, - { "calendarname.islamic-civil", - "\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u0928\u093e\u0917\u0930\u093f\u0915 \u092a\u0902\u091a\u093e\u0902\u0917" }, - { "calendarname.japanese", - "\u091c\u093e\u092a\u093e\u0928\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" }, - { "calendarname.roc", - "\u091a\u0940\u0928\u0940 \u0917\u0923\u0924\u0902\u0924\u094d\u0930 \u092a\u0902\u091a\u093e\u0902\u0917" }, - { "field.dayperiod", - "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928/\u0905\u092a\u0930\u093e\u0939\u094d\u0928" }, - { "field.era", - "\u092f\u0941\u0917" }, - { "field.hour", - "\u0918\u0902\u091f\u093e" }, - { "field.minute", - "\u092e\u093f\u0928\u091f" }, - { "field.month", - "\u092e\u093e\u0939" }, - { "field.second", - "\u0938\u0947\u0915\u0902\u0921" }, - { "field.week", - "\u0938\u092a\u094d\u0924\u093e\u0939" }, - { "field.weekday", - "\u0938\u092a\u094d\u0924\u093e\u0939 \u0915\u093e \u0926\u093f\u0928" }, - { "field.year", - "\u0935\u0930\u094d\u0937" }, - { "field.zone", - "\u0938\u092e\u092f \u0915\u094d\u0937\u0947\u0924\u094d\u0930" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "\u092e\u0941\u0939\u0930\u094d\u0930\u092e", - "\u0938\u092b\u0930", - "\u0930\u093e\u092c\u0940 \u092a\u094d\u0930\u0925\u092e", - "\u0930\u093e\u092c\u0940 \u0926\u094d\u0935\u093f\u0924\u0940\u092f", - "\u091c\u0941\u092e\u094d\u0921\u093e \u092a\u094d\u0930\u0925\u092e", - "\u091c\u0941\u092e\u094d\u0921\u093e \u0926\u094d\u0935\u093f\u0924\u0940\u092f", - "\u0930\u091c\u092c", - "\u0936\u093e\u0935\u0928", - "\u0930\u092e\u091c\u093e\u0928", - "\u0936\u0935\u094d\u0935\u094d\u0932", - "\u091c\u093f\u0932-\u0915\u094d\u0926\u093e\u0939", - "\u091c\u093f\u0932\u094d-\u0939\u093f\u091c\u094d\u091c\u093e\u0939", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - new String[] { - "\u0908\u0938\u0935\u0940 \u0938\u0928", - "\u092e\u0947\u091c\u0940", - "\u0924\u093e\u0908\u0936\u094b", - "\u0936\u094b\u0935\u093e", - "\u0939\u0947\u0908\u0938\u0947\u0908", - "\u0930\u0947\u0907\u0935\u093e", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "\u0908\u0938\u094d\u0935\u0940", - "\u092e\u0947\u091c\u0940", - "\u0924\u093e\u0908\u0936\u094b", - "\u0936\u094b\u0935\u093e", - "\u0939\u0947\u0908\u0938\u0947\u0908", - "\u0930\u0947\u0907\u0935\u093e", - } - }, - { "java.time.long.Eras", - new String[] { - "\u0908\u0938\u093e-\u092a\u0942\u0930\u094d\u0935", - "\u0908\u0938\u0935\u0940 \u0938\u0928", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u0908\u0938\u093e\u092a\u0942\u0930\u094d\u0935", - "\u0938\u0928", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "\u091c\u0928\u0970", - "\u092b\u093c\u0930\u0970", - "\u092e\u093e\u0930\u094d\u091a", - "\u0905\u092a\u094d\u0930\u0948\u0932", - "\u092e\u0908", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u0970", - "\u0905\u0917\u0970", - "\u0938\u093f\u0924\u0970", - "\u0905\u0915\u094d\u0924\u0942\u0970", - "\u0928\u0935\u0970", - "\u0926\u093f\u0938\u0970", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u091c\u0928\u0935\u0930\u0940", - "\u092b\u093c\u0930\u0935\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u0905\u092a\u094d\u0930\u0948\u0932", - "\u092e\u0908", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u093e\u0908", - "\u0905\u0917\u0938\u094d\u0924", - "\u0938\u093f\u0924\u0902\u092c\u0930", - "\u0905\u0915\u094d\u0924\u0942\u092c\u0930", - "\u0928\u0935\u0902\u092c\u0930", - "\u0926\u093f\u0938\u0902\u092c\u0930", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u091c", - "\u092b\u093c", - "\u092e\u093e", - "\u0905", - "\u092e", - "\u091c\u0942", - "\u091c\u0941", - "\u0905", - "\u0938\u093f", - "\u0905", - "\u0928", - "\u0926\u093f", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAbbreviatedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java deleted file mode 100644 index c46e61ba816..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java +++ /dev/null @@ -1,344 +0,0 @@ -/* - * 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 - * 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_hr extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1kv", - "2kv", - "3kv", - "4kv", - }; - - final String[] sharedQuarterNames = { - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "AM", - "PM", - }; - - final String[] sharedDayAbbreviations = { - "ned", - "pon", - "uto", - "sri", - "\u010det", - "pet", - "sub", - }; - - final String[] sharedDayNames = { - "nedjelja", - "ponedjeljak", - "utorak", - "srijeda", - "\u010detvrtak", - "petak", - "subota", - }; - - final String[] sharedDayNarrows = { - "N", - "P", - "U", - "S", - "\u010c", - "P", - "S", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d. MMMM y. G", - "d. MMMM y. G", - "d. MMM y. G", - "dd.MM.y. GGGGG", - }; - - final String[] sharedJavaTimeDatePatterns2 = { - "EEEE, d. MMMM y. G", - "d. MMMM y. G", - "d. M. y. G", - "d.M.y. GGGGG", - }; - - final String[] sharedEras = { - "prije R.O.C.", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "budisti\u010dki kalendar" }, - { "calendarname.gregorian", - "gregorijanski kalendar" }, - { "calendarname.gregory", - "gregorijanski kalendar" }, - { "calendarname.islamic", - "islamski kalendar" }, - { "calendarname.islamic-civil", - "islamski civilni kalendar" }, - { "calendarname.japanese", - "japanski kalendar" }, - { "calendarname.roc", - "kalendar Republike Kine" }, - { "field.dayperiod", - "AM/PM" }, - { "field.era", - "era" }, - { "field.hour", - "sat" }, - { "field.minute", - "minuta" }, - { "field.month", - "mjesec" }, - { "field.second", - "sekunda" }, - { "field.week", - "tjedan" }, - { "field.weekday", - "dan u tjednu" }, - { "field.year", - "godina" }, - { "field.zone", - "vremenska zona" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE, d. MMMM y. GGGG", - "d. MMMM y. GGGG", - "d. M. y. GGGG", - "d.M.y. G", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns2 }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns2 }, - { "java.time.japanese.long.Eras", - new String[] { - "poslije Krista", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "p. Kr.", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.long.Eras", - new String[] { - "prije Krista", - "poslije Krista", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "Prije Krista", - "Poslije Krista", - } - }, - { "roc.DatePatterns", - new String[] { - "EEEE, d. MMMM y. GGGG", - "d. MMMM y. GGGG", - "d. MMM y. GGGG", - "dd.MM.y. G", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "sij", - "velj", - "o\u017eu", - "tra", - "svi", - "lip", - "srp", - "kol", - "ruj", - "lis", - "stu", - "pro", - "", - } - }, - { "roc.MonthNames", - new String[] { - "sije\u010dnja", - "velja\u010de", - "o\u017eujka", - "travnja", - "svibnja", - "lipnja", - "srpnja", - "kolovoza", - "rujna", - "listopada", - "studenoga", - "prosinca", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "1.", - "2.", - "3.", - "4.", - "5.", - "6.", - "7.", - "8.", - "9.", - "10.", - "11.", - "12.", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH:mm; -HH:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java deleted file mode 100644 index 30c32652c7f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java +++ /dev/null @@ -1,385 +0,0 @@ -/* - * 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 - * 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_hu extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "N1", - "N2", - "N3", - "N4", - }; - - final String[] sharedQuarterNames = { - "I. negyed\u00e9v", - "II. negyed\u00e9v", - "III. negyed\u00e9v", - "IV. negyed\u00e9v", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "de.", - "du.", - }; - - final String[] sharedDatePatterns = { - "GGGG y. MMMM d., EEEE", - "GGGG y. MMMM d.", - "GGGG y. MMM d.", - "G y. M. d.", - }; - - final String[] sharedDayAbbreviations = { - "V", - "H", - "K", - "Sze", - "Cs", - "P", - "Szo", - }; - - final String[] sharedDayNames = { - "vas\u00e1rnap", - "h\u00e9tf\u0151", - "kedd", - "szerda", - "cs\u00fct\u00f6rt\u00f6k", - "p\u00e9ntek", - "szombat", - }; - - final String[] sharedDayNarrows = { - "V", - "H", - "K", - "Sz", - "Cs", - "P", - "Sz", - }; - - final String[] sharedEras = { - "", - "MF", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y. MMMM d., EEEE", - "G y. MMMM d.", - "G y. MMM d.", - "GGGGG y. M. d.", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "BK", - }; - - final String[] sharedShortEras = { - "R.O.C. el\u0151tt", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "Buddhista napt\u00e1r" }, - { "calendarname.gregorian", - "Gergely-napt\u00e1r" }, - { "calendarname.gregory", - "Gergely-napt\u00e1r" }, - { "calendarname.islamic", - "Iszl\u00e1m napt\u00e1r" }, - { "calendarname.islamic-civil", - "Iszl\u00e1m civil napt\u00e1r" }, - { "calendarname.japanese", - "Jap\u00e1n napt\u00e1r" }, - { "calendarname.roc", - "K\u00ednai k\u00f6zt\u00e1rsas\u00e1gi napt\u00e1r" }, - { "field.dayperiod", - "napszak" }, - { "field.era", - "\u00e9ra" }, - { "field.hour", - "\u00f3ra" }, - { "field.minute", - "perc" }, - { "field.month", - "h\u00f3nap" }, - { "field.second", - "m\u00e1sodperc" }, - { "field.week", - "h\u00e9t" }, - { "field.weekday", - "h\u00e9t napja" }, - { "field.year", - "\u00e9v" }, - { "field.zone", - "id\u0151z\u00f3na" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - new String[] { - "Moh.", - "Saf.", - "R\u00e9b. 1", - "R\u00e9b. 2", - "Dsem. I", - "Dsem. II", - "Red.", - "Sab.", - "Ram.", - "Sev.", - "Ds\u00fcl k.", - "Ds\u00fcl h.", - "", - } - }, - { "islamic.MonthNames", - new String[] { - "Moharrem", - "Safar", - "R\u00e9bi el avvel", - "R\u00e9bi el accher", - "Dsem\u00e1di el avvel", - "Dsem\u00e1di el accher", - "Redseb", - "Sab\u00e1n", - "Ramad\u00e1n", - "Sevv\u00e1l", - "Ds\u00fcl kade", - "Ds\u00fcl hedse", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "G y. MMMM d., EEEE", - "G y. MMMM d.", - "G y.MM.dd.", - "GGGGG y.MM.dd.", - } - }, - { "java.time.long.Eras", - new String[] { - "id\u0151sz\u00e1m\u00edt\u00e1sunk el\u0151tt", - "id\u0151sz\u00e1m\u00edt\u00e1sunk szerint", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "i.e.", - "i.u.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "febr.", - "m\u00e1rc.", - "\u00e1pr.", - "m\u00e1j.", - "j\u00fan.", - "j\u00fal.", - "aug.", - "szept.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janu\u00e1r", - "febru\u00e1r", - "m\u00e1rcius", - "\u00e1prilis", - "m\u00e1jus", - "j\u00fanius", - "j\u00falius", - "augusztus", - "szeptember", - "okt\u00f3ber", - "november", - "december", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "\u00c1", - "M", - "J", - "J", - "A", - "Sz", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_id.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_id.java deleted file mode 100644 index 022a3b664b5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_id.java +++ /dev/null @@ -1,355 +0,0 @@ -/* - * 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_id extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "Kuartal ke-1", - "Kuartal ke-2", - "Kuartal ke-3", - "Kuartal ke-4", - }; - - final String[] sharedAmPmMarkers = { - "AM", - "PM", - }; - - final String[] sharedDatePatterns = { - "EEEE, dd MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "d/M/y G", - }; - - final String[] sharedDayAbbreviations = { - "Min", - "Sen", - "Sel", - "Rab", - "Kam", - "Jum", - "Sab", - }; - - final String[] sharedDayNames = { - "Minggu", - "Senin", - "Selasa", - "Rabu", - "Kamis", - "Jumat", - "Sabtu", - }; - - final String[] sharedDayNarrows = { - "M", - "S", - "S", - "R", - "K", - "J", - "S", - }; - - final String[] sharedTimePatterns = { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, dd MMMM y G", - "d MMMM y G", - "d MMM y G", - "d/M/y GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "M", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - }; - - final String[] sharedEras = { - "Sebelum R.O.C.", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "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", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "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", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.long.Eras", - new String[] { - "Sebelum Masehi", - "M", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "BCE", - "CE", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "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", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH.mm;-HH.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java deleted file mode 100644 index b2760c21e50..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * 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 - * 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_is extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "F1", - "F2", - "F3", - "F4", - }; - - final String[] sharedQuarterNames = { - "1. fj\u00f3r\u00f0ungur", - "2. fj\u00f3r\u00f0ungur", - "3. fj\u00f3r\u00f0ungur", - "4. fj\u00f3r\u00f0ungur", - }; - - final String[] sharedAmPmMarkers = { - "f.h.", - "e.h.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d. MMMM y GGGG", - "d. MMMM y GGGG", - "d.M.y GGGG", - "d.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "sun.", - "m\u00e1n.", - "\u00feri.", - "mi\u00f0.", - "fim.", - "f\u00f6s.", - "lau.", - }; - - final String[] sharedDayNames = { - "sunnudagur", - "m\u00e1nudagur", - "\u00feri\u00f0judagur", - "mi\u00f0vikudagur", - "fimmtudagur", - "f\u00f6studagur", - "laugardagur", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "\u00de", - "M", - "F", - "F", - "L", - }; - - final String[] sharedNarrowAmPmMarkers = { - "f.", - "e.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d. MMMM y G", - "d. MMMM y G", - "d.M.y G", - "d.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "B\u00fadd\u00edskt dagatal" }, - { "calendarname.gregorian", - "Gregor\u00edskt dagatal" }, - { "calendarname.gregory", - "Gregor\u00edskt dagatal" }, - { "calendarname.islamic", - "\u00cdslamskt dagatal" }, - { "calendarname.islamic-civil", - "\u00cdslamskt borgaradagatal" }, - { "calendarname.japanese", - "Japanskt dagatal" }, - { "calendarname.roc", - "Minguo dagatal" }, - { "field.dayperiod", - "f.h./e.h." }, - { "field.era", - "t\u00edmabil" }, - { "field.hour", - "klukkustund" }, - { "field.minute", - "m\u00edn\u00fata" }, - { "field.month", - "m\u00e1nu\u00f0ur" }, - { "field.second", - "sek\u00fanda" }, - { "field.week", - "vika" }, - { "field.weekday", - "vikudagur" }, - { "field.year", - "\u00e1r" }, - { "field.zone", - "t\u00edmabelti" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "fyrir Krist", - "eftir Krist", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "ma\u00ed", - "j\u00fan.", - "j\u00fal.", - "\u00e1g\u00fa.", - "sep.", - "okt.", - "n\u00f3v.", - "des.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "jan\u00faar", - "febr\u00faar", - "mars", - "apr\u00edl", - "ma\u00ed", - "j\u00fan\u00ed", - "j\u00fal\u00ed", - "\u00e1g\u00fast", - "september", - "okt\u00f3ber", - "n\u00f3vember", - "desember", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "\u00c1", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java deleted file mode 100644 index d664f5cb3af..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java +++ /dev/null @@ -1,308 +0,0 @@ -/* - * 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 - * 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_it extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "T1", - "T2", - "T3", - "T4", - }; - - final String[] sharedQuarterNames = { - "1\u00ba trimestre", - "2\u00ba trimestre", - "3\u00ba trimestre", - "4\u00ba trimestre", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "dd MMMM y GGGG", - "dd MMM y GGGG", - "dd/MM/yy G", - }; - - final String[] sharedDayAbbreviations = { - "dom", - "lun", - "mar", - "mer", - "gio", - "ven", - "sab", - }; - - final String[] sharedDayNames = { - "domenica", - "luned\u00ec", - "marted\u00ec", - "mercoled\u00ec", - "gioved\u00ec", - "venerd\u00ec", - "sabato", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "M", - "G", - "V", - "S", - }; - - final String[] sharedNarrowAmPmMarkers = { - "m.", - "p.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "dd MMMM y G", - "dd MMM y G", - "dd/MM/yy GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "EB", - }; - - final String[] sharedEras = { - "Prima di R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Calendario buddista" }, - { "calendarname.gregorian", - "Calendario gregoriano" }, - { "calendarname.gregory", - "Calendario gregoriano" }, - { "calendarname.islamic", - "Calendario islamico" }, - { "calendarname.islamic-civil", - "calendario civile islamico" }, - { "calendarname.islamic-umalqura", - "Calendario islamico (Umm al-Qura)" }, - { "calendarname.japanese", - "Calendario giapponese" }, - { "calendarname.roc", - "Calendario Minguo" }, - { "field.dayperiod", - "AM/PM" }, - { "field.era", - "era" }, - { "field.hour", - "ora" }, - { "field.minute", - "minuto" }, - { "field.month", - "mese" }, - { "field.second", - "Secondo" }, - { "field.week", - "settimana" }, - { "field.weekday", - "giorno della settimana" }, - { "field.year", - "anno" }, - { "field.zone", - "fuso orario" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "BC", - "dopo Cristo", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "gen", - "feb", - "mar", - "apr", - "mag", - "giu", - "lug", - "ago", - "set", - "ott", - "nov", - "dic", - "", - } - }, - { "roc.MonthNames", - new String[] { - "gennaio", - "febbraio", - "marzo", - "aprile", - "maggio", - "giugno", - "luglio", - "agosto", - "settembre", - "ottobre", - "novembre", - "dicembre", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "G", - "F", - "M", - "A", - "M", - "G", - "L", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java deleted file mode 100644 index 68ceaa0ab91..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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_it_CH extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd.MM.yy G", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd.MM.yy GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java deleted file mode 100644 index 922885aeb0b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright (c) 2013, 2019, 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_ja extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "\u7b2c1\u56db\u534a\u671f", - "\u7b2c2\u56db\u534a\u671f", - "\u7b2c3\u56db\u534a\u671f", - "\u7b2c4\u56db\u534a\u671f", - }; - - final String[] sharedAmPmMarkers = { - "\u5348\u524d", - "\u5348\u5f8c", - }; - - final String[] sharedDatePatterns = { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/MM/dd", - "GGGGy/MM/dd", - }; - - final String[] sharedDayNarrows = { - "\u65e5", - "\u6708", - "\u706b", - "\u6c34", - "\u6728", - "\u91d1", - "\u571f", - }; - - final String[] sharedDayNames = { - "\u65e5\u66dc\u65e5", - "\u6708\u66dc\u65e5", - "\u706b\u66dc\u65e5", - "\u6c34\u66dc\u65e5", - "\u6728\u66dc\u65e5", - "\u91d1\u66dc\u65e5", - "\u571f\u66dc\u65e5", - }; - - final String[] sharedMonthNames = { - "\u30e0\u30cf\u30c3\u30e9\u30e0", - "\u30b5\u30d5\u30a2\u30eb", - "\u30e9\u30d3\u30fc\u30fb\u30a6\u30eb\u30fb\u30a2\u30a6\u30ef\u30eb", - "\u30e9\u30d3\u30fc\u30fb\u30a6\u30c3\u30fb\u30b5\u30fc\u30cb\u30fc", - "\u30b8\u30e5\u30de\u30fc\u30c0\u30eb\u30fb\u30a2\u30a6\u30ef\u30eb", - "\u30b8\u30e5\u30de\u30fc\u30c0\u30c3\u30b5\u30fc\u30cb\u30fc", - "\u30e9\u30b8\u30e3\u30d6", - "\u30b7\u30e3\u30a2\u30d0\u30fc\u30f3", - "\u30e9\u30de\u30c0\u30fc\u30f3", - "\u30b7\u30e3\u30a6\u30ef\u30fc\u30eb", - "\u30ba\u30eb\u30fb\u30ab\u30a4\u30c0", - "\u30ba\u30eb\u30fb\u30d2\u30c3\u30b8\u30e3", - "", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedTimePatterns = { - "H\u6642mm\u5206ss\u79d2 zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy/MM/dd", - "Gy/MM/dd", - }; - - final String[] sharedJavaTimeLongEras = { - "\u897f\u66a6", - "\u660e\u6cbb", - "\u5927\u6b63", - "\u662d\u548c", - "\u5e73\u6210", - "\u4ee4\u548c", - }; - - final String[] sharedJavaTimeShortEras = { - "\u7d00\u5143\u524d", - "\u897f\u66a6", - }; - - final String[] sharedEras = { - "\u6c11\u56fd\u524d", - "\u6c11\u56fd", - }; - - final String[] sharedMonthAbbreviations = { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - "", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u30bf\u30a4\u4ecf\u6559\u66a6" }, - { "calendarname.gregorian", - "\u897f\u66a6(\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6)" }, - { "calendarname.gregory", - "\u897f\u66a6(\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6)" }, - { "calendarname.islamic", - "\u30a4\u30b9\u30e9\u30e0\u66a6" }, - { "calendarname.islamic-civil", - "\u30a4\u30b9\u30e9\u30e0\u6b74(\u5b9a\u5468\u671f\u3001\u516c\u6c11\u7d00\u5143)" }, - { "calendarname.islamic-umalqura", - "\u30a4\u30b9\u30e9\u30e0\u66a6(\u30a6\u30f3\u30e0\u30fb\u30a2\u30eb\u30af\u30e9\u30fc)" }, - { "calendarname.japanese", - "\u548c\u66a6" }, - { "calendarname.roc", - "\u4e2d\u83ef\u6c11\u56fd\u66a6" }, - { "field.dayperiod", - "\u5348\u524d/\u5348\u5f8c" }, - { "field.era", - "\u6642\u4ee3" }, - { "field.hour", - "\u6642" }, - { "field.minute", - "\u5206" }, - { "field.month", - "\u6708" }, - { "field.second", - "\u79d2" }, - { "field.week", - "\u9031" }, - { "field.weekday", - "\u66dc\u65e5" }, - { "field.year", - "\u5e74" }, - { "field.zone", - "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayNarrows }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthAbbreviations", - sharedMonthNames }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "Gy/MM/dd", - "Gy/MM/dd", - } - }, - { "java.time.buddhist.long.Eras", - new String[] { - "BC", - "\u4ecf\u66a6", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { - "\u7d00\u5143\u524d", - "\u4ecf\u66a6", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "Gy'\u5e74'M'\u6708'd'\u65e5'", - "GGGGGy.MM.dd", - "GGGGGy.MM.dd", - "GGGGGy.MM.dd", - } - }, - { "java.time.japanese.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.long.Eras", - sharedJavaTimeShortEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeShortEras }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayNarrows }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - sharedMonthAbbreviations }, - { "roc.MonthNames", - sharedMonthAbbreviations }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java deleted file mode 100644 index dfe710f6551..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * 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 - * 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_ko extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1\ubd84\uae30", - "2\ubd84\uae30", - "3\ubd84\uae30", - "4\ubd84\uae30", - }; - - final String[] sharedQuarterNames = { - "\uc81c 1/4\ubd84\uae30", - "\uc81c 2/4\ubd84\uae30", - "\uc81c 3/4\ubd84\uae30", - "\uc81c 4/4\ubd84\uae30", - }; - - final String[] sharedAmPmMarkers = { - "\uc624\uc804", - "\uc624\ud6c4", - }; - - final String[] sharedDatePatterns = { - "GGGG y\ub144 M\uc6d4 d\uc77c EEEE", - "GGGG y\ub144 M\uc6d4 d\uc77c", - "GGGG y. M. d.", - "GGGG y. M. d.", - }; - - final String[] sharedDayNarrows = { - "\uc77c", - "\uc6d4", - "\ud654", - "\uc218", - "\ubaa9", - "\uae08", - "\ud1a0", - }; - - final String[] sharedDayNames = { - "\uc77c\uc694\uc77c", - "\uc6d4\uc694\uc77c", - "\ud654\uc694\uc77c", - "\uc218\uc694\uc77c", - "\ubaa9\uc694\uc77c", - "\uae08\uc694\uc77c", - "\ud1a0\uc694\uc77c", - }; - - final String[] sharedTimePatterns = { - "a h\uc2dc m\ubd84 s\ucd08 zzzz", - "a h\uc2dc m\ubd84 s\ucd08 z", - "a h:mm:ss", - "a h:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y\ub144 M\uc6d4 d\uc77c EEEE", - "G y\ub144 M\uc6d4 d\uc77c", - "G y. M. d.", - "G y. M. d.", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\ubd88\uae30", - }; - - final String[] sharedJavaTimeShortEras = { - "\uc11c\uae30", - "\uba54\uc774\uc9c0", - "\ub2e4\uc774\uc1fc", - "\uc1fc\uc640", - "\ud5e4\uc774\uc138\uc774", - "\ub808\uc774\uc640", - }; - - final String[] sharedJavaTimeShortEras2 = { - "\uae30\uc6d0\uc804", - "\uc11c\uae30", - }; - - final String[] sharedEras = { - "\uc911\ud654\ubbfc\uad6d\uc804", - "\uc911\ud654\ubbfc\uad6d", - }; - - final String[] sharedMonthNames = { - "1\uc6d4", - "2\uc6d4", - "3\uc6d4", - "4\uc6d4", - "5\uc6d4", - "6\uc6d4", - "7\uc6d4", - "8\uc6d4", - "9\uc6d4", - "10\uc6d4", - "11\uc6d4", - "12\uc6d4", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\ubd88\uad50\ub825" }, - { "calendarname.gregorian", - "\ud0dc\uc591\ub825" }, - { "calendarname.gregory", - "\ud0dc\uc591\ub825" }, - { "calendarname.islamic", - "\uc774\uc2ac\ub78c\ub825" }, - { "calendarname.islamic-civil", - "\uc774\uc2ac\ub78c \uc0c1\uc6a9\ub825" }, - { "calendarname.japanese", - "\uc77c\ubcf8\ub825" }, - { "calendarname.roc", - "\ub300\ub9cc\ub825" }, - { "field.dayperiod", - "\uc624\uc804/\uc624\ud6c4" }, - { "field.era", - "\uc5f0\ud638" }, - { "field.hour", - "\uc2dc" }, - { "field.minute", - "\ubd84" }, - { "field.month", - "\uc6d4" }, - { "field.second", - "\ucd08" }, - { "field.week", - "\uc8fc" }, - { "field.weekday", - "\uc694\uc77c" }, - { "field.year", - "\ub144" }, - { "field.zone", - "\uc2dc\uac04\ub300" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayNarrows }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "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", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "G y\ub144 M\uc6d4 d\uc77c EEEE", - "G y\ub144 M\uc6d4 d\uc77c", - "G y. M. d", - "G y. M. d", - } - }, - { "java.time.japanese.long.Eras", - sharedJavaTimeShortEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeShortEras }, - { "java.time.long.Eras", - sharedJavaTimeShortEras2 }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeShortEras2 }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayNarrows }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - sharedMonthNames }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.MonthNarrows", - sharedMonthNames }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java deleted file mode 100644 index 9d203eeb6e5..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * 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 - * 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_lt extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "I k.", - "II k.", - "III k.", - "IV k.", - }; - - final String[] sharedQuarterNames = { - "I ketvirtis", - "II ketvirtis", - "III ketvirtis", - "IV ketvirtis", - }; - - final String[] sharedAmPmMarkers = { - "prie\u0161piet", - "popiet", - }; - - final String[] sharedDatePatterns = { - "y MMMM d GGGG, EEEE", - "y MMMM d GGGG", - "y MMM d GGGG", - "y-MM-dd GGGG", - }; - - final String[] sharedDayAbbreviations = { - "sk", - "pr", - "an", - "tr", - "kt", - "pn", - "\u0161t", - }; - - final String[] sharedDayNames = { - "sekmadienis", - "pirmadienis", - "antradienis", - "tre\u010diadienis", - "ketvirtadienis", - "penktadienis", - "\u0161e\u0161tadienis", - }; - - final String[] sharedDayNarrows = { - "S", - "P", - "A", - "T", - "K", - "P", - "\u0160", - }; - - final String[] sharedNarrowAmPmMarkers = { - "pr. p.", - "pop.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "y MMMM d G, EEEE", - "y MMMM d G", - "y MMM d G", - "y-MM-dd G", - }; - - final String[] sharedEras = { - "Prie\u0161 R.O.C.", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "budist\u0173 kalendorius" }, - { "calendarname.gregorian", - "Grigaliaus kalendorius" }, - { "calendarname.gregory", - "Grigaliaus kalendorius" }, - { "calendarname.islamic", - "islamo kalendorius" }, - { "calendarname.islamic-civil", - "Islamo kalendorius (lentelinis, pilietin\u0117 era)" }, - { "calendarname.islamic-umalqura", - "Islamo kalendorius (Umm al-Qura)" }, - { "calendarname.japanese", - "japon\u0173 kalendorius" }, - { "calendarname.roc", - "Kinijos Respublikos kalendorius" }, - { "field.dayperiod", - "iki piet\u0173 / po piet\u0173" }, - { "field.era", - "era" }, - { "field.hour", - "valanda" }, - { "field.minute", - "minut\u0117" }, - { "field.month", - "m\u0117nuo" }, - { "field.second", - "sekund\u0117" }, - { "field.week", - "savait\u0117" }, - { "field.weekday", - "savait\u0117s diena" }, - { "field.year", - "metai" }, - { "field.zone", - "laiko juosta" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - new String[] { - "po Kristaus", - "Meid\u017ei", - "Tai\u0161o", - "\u0160ova", - "Heisei", - "Reiwa", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "po Kr.", - "Meid\u017ei", - "Tai\u0161o", - "\u0160ova", - "Heisei", - "Reiwa", - } - }, - { "java.time.long.Eras", - new String[] { - "prie\u0161 Krist\u0173", - "po Kristaus", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "pr.Kr.", - "po.Kr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "saus.", - "vas.", - "kov.", - "bal.", - "geg.", - "bir\u017e.", - "liep.", - "rugp.", - "rugs.", - "spal.", - "lapkr.", - "gruod.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "sausio", - "vasario", - "kovo", - "baland\u017eio", - "gegu\u017e\u0117s", - "bir\u017eelio", - "liepos", - "rugpj\u016b\u010dio", - "rugs\u0117jo", - "spalio", - "lapkri\u010dio", - "gruod\u017eio", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "S", - "V", - "K", - "B", - "G", - "B", - "L", - "R", - "R", - "S", - "L", - "G", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH:mm;\u2212HH:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java deleted file mode 100644 index dd503ae7104..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * 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 - * 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_lv extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1.\u00a0cet.", - "2.\u00a0cet.", - "3.\u00a0cet.", - "4.\u00a0cet.", - }; - - final String[] sharedQuarterNames = { - "1. ceturksnis", - "2. ceturksnis", - "3. ceturksnis", - "4. ceturksnis", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "priek\u0161pusdien\u0101", - "p\u0113cpusdien\u0101", - }; - - final String[] sharedDatePatterns = { - "EEEE, y. 'gada' d. MMMM GGGG", - "y. 'gada' d. MMMM GGGG", - "y. 'gada' d. MMM GGGG", - "dd.MM.y G", - }; - - final String[] sharedDayAbbreviations = { - "Sv", - "Pr", - "Ot", - "Tr", - "Ce", - "Pk", - "Se", - }; - - final String[] sharedDayNames = { - "sv\u0113tdiena", - "pirmdiena", - "otrdiena", - "tre\u0161diena", - "ceturtdiena", - "piektdiena", - "sestdiena", - }; - - final String[] sharedDayNarrows = { - "S", - "P", - "O", - "T", - "C", - "P", - "S", - }; - - final String[] sharedNarrowAmPmMarkers = { - "priek\u0161p.", - "p\u0113cp.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, y. 'gada' d. MMMM G", - "y. 'gada' d. MMMM G", - "y. 'gada' d. MMM G", - "dd.MM.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "budistu kalend\u0101rs" }, - { "calendarname.gregorian", - "Gregora kalend\u0101rs" }, - { "calendarname.gregory", - "Gregora kalend\u0101rs" }, - { "calendarname.islamic", - "isl\u0101ma kalend\u0101rs" }, - { "calendarname.islamic-civil", - "isl\u0101ma pilso\u0146u kalend\u0101rs" }, - { "calendarname.japanese", - "jap\u0101\u0146u kalend\u0101rs" }, - { "calendarname.roc", - "\u0136\u012bnas Republikas kalend\u0101rs" }, - { "field.dayperiod", - "priek\u0161pusdien\u0101/p\u0113cpusdien\u0101" }, - { "field.era", - "\u0113ra" }, - { "field.hour", - "stundas" }, - { "field.minute", - "min\u016btes" }, - { "field.month", - "m\u0113nesis" }, - { "field.second", - "sekundes" }, - { "field.week", - "ned\u0113\u013ca" }, - { "field.weekday", - "ned\u0113\u013cas diena" }, - { "field.year", - "gads" }, - { "field.zone", - "laika josla" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "muharams", - "safars", - "1. rab\u012b", - "2. rab\u012b", - "1. d\u017eum\u0101d\u0101", - "2. d\u017eum\u0101d\u0101", - "rad\u017eabs", - "\u0161abans", - "ramad\u0101ns", - "\u0161auvals", - "du al-kid\u0101", - "du al-hid\u017e\u0101", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.abbreviated.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "pirms m\u016bsu \u0113ras", - "m\u016bsu \u0113r\u0101", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "pm\u0113", - "m\u0113", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "janv.", - "febr.", - "marts", - "apr.", - "maijs", - "j\u016bn.", - "j\u016bl.", - "aug.", - "sept.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janv\u0101ris", - "febru\u0101ris", - "marts", - "apr\u012blis", - "maijs", - "j\u016bnijs", - "j\u016blijs", - "augusts", - "septembris", - "oktobris", - "novembris", - "decembris", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.abbreviated.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java deleted file mode 100644 index 16ede47d40b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * 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 - * 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_mk extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "\u0458\u0430\u043d-\u043c\u0430\u0440", - "\u0430\u043f\u0440-\u0458\u0443\u043d", - "\u0458\u0443\u043b-\u0441\u0435\u043f", - "\u043e\u043a\u0442-\u0434\u0435\u043a", - }; - - final String[] sharedQuarterNames = { - "\u043f\u0440\u0432\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435", - "\u0432\u0442\u043e\u0440\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435", - "\u0442\u0440\u0435\u0442\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435", - "\u0447\u0435\u0442\u0432\u0440\u0442\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435", - }; - - final String[] sharedAmPmMarkers = { - "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435", - "\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435", - }; - - final String[] sharedDatePatterns = { - "EEEE, dd MMMM y '\u0433'. GGGG", - "dd MMMM y '\u0433'. GGGG", - "dd.M.y GGGG", - "dd.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "\u043d\u0435\u0434.", - "\u043f\u043e\u043d.", - "\u0432\u0442.", - "\u0441\u0440\u0435.", - "\u0447\u0435\u0442.", - "\u043f\u0435\u0442.", - "\u0441\u0430\u0431.", - }; - - final String[] sharedDayNames = { - "\u043d\u0435\u0434\u0435\u043b\u0430", - "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a", - "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u043e\u043a", - "\u043f\u0435\u0442\u043e\u043a", - "\u0441\u0430\u0431\u043e\u0442\u0430", - }; - - final String[] sharedDayNarrows = { - "\u043d", - "\u043f", - "\u0432", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - }; - - final String[] sharedNarrowAmPmMarkers = { - "\u043f\u0440\u0435\u0442.", - "\u043f\u043e\u043f\u043b.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, dd MMMM y '\u0433'. G", - "dd MMMM y '\u0433'. G", - "dd.M.y G", - "dd.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0411\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregorian", - "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregory", - "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic-civil", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0433\u0440\u0430\u0453\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.japanese", - "\u0408\u0430\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.roc", - "\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", - "\u0435\u0440\u0430" }, - { "field.hour", - "\u0447\u0430\u0441" }, - { "field.minute", - "\u043c\u0438\u043d\u0443\u0442\u0430" }, - { "field.month", - "\u043c\u0435\u0441\u0435\u0446" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", - "\u043d\u0435\u0434\u0435\u043b\u0430" }, - { "field.weekday", - "\u0434\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" }, - { "field.year", - "\u0433\u043e\u0434\u0438\u043d\u0430" }, - { "field.zone", - "\u0432\u0440\u0435\u043c\u0435\u043d\u0441\u043a\u0430 \u0437\u043e\u043d\u0430" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "\u043f\u0440\u0435\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430", - "\u043e\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u043f\u0440.\u043d.\u0435.", - "\u0430\u0435.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "\u0458\u0430\u043d.", - "\u0444\u0435\u0432.", - "\u043c\u0430\u0440.", - "\u0430\u043f\u0440.", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d.", - "\u0458\u0443\u043b.", - "\u0430\u0432\u0433.", - "\u0441\u0435\u043f\u0442.", - "\u043e\u043a\u0442.", - "\u043d\u043e\u0435\u043c.", - "\u0434\u0435\u043a.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u0458\u0430\u043d\u0443\u0430\u0440\u0438", - "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440\u0438\u043b", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d\u0438", - "\u0458\u0443\u043b\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438", - "\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438", - "\u043d\u043e\u0435\u043c\u0432\u0440\u0438", - "\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u0458", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u0458", - "\u0458", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java deleted file mode 100644 index 5aff378c18b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java +++ /dev/null @@ -1,306 +0,0 @@ -/* - * 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 - * 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_ms extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "S1", - "S2", - "S3", - "S4", - }; - - final String[] sharedQuarterNames = { - "Suku pertama", - "Suku Ke-2", - "Suku Ke-3", - "Suku Ke-4", - }; - - final String[] sharedAmPmMarkers = { - "PG", - "PTG", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "dd/MM/y GGGG", - "d/MM/y G", - }; - - final String[] sharedDayAbbreviations = { - "Ahd", - "Isn", - "Sel", - "Rab", - "Kha", - "Jum", - "Sab", - }; - - final String[] sharedDayNames = { - "Ahad", - "Isnin", - "Selasa", - "Rabu", - "Khamis", - "Jumaat", - "Sabtu", - }; - - final String[] sharedDayNarrows = { - "A", - "I", - "S", - "R", - "K", - "J", - "S", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "dd/MM/y G", - "d/MM/y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Kalendar Buddha" }, - { "calendarname.gregorian", - "Kalendar Gregory" }, - { "calendarname.gregory", - "Kalendar Gregory" }, - { "calendarname.islamic", - "Kalendar Islam" }, - { "calendarname.islamic-civil", - "Kalendar Sivil Islam" }, - { "calendarname.japanese", - "Kalendar Jepun" }, - { "calendarname.roc", - "Kalendar Minguo" }, - { "field.dayperiod", - "PG/PTG" }, - { "field.hour", - "Jam" }, - { "field.minute", - "Minit" }, - { "field.month", - "Bulan" }, - { "field.second", - "Saat" }, - { "field.week", - "Minggu" }, - { "field.weekday", - "Hari dalam Minggu" }, - { "field.year", - "Tahun" }, - { "field.zone", - "Zon Waktu" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "S.M.", - "TM", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "BCE", - "CE", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "Jan", - "Feb", - "Mac", - "Apr", - "Mei", - "Jun", - "Jul", - "Ogo", - "Sep", - "Okt", - "Nov", - "Dis", - "", - } - }, - { "roc.MonthNames", - new String[] { - "Januari", - "Februari", - "Mac", - "April", - "Mei", - "Jun", - "Julai", - "Ogos", - "September", - "Oktober", - "November", - "Disember", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "O", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java deleted file mode 100644 index bf6bb0d1830..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java +++ /dev/null @@ -1,271 +0,0 @@ -/* - * 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 - * 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_mt extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "1el kwart", - "2ni kwart", - "3et kwart", - "4ba\u2019 kwart", - }; - - final String[] sharedDatePatterns = { - "EEEE, d 'ta'\u2019 MMMM y GGGG", - "d 'ta'\u2019 MMMM y GGGG", - "dd MMM y GGGG", - "dd/MM/y G", - }; - - final String[] sharedDayAbbreviations = { - "\u0126ad", - "Tne", - "Tli", - "Erb", - "\u0126am", - "\u0120im", - "Sib", - }; - - final String[] sharedDayNames = { - "Il-\u0126add", - "It-Tnejn", - "It-Tlieta", - "L-Erbg\u0127a", - "Il-\u0126amis", - "Il-\u0120img\u0127a", - "Is-Sibt", - }; - - final String[] sharedDayNarrows = { - "\u0126", - "T", - "T", - "E", - "\u0126", - "\u0120", - "S", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d 'ta'\u2019 MMMM y G", - "d 'ta'\u2019 MMMM y G", - "dd MMM y G", - "dd/MM/y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Kalendarju Buddist" }, - { "calendarname.gregorian", - "Kalendarju Gregorjan" }, - { "calendarname.gregory", - "Kalendarju Gregorjan" }, - { "calendarname.islamic", - "Kalendarju I\u017clamiku" }, - { "calendarname.islamic-civil", - "Kalendarju Islamiku-\u010aivili" }, - { "calendarname.japanese", - "Kalendarju \u0120appuni\u017c" }, - { "field.era", - "Epoka" }, - { "field.hour", - "Sieg\u0127a" }, - { "field.minute", - "Minuta" }, - { "field.month", - "Xahar" }, - { "field.second", - "Sekonda" }, - { "field.week", - "\u0120img\u0127a" }, - { "field.weekday", - "Jum tal-\u0120img\u0127a" }, - { "field.year", - "Sena" }, - { "field.zone", - "\u017bona" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "Qabel Kristu", - "Wara Kristu", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "QK", - "WK", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "Jan", - "Fra", - "Mar", - "Apr", - "Mej", - "\u0120un", - "Lul", - "Aww", - "Set", - "Ott", - "Nov", - "Di\u010b", - "", - } - }, - { "roc.MonthNames", - new String[] { - "Jannar", - "Frar", - "Marzu", - "April", - "Mejju", - "\u0120unju", - "Lulju", - "Awwissu", - "Settembru", - "Ottubru", - "Novembru", - "Di\u010bembru", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "\u0120", - "L", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java deleted file mode 100644 index 183b7721c2f..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java +++ /dev/null @@ -1,374 +0,0 @@ -/* - * 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 - * 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_nl extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "1e kwartaal", - "2e kwartaal", - "3e kwartaal", - "4e kwartaal", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd-MM-yy G", - }; - - final String[] sharedDayAbbreviations = { - "zo", - "ma", - "di", - "wo", - "do", - "vr", - "za", - }; - - final String[] sharedDayNames = { - "zondag", - "maandag", - "dinsdag", - "woensdag", - "donderdag", - "vrijdag", - "zaterdag", - }; - - final String[] sharedDayNarrows = { - "Z", - "M", - "D", - "W", - "D", - "V", - "Z", - }; - - final String[] sharedEras = { - "", - "Sa\u02bbna Hizjria", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd-MM-yy GGGGG", - }; - - final String[] sharedShortEras = { - "voor R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Boeddhistische kalender" }, - { "calendarname.gregorian", - "Gregoriaanse kalender" }, - { "calendarname.gregory", - "Gregoriaanse kalender" }, - { "calendarname.islamic", - "Islamitische kalender" }, - { "calendarname.islamic-civil", - "Islamitische kalender (cyclisch)" }, - { "calendarname.islamic-umalqura", - "Islamitische kalender (Umm al-Qura)" }, - { "calendarname.japanese", - "Japanse kalender" }, - { "calendarname.roc", - "Kalender van de Chinese Republiek" }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.era", - "tijdperk" }, - { "field.hour", - "Uur" }, - { "field.minute", - "minuut" }, - { "field.month", - "maand" }, - { "field.second", - "seconde" }, - { "field.week", - "week" }, - { "field.weekday", - "dag van de week" }, - { "field.year", - "jaar" }, - { "field.zone", - "tijdzone" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - new String[] { - "Moeh.", - "Saf.", - "Rab. I", - "Rab. II", - "Joem. I", - "Joem. II", - "Raj.", - "Sja.", - "Ram.", - "Sjaw.", - "Doe al k.", - "Doe al h.", - "", - } - }, - { "islamic.MonthNames", - new String[] { - "Moeharram", - "Safar", - "Rabi\u02bba al awal", - "Rabi\u02bba al thani", - "Joemad\u02bbal awal", - "Joemad\u02bbal thani", - "Rajab", - "Sja\u02bbaban", - "Ramadan", - "Sjawal", - "Doe al ka\u02bbaba", - "Doe al hizja", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - new String[] { - "na Christus", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "n.Chr.", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.long.Eras", - new String[] { - "voor Christus", - "na Christus", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "v. Chr.", - "n. Chr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mrt.", - "apr.", - "mei", - "jun.", - "jul.", - "aug.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januari", - "februari", - "maart", - "april", - "mei", - "juni", - "juli", - "augustus", - "september", - "oktober", - "november", - "december", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java deleted file mode 100644 index d91b3160f88..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2015, 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_nl_BE extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "d/MM/yy G", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "d/MM/yy GGGGG", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java deleted file mode 100644 index 60a30bce918..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java +++ /dev/null @@ -1,398 +0,0 @@ -/* - * 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 - * 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_no extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE d. MMMM y GGGG", - "d. MMMM y GGGG", - "d. MMM y GGGG", - "d.M. y GGGG", - }; - - final String[] sharedDayAbbreviations = { - "s\u00f8n.", - "man.", - "tir.", - "ons.", - "tor.", - "fre.", - "l\u00f8r.", - }; - - final String[] sharedDayNames = { - "s\u00f8ndag", - "mandag", - "tirsdag", - "onsdag", - "torsdag", - "fredag", - "l\u00f8rdag", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - }; - - final String[] sharedTimePatterns = { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d. MMMM y G", - "d. MMMM y G", - "d. MMM y G", - "d.M. y G", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "buddhistisk kalender" }, - { "calendarname.gregorian", - "gregoriansk kalender" }, - { "calendarname.gregory", - "gregoriansk kalender" }, - { "calendarname.islamic", - "islamsk kalender" }, - { "calendarname.islamic-civil", - "islamsk kalender (tabell, sivil)" }, - { "calendarname.islamic-umalqura", - "islamsk kalender (Umm al-Qura)" }, - { "calendarname.japanese", - "japansk kalender" }, - { "calendarname.roc", - "kalender for Republikken Kina" }, - { "field.dayperiod", - "AM/PM" }, - { "field.era", - "tidsalder" }, - { "field.hour", - "time" }, - { "field.minute", - "minutt" }, - { "field.month", - "m\u00e5ned" }, - { "field.second", - "sekund" }, - { "field.week", - "uke" }, - { "field.weekday", - "ukedag" }, - { "field.year", - "\u00e5r" }, - { "field.zone", - "tidssone" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "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", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE d. MMMM y G", - "d. MMMM y G", - "d. MMM y G", - "d.M y G", - } - }, - { "java.time.japanese.long.Eras", - new String[] { - "etter Kristus", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "e.Kr.", - "M", - "T", - "S", - "H", - "R", - } - }, - { "java.time.long.Eras", - new String[] { - "f\u00f8r Kristus", - "etter Kristus", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "f.Kr.", - "e.Kr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "mai", - "jun.", - "jul.", - "aug.", - "sep.", - "okt.", - "nov.", - "des.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH.mm;-HH.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java deleted file mode 100644 index c053e5a3410..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java +++ /dev/null @@ -1,336 +0,0 @@ -/* - * 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 - * 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_pl extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "I kwarta\u0142", - "II kwarta\u0142", - "III kwarta\u0142", - "IV kwarta\u0142", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "dd.MM.y GGGG", - }; - - final String[] sharedDayAbbreviations = { - "niedz.", - "pon.", - "wt.", - "\u015br.", - "czw.", - "pt.", - "sob.", - }; - - final String[] sharedDayNames = { - "niedziela", - "poniedzia\u0142ek", - "wtorek", - "\u015broda", - "czwartek", - "pi\u0105tek", - "sobota", - }; - - final String[] sharedDayNarrows = { - "N", - "P", - "W", - "\u015a", - "C", - "P", - "S", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "d MMM y G", - "dd.MM.y G", - }; - - final String[] sharedJavaTimeLongEras = { - "p.n.e.", - "n.e.", - }; - - final String[] sharedEras = { - "Przed ROC", - "ROC", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "kalendarz buddyjski" }, - { "calendarname.gregorian", - "kalendarz gregoria\u0144ski" }, - { "calendarname.gregory", - "kalendarz gregoria\u0144ski" }, - { "calendarname.islamic", - "kalendarz islamski (metoda wzrokowa)" }, - { "calendarname.islamic-civil", - "kalendarz islamski (metoda obliczeniowa)" }, - { "calendarname.islamic-umalqura", - "kalendarz islamski (Umm al-Kura)" }, - { "calendarname.japanese", - "kalendarz japo\u0144ski" }, - { "calendarname.roc", - "kalendarz Republiki Chi\u0144skiej" }, - { "field.dayperiod", - "rano / po po\u0142udniu / wieczorem" }, - { "field.era", - "era" }, - { "field.hour", - "godzina" }, - { "field.minute", - "minuta" }, - { "field.month", - "miesi\u0105c" }, - { "field.second", - "sekunda" }, - { "field.week", - "tydzie\u0144" }, - { "field.weekday", - "dzie\u0144 tygodnia" }, - { "field.year", - "rok" }, - { "field.zone", - "strefa czasowa" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthAbbreviations", - new String[] { - "Muh.", - "Saf.", - "Rab. I", - "Rab. II", - "D\u017cu. I", - "D\u017cu. II", - "Ra.", - "Sza.", - "Ram.", - "Szaw.", - "Zu al-k.", - "Zu al-h.", - "", - } - }, - { "islamic.MonthNames", - new String[] { - "Muharram", - "Safar", - "Rabi\u02bb I", - "Rabi\u02bb II", - "D\u017cumada I", - "D\u017cumada II", - "Rad\u017cab", - "Szaban", - "Ramadan", - "Szawwal", - "Zu al-kada", - "Zu al-hid\u017cd\u017ca", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "sty", - "lut", - "mar", - "kwi", - "maj", - "cze", - "lip", - "sie", - "wrz", - "pa\u017a", - "lis", - "gru", - "", - } - }, - { "roc.MonthNames", - new String[] { - "stycznia", - "lutego", - "marca", - "kwietnia", - "maja", - "czerwca", - "lipca", - "sierpnia", - "wrze\u015bnia", - "pa\u017adziernika", - "listopada", - "grudnia", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "s", - "l", - "m", - "k", - "m", - "c", - "l", - "s", - "w", - "p", - "l", - "g", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java deleted file mode 100644 index 17f68135852..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java +++ /dev/null @@ -1,303 +0,0 @@ -/* - * 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 - * 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_pt extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "T1", - "T2", - "T3", - "T4", - }; - - final String[] sharedQuarterNames = { - "1\u00ba trimestre", - "2\u00ba trimestre", - "3\u00ba trimestre", - "4\u00ba trimestre", - }; - - final String[] sharedDatePatterns = { - "EEEE, d 'de' MMMM 'de' y GGGG", - "d 'de' MMMM 'de' y GGGG", - "dd/MM/y GGGG", - "dd/MM/yy G", - }; - - final String[] sharedDayAbbreviations = { - "dom", - "seg", - "ter", - "qua", - "qui", - "sex", - "s\u00e1b", - }; - - final String[] sharedDayNames = { - "domingo", - "segunda-feira", - "ter\u00e7a-feira", - "quarta-feira", - "quinta-feira", - "sexta-feira", - "s\u00e1bado", - }; - - final String[] sharedDayNarrows = { - "D", - "S", - "T", - "Q", - "Q", - "S", - "S", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "dd/MM/y G", - "dd/MM/yy GGGGG", - }; - - final String[] sharedEras = { - "Antes de R.O.C.", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Calend\u00e1rio Budista" }, - { "calendarname.gregorian", - "Calend\u00e1rio Gregoriano" }, - { "calendarname.gregory", - "Calend\u00e1rio Gregoriano" }, - { "calendarname.islamic", - "Calend\u00e1rio Isl\u00e2mico" }, - { "calendarname.islamic-civil", - "Calend\u00e1rio Civil Isl\u00e2mico" }, - { "calendarname.japanese", - "Calend\u00e1rio Japon\u00eas" }, - { "calendarname.roc", - "Calend\u00e1rio da Rep\u00fablica da China" }, - { "field.dayperiod", - "AM/PM" }, - { "field.era", - "era" }, - { "field.hour", - "hora" }, - { "field.minute", - "minuto" }, - { "field.month", - "m\u00eas" }, - { "field.second", - "segundo" }, - { "field.week", - "semana" }, - { "field.weekday", - "dia da semana" }, - { "field.year", - "ano" }, - { "field.zone", - "fuso hor\u00e1rio" }, - { "islamic.AmPmMarkers", - new String[] { - "AM", - "PM", - } - }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "antes de Cristo", - "depois de Cristo", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "a.C.", - "d.C.", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan", - "fev", - "mar", - "abr", - "mai", - "jun", - "jul", - "ago", - "set", - "out", - "nov", - "dez", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janeiro", - "fevereiro", - "mar\u00e7o", - "abril", - "maio", - "junho", - "julho", - "agosto", - "setembro", - "outubro", - "novembro", - "dezembro", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java deleted file mode 100644 index a35e1e1873e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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 - * 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_pt_PT extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1.\u00ba trimestre", - "2.\u00ba trimestre", - "3.\u00ba trimestre", - "4.\u00ba trimestre", - }; - - final String[] sharedAmPmMarkers = { - "da manh\u00e3", - "da tarde", - }; - - final String[] sharedDatePatterns = { - "GGGG y MMMM d, EEEE", - "GGGG y MMMM d", - "GGGG y MMM d", - "d/M/y GGGG", - }; - - final String[] sharedDayAbbreviations = { - "domingo", - "segunda", - "ter\u00e7a", - "quarta", - "quinta", - "sexta", - "s\u00e1bado", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G y MMMM d, EEEE", - "G y MMMM d", - "G y MMM d", - "d/M/y G", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "Calend\u00e1rio budista" }, - { "calendarname.gregorian", - "Calend\u00e1rio gregoriano" }, - { "calendarname.gregory", - "Calend\u00e1rio gregoriano" }, - { "calendarname.islamic", - "Calend\u00e1rio isl\u00e2mico" }, - { "calendarname.japanese", - "Calend\u00e1rio japon\u00eas" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d 'de' MMMM 'de' y G", - "d 'de' MMMM 'de' y G", - "dd/MM/y G", - "d/M/y G", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java deleted file mode 100644 index 242e2bd5b58..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java +++ /dev/null @@ -1,298 +0,0 @@ -/* - * 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 - * 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_ro extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "trim. I", - "trim. II", - "trim. III", - "trim. IV", - }; - - final String[] sharedQuarterNames = { - "trimestrul I", - "trimestrul al II-lea", - "trimestrul al III-lea", - "trimestrul al IV-lea", - }; - - final String[] sharedAmPmMarkers = { - "a.m.", - "p.m.", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y GGGG", - "d MMMM y GGGG", - "dd.MM.y GGGG", - "dd.MM.y G", - }; - - final String[] sharedDayAbbreviations = { - "dum.", - "lun.", - "mar.", - "mie.", - "joi", - "vin.", - "s\u00e2m.", - }; - - final String[] sharedDayNames = { - "duminic\u0103", - "luni", - "mar\u021bi", - "miercuri", - "joi", - "vineri", - "s\u00e2mb\u0103t\u0103", - }; - - final String[] sharedDayNarrows = { - "D", - "L", - "M", - "M", - "J", - "V", - "S", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y G", - "d MMMM y G", - "dd.MM.y G", - "dd.MM.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "calendar budist" }, - { "calendarname.gregorian", - "calendar gregorian" }, - { "calendarname.gregory", - "calendar gregorian" }, - { "calendarname.islamic", - "calendar islamic" }, - { "calendarname.islamic-civil", - "calendar islamic civil" }, - { "calendarname.japanese", - "calendar japonez" }, - { "calendarname.roc", - "calendarul Republicii Chineze" }, - { "field.dayperiod", - "a.m/p.m." }, - { "field.era", - "Er\u0103" }, - { "field.hour", - "Or\u0103" }, - { "field.minute", - "Minut" }, - { "field.month", - "Lun\u0103" }, - { "field.second", - "Secund\u0103" }, - { "field.week", - "S\u0103pt\u0103m\u00e2n\u0103" }, - { "field.weekday", - "Zi a s\u0103pt\u0103m\u00e2nii" }, - { "field.year", - "An" }, - { "field.zone", - "Fus orar" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - new String[] { - "BC", - "era budist\u0103", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "e.b.", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "\u00eenainte de Hristos", - "dup\u0103 Hristos", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "d.C.", - "\u00ee.d.C.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "ian.", - "feb.", - "mar.", - "apr.", - "mai", - "iun.", - "iul.", - "aug.", - "sept.", - "oct.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "ianuarie", - "februarie", - "martie", - "aprilie", - "mai", - "iunie", - "iulie", - "august", - "septembrie", - "octombrie", - "noiembrie", - "decembrie", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "I", - "F", - "M", - "A", - "M", - "I", - "I", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java deleted file mode 100644 index 78648529e20..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * 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 - * 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_ru extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1-\u0439 \u043a\u0432.", - "2-\u0439 \u043a\u0432.", - "3-\u0439 \u043a\u0432.", - "4-\u0439 \u043a\u0432.", - }; - - final String[] sharedQuarterNames = { - "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - }; - - final String[] sharedAmPmMarkers = { - "\u0414\u041f", - "\u041f\u041f", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y '\u0433'. GGGG", - "d MMMM y '\u0433'. GGGG", - "d MMM y '\u0433'. GGGG", - "dd.MM.y GGGG", - }; - - final String[] sharedDayNarrows = { - "\u0432\u0441", - "\u043f\u043d", - "\u0432\u0442", - "\u0441\u0440", - "\u0447\u0442", - "\u043f\u0442", - "\u0441\u0431", - }; - - final String[] sharedDayNames = { - "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435", - "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a", - "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", - "\u043f\u044f\u0442\u043d\u0438\u0446\u0430", - "\u0441\u0443\u0431\u0431\u043e\u0442\u0430", - }; - - final String[] sharedMonthNames = { - "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c", - "\u0421\u0430\u0444\u0430\u0440", - "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c", - "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440", - "\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c", - "\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440", - "\u0420\u0430\u0434\u0436\u0430\u0431", - "\u0428\u0430\u0430\u0431\u0430\u043d", - "\u0420\u0430\u043c\u0430\u0434\u0430\u043d", - "\u0428\u0430\u0432\u0432\u0430\u043b\u044c", - "\u0417\u0443\u043b\u044c-\u041a\u0430\u0430\u0434\u0430", - "\u0417\u0443\u043b\u044c-\u0425\u0438\u0434\u0436\u0436\u0430", - "", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y '\u0433'. G", - "d MMMM y '\u0433'. G", - "d MMM y '\u0433'. G", - "dd.MM.y G", - }; - - final String[] sharedEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0431\u0443\u0434\u0434\u0438\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.gregorian", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.gregory", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamic", - "\u0438\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamic-civil", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamic-umalqura", - "\u0438\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c (\u0423\u043c\u043c \u0430\u043b\u044c-\u041a\u0443\u0440\u0430)" }, - { "calendarname.japanese", - "\u044f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.roc", - "\u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "field.dayperiod", - "\u0414\u041f/\u041f\u041f" }, - { "field.era", - "\u044d\u0440\u0430" }, - { "field.hour", - "\u0447\u0430\u0441" }, - { "field.minute", - "\u043c\u0438\u043d\u0443\u0442\u0430" }, - { "field.month", - "\u043c\u0435\u0441\u044f\u0446" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", - "\u043d\u0435\u0434\u0435\u043b\u044f" }, - { "field.weekday", - "\u0434\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" }, - { "field.year", - "\u0433\u043e\u0434" }, - { "field.zone", - "\u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayNarrows }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthAbbreviations", - sharedMonthNames }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - new String[] { - "\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", - "\u042d\u043f\u043e\u0445\u0430 \u0425\u044d\u0439\u0441\u044d\u0439", - "\u0420\u044d\u0439\u0432\u0430", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "\u043d. \u044d.", - "\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", - "\u042d\u043f\u043e\u0445\u0430 \u0425\u044d\u0439\u0441\u044d\u0439", - "\u0420\u044d\u0439\u0432\u0430", - } - }, - { "java.time.long.Eras", - new String[] { - "\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", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u0434\u043e \u043d.\u044d.", - "\u043d.\u044d.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayNarrows }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "\u044f\u043d\u0432.", - "\u0444\u0435\u0432\u0440.", - "\u043c\u0430\u0440.", - "\u0430\u043f\u0440.", - "\u043c\u0430\u044f", - "\u0438\u044e\u043d.", - "\u0438\u044e\u043b.", - "\u0430\u0432\u0433.", - "\u0441\u0435\u043d\u0442.", - "\u043e\u043a\u0442.", - "\u043d\u043e\u044f\u0431.", - "\u0434\u0435\u043a.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u044f\u043d\u0432\u0430\u0440\u044f", - "\u0444\u0435\u0432\u0440\u0430\u043b\u044f", - "\u043c\u0430\u0440\u0442\u0430", - "\u0430\u043f\u0440\u0435\u043b\u044f", - "\u043c\u0430\u044f", - "\u0438\u044e\u043d\u044f", - "\u0438\u044e\u043b\u044f", - "\u0430\u0432\u0433\u0443\u0441\u0442\u0430", - "\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f", - "\u043e\u043a\u0442\u044f\u0431\u0440\u044f", - "\u043d\u043e\u044f\u0431\u0440\u044f", - "\u0434\u0435\u043a\u0430\u0431\u0440\u044f", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u042f", - "\u0424", - "\u041c", - "\u0410", - "\u041c", - "\u0418", - "\u0418", - "\u0410", - "\u0421", - "\u041e", - "\u041d", - "\u0414", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java deleted file mode 100644 index 156c1fba69e..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * 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 - * 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_sk extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "1. \u0161tvr\u0165rok", - "2. \u0161tvr\u0165rok", - "3. \u0161tvr\u0165rok", - "4. \u0161tvr\u0165rok", - }; - - final String[] sharedAmPmMarkers = { - "AM", - "PM", - }; - - final String[] sharedDatePatterns = { - "EEEE, d. M. y GGGG", - "d. M. y GGGG", - "d. M. y GGGG", - "d.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "ne", - "po", - "ut", - "st", - "\u0161t", - "pi", - "so", - }; - - final String[] sharedDayNames = { - "nede\u013ea", - "pondelok", - "utorok", - "streda", - "\u0161tvrtok", - "piatok", - "sobota", - }; - - final String[] sharedDayNarrows = { - "n", - "p", - "u", - "s", - "\u0161", - "p", - "s", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedTimePatterns = { - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d. M. y G", - "d. M. y G", - "d. M. y G", - "d.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "buddhistick\u00fd kalend\u00e1r" }, - { "calendarname.gregorian", - "gregori\u00e1nsky kalend\u00e1r" }, - { "calendarname.gregory", - "gregori\u00e1nsky kalend\u00e1r" }, - { "calendarname.islamic", - "islamsk\u00fd kalend\u00e1r" }, - { "calendarname.islamic-civil", - "Islamsk\u00fd ob\u010diansky kalend\u00e1r" }, - { "calendarname.japanese", - "japonsk\u00fd kalend\u00e1r" }, - { "calendarname.roc", - "\u010d\u00ednsky republik\u00e1nsky kalend\u00e1r" }, - { "field.dayperiod", - "\u010das\u0165 d\u0148a" }, - { "field.era", - "letopo\u010det" }, - { "field.hour", - "hodina" }, - { "field.minute", - "min\u00fata" }, - { "field.month", - "mesiac" }, - { "field.second", - "sekunda" }, - { "field.week", - "t\u00fd\u017ede\u0148" }, - { "field.weekday", - "de\u0148 v t\u00fd\u017edni" }, - { "field.year", - "rok" }, - { "field.zone", - "\u010dasov\u00e9 p\u00e1smo" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "pred Kristom", - "po Kristovi", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "pred n.l.", - "n.l.", - } - }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "m\u00e1j", - "j\u00fan", - "j\u00fal", - "aug", - "sep", - "okt", - "nov", - "dec", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janu\u00e1ra", - "febru\u00e1ra", - "marca", - "apr\u00edla", - "m\u00e1ja", - "j\u00fana", - "j\u00fala", - "augusta", - "septembra", - "okt\u00f3bra", - "novembra", - "decembra", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java deleted file mode 100644 index 7b6712baa11..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java +++ /dev/null @@ -1,293 +0,0 @@ -/* - * 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 - * 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_sl extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1. \u010det.", - "2. \u010det.", - "3. \u010det.", - "4. \u010det.", - }; - - final String[] sharedQuarterNames = { - "1. \u010detrtletje", - "2. \u010detrtletje", - "3. \u010detrtletje", - "4. \u010detrtletje", - }; - - final String[] sharedAmPmMarkers = { - "dop.", - "pop.", - }; - - final String[] sharedDatePatterns = { - "EEEE, dd. MMMM y GGGG", - "dd. MMMM y GGGG", - "d. MMM y GGGG", - "d. MM. yy G", - }; - - final String[] sharedDayAbbreviations = { - "ned.", - "pon.", - "tor.", - "sre.", - "\u010det.", - "pet.", - "sob.", - }; - - final String[] sharedDayNames = { - "nedelja", - "ponedeljek", - "torek", - "sreda", - "\u010detrtek", - "petek", - "sobota", - }; - - final String[] sharedDayNarrows = { - "n", - "p", - "t", - "s", - "\u010d", - "p", - "s", - }; - - final String[] sharedNarrowAmPmMarkers = { - "d", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, dd. MMMM y G", - "dd. MMMM y G", - "d. MMM y G", - "d. MM. yy GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "budisti\u010dni koledar" }, - { "calendarname.gregorian", - "gregorijanski koledar" }, - { "calendarname.gregory", - "gregorijanski koledar" }, - { "calendarname.islamic", - "islamski koledar" }, - { "calendarname.islamic-civil", - "islamski civilni koledar" }, - { "calendarname.japanese", - "japonski koledar" }, - { "calendarname.roc", - "kitajski dr\u017eavni koledar" }, - { "field.dayperiod", - "\u010cas dneva" }, - { "field.era", - "doba" }, - { "field.hour", - "ura" }, - { "field.minute", - "minuta" }, - { "field.month", - "mesec" }, - { "field.second", - "sekunda" }, - { "field.week", - "teden" }, - { "field.weekday", - "dan v tednu" }, - { "field.year", - "leto" }, - { "field.zone", - "\u010dasovni pas" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "pred Kristusom", - "na\u0161e \u0161tetje", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "pr.n.\u0161.", - "po Kr.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mar.", - "apr.", - "maj", - "jun.", - "jul.", - "avg.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januar", - "februar", - "marec", - "april", - "maj", - "junij", - "julij", - "avgust", - "september", - "oktober", - "november", - "december", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "timezone.hourFormat", - "+HH.mm;-HH.mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java deleted file mode 100644 index e6b640764e0..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java +++ /dev/null @@ -1,301 +0,0 @@ -/* - * 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 - * 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_sq extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "tremujori I", - "tremujori II", - "tremujori III", - "tremujori IV", - }; - - final String[] sharedQuarterNames = { - "tremujori i par\u00eb", - "tremujori i dyt\u00eb", - "tremujori i tret\u00eb", - "tremujori i kat\u00ebrt", - }; - - final String[] sharedAmPmMarkers = { - "e paradites", - "e pasdites", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMM y GGGG", - "d MMM y GGGG", - "d MMM y GGGG", - "d.M.y G", - }; - - final String[] sharedDayAbbreviations = { - "Die", - "H\u00ebn", - "Mar", - "M\u00ebr", - "Enj", - "Pre", - "Sht", - }; - - final String[] sharedDayNames = { - "e diel", - "e h\u00ebn\u00eb", - "e mart\u00eb", - "e m\u00ebrkur\u00eb", - "e enjte", - "e premte", - "e shtun\u00eb", - }; - - final String[] sharedDayNarrows = { - "D", - "H", - "M", - "M", - "E", - "P", - "S", - }; - - final String[] sharedTimePatterns = { - "h:mm:ss a, zzzz", - "h:mm:ss a, z", - "h:mm:ss a", - "h:mm a", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMM y G", - "d MMM y G", - "d MMM y G", - "d.M.y GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "kalendar budist" }, - { "calendarname.gregorian", - "kalendar gregorian" }, - { "calendarname.gregory", - "kalendar gregorian" }, - { "calendarname.islamic", - "kalendar islamik" }, - { "calendarname.islamic-civil", - "Kalendari Islamik (tabelor, periudha civile)" }, - { "calendarname.islamic-umalqura", - "Kalendari Islamik (Um al-Qura)" }, - { "calendarname.japanese", - "kalendar japonez" }, - { "calendarname.roc", - "kalendar minguo (kinez)" }, - { "field.dayperiod", - "paradite/pasdite" }, - { "field.era", - "er\u00eb" }, - { "field.hour", - "or\u00eb" }, - { "field.minute", - "minut\u00eb" }, - { "field.month", - "muaj" }, - { "field.second", - "sekond\u00eb" }, - { "field.week", - "jav\u00eb" }, - { "field.weekday", - "dit\u00eb e jav\u00ebs" }, - { "field.year", - "vit" }, - { "field.zone", - "brezi orar" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "para er\u00ebs s\u00eb re", - "er\u00ebs s\u00eb re", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "p.e.r.", - "n.e.r.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "Jan", - "Shk", - "Mar", - "Pri", - "Maj", - "Qer", - "Kor", - "Gsh", - "Sht", - "Tet", - "N\u00ebn", - "Dhj", - "", - } - }, - { "roc.MonthNames", - new String[] { - "janar", - "shkurt", - "mars", - "prill", - "maj", - "qershor", - "korrik", - "gusht", - "shtator", - "tetor", - "n\u00ebntor", - "dhjetor", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "S", - "M", - "P", - "M", - "Q", - "K", - "G", - "S", - "T", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "timezone.gmtFormat", - "Ora e Grenui\u00e7it: {0}" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java deleted file mode 100644 index cc165b0070d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java +++ /dev/null @@ -1,395 +0,0 @@ -/* - * 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 - * 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_sr extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "\u041a1", - "\u041a2", - "\u041a3", - "\u041a4", - }; - - final String[] sharedQuarterNames = { - "\u043f\u0440\u0432\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "\u0434\u0440\u0443\u0433\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "\u0442\u0440\u0435\u045b\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "\u0447\u0435\u0442\u0432\u0440\u0442\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435", - "\u043f\u043e \u043f\u043e\u0434\u043d\u0435", - }; - - final String[] sharedDatePatterns = { - "EEEE, dd. MMMM y. GGGG", - "dd. MMMM y. GGGG", - "dd.MM.y. GGGG", - "d.M.y. G", - }; - - final String[] sharedDayAbbreviations = { - "\u043d\u0435\u0434", - "\u043f\u043e\u043d", - "\u0443\u0442\u043e", - "\u0441\u0440\u0435", - "\u0447\u0435\u0442", - "\u043f\u0435\u0442", - "\u0441\u0443\u0431", - }; - - final String[] sharedDayNames = { - "\u043d\u0435\u0434\u0435\u0459\u0430", - "\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a", - "\u0443\u0442\u043e\u0440\u0430\u043a", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a", - "\u043f\u0435\u0442\u0430\u043a", - "\u0441\u0443\u0431\u043e\u0442\u0430", - }; - - final String[] sharedDayNarrows = { - "\u043d", - "\u043f", - "\u0443", - "\u0441", - "\u0447", - "\u043f", - "\u0441", - }; - - final String[] sharedEras = { - "", - "\u0410\u0425", - }; - - final String[] sharedTimePatterns = { - "HH.mm.ss zzzz", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, dd. MMMM y. G", - "dd. MMMM y. G", - "dd.MM.y. G", - "d.M.y. GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\u0411\u0415", - }; - - final String[] sharedShortEras = { - "\u041f\u0440\u0435 \u0420\u041a", - "\u0420\u041a", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "\u0431\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregorian", - "\u0433\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregory", - "\u0433\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic", - "\u0438\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic-civil", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u043d\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.japanese", - "\u0458\u0430\u043f\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.roc", - "\u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0435 \u041a\u0438\u043d\u0435" }, - { "field.dayperiod", - "\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435/\u043f\u043e \u043f\u043e\u0434\u043d\u0435" }, - { "field.era", - "\u0435\u0440\u0430" }, - { "field.hour", - "\u0441\u0430\u0442" }, - { "field.minute", - "\u043c\u0438\u043d\u0443\u0442" }, - { "field.month", - "\u043c\u0435\u0441\u0435\u0446" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434" }, - { "field.week", - "\u043d\u0435\u0434\u0435\u0459\u0430" }, - { "field.weekday", - "\u0434\u0430\u043d \u0443 \u043d\u0435\u0434\u0435\u0459\u0438" }, - { "field.year", - "\u0433\u043e\u0434\u0438\u043d\u0430" }, - { "field.zone", - "\u0432\u0440\u0435\u043c\u0435\u043d\u0441\u043a\u0430 \u0437\u043e\u043d\u0430" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthNames", - new String[] { - "\u041c\u0443\u0440\u0430\u0445\u0430\u043c", - "\u0421\u0430\u0444\u0430\u0440", - "\u0420\u0430\u0431\u0438\u02bb I", - "\u0420\u0430\u0431\u0438\u02bb II", - "\u0408\u0443\u043c\u0430\u0434\u0430 I", - "\u0408\u0443\u043c\u0430\u0434\u0430 II", - "\u0420\u0430\u0452\u0430\u0431", - "\u0428\u0430\u02bb\u0431\u0430\u043d", - "\u0420\u0430\u043c\u0430\u0434\u0430\u043d", - "\u0428\u0430\u0432\u0430\u043b", - "\u0414\u0443\u02bb\u043b-\u041a\u0438\u02bb\u0434\u0430", - "\u0414\u0443\u02bb\u043b-\u0445\u0438\u0452\u0430", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, MMMM d, y G", - "MMMM d, y G", - "MMM d, y G", - "M/d/yy G", - } - }, - { "java.time.japanese.long.Eras", - new String[] { - "\u043d\u043e\u0432\u0435 \u0435\u0440\u0435", - "\u041c\u0435\u0438\u0452\u0438", - "\u0422\u0430\u0438\u0448\u043e", - "\u0428\u043e\u0432\u0430", - "\u0425\u0430\u0438\u0441\u0435\u0438", - "\u0420\u0435\u0438\u0432\u0430", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "\u043d. \u0435.", - "\u041c\u0435\u0438\u0452\u0438", - "\u0422\u0430\u0438\u0448\u043e", - "\u0428\u043e\u0432\u0430", - "\u0425\u0430\u0438\u0441\u0435\u0438", - "\u0420\u0435\u0438\u0432\u0430", - } - }, - { "java.time.long.Eras", - new String[] { - "\u043f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435", - "\u043d\u043e\u0432\u0435 \u0435\u0440\u0435", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u043f. \u043d. \u0435.", - "\u043d. \u0435", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - new String[] { - "\u0458\u0430\u043d", - "\u0444\u0435\u0431", - "\u043c\u0430\u0440", - "\u0430\u043f\u0440", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d", - "\u0458\u0443\u043b", - "\u0430\u0432\u0433", - "\u0441\u0435\u043f", - "\u043e\u043a\u0442", - "\u043d\u043e\u0432", - "\u0434\u0435\u0446", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u0458\u0430\u043d\u0443\u0430\u0440", - "\u0444\u0435\u0431\u0440\u0443\u0430\u0440", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440\u0438\u043b", - "\u043c\u0430\u0458", - "\u0458\u0443\u043d", - "\u0458\u0443\u043b", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440", - "\u043e\u043a\u0442\u043e\u0431\u0430\u0440", - "\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440", - "\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u0458", - "\u0444", - "\u043c", - "\u0430", - "\u043c", - "\u0458", - "\u0458", - "\u0430", - "\u0441", - "\u043e", - "\u043d", - "\u0434", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - { "timezone.hourFormat", - "+HHmm;-HHmm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java deleted file mode 100644 index 1ecfba1c210..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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_sr_BA extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedTimePatterns = { - "HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - return new Object[][] { - { "islamic.TimePatterns", - sharedTimePatterns }, - { "roc.TimePatterns", - sharedTimePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java deleted file mode 100644 index 5145df2c6e9..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java +++ /dev/null @@ -1,328 +0,0 @@ -/* - * 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 - * 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_sr_Latn extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "prvi kvartal", - "drugi kvartal", - "tre\u0107i kvartal", - "\u010detvrti kvartal", - }; - - final String[] sharedAmPmMarkers = { - "pre podne", - "po podne", - }; - - final String[] sharedDayAbbreviations = { - "ned", - "pon", - "uto", - "sre", - "\u010det", - "pet", - "sub", - }; - - final String[] sharedDayNames = { - "nedelja", - "ponedeljak", - "utorak", - "sreda", - "\u010detvrtak", - "petak", - "subota", - }; - - final String[] sharedDayNarrows = { - "n", - "p", - "u", - "s", - "\u010d", - "p", - "s", - }; - - final String[] sharedEras = { - "", - "AH", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "BE", - }; - - final String[] sharedShortEras = { - "Pre RK", - "RK", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "budisti\u010dki kalendar" }, - { "calendarname.gregorian", - "gregorijanski kalendar" }, - { "calendarname.gregory", - "gregorijanski kalendar" }, - { "calendarname.islamic", - "islamski kalendar" }, - { "calendarname.islamic-civil", - "Islamski civilni kalendar" }, - { "calendarname.japanese", - "japanski kalendar" }, - { "calendarname.roc", - "kalendar Republike Kine" }, - { "field.dayperiod", - "pre podne/po podne" }, - { "field.era", - "era" }, - { "field.hour", - "sat" }, - { "field.minute", - "minut" }, - { "field.month", - "mesec" }, - { "field.second", - "sekund" }, - { "field.week", - "nedelja" }, - { "field.weekday", - "dan u nedelji" }, - { "field.year", - "godina" }, - { "field.zone", - "vremenska zona" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthNames", - new String[] { - "Muraham", - "Safar", - "Rabi\u02bb I", - "Rabi\u02bb II", - "Jumada I", - "Jumada II", - "Ra\u0111ab", - "\u0160a\u02bbban", - "Ramadan", - "\u0160aval", - "Du\u02bbl-Ki\u02bbda", - "Du\u02bbl-hi\u0111a", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.japanese.long.Eras", - new String[] { - "nove ere", - "Mei\u0111i", - "Tai\u0161o", - "\u0160ova", - "Haisei", - "Reiva", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "n. e.", - "Mei\u0111i", - "Tai\u0161o", - "\u0160ova", - "Haisei", - "Reiva", - } - }, - { "java.time.long.Eras", - new String[] { - "pre nove ere", - "nove ere", - } - }, - { "java.time.short.Eras", - new String[] { - "p. n. e.", - "n. e", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "avg", - "sep", - "okt", - "nov", - "dec", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januar", - "februar", - "mart", - "april", - "maj", - "jun", - "jul", - "avgust", - "septembar", - "oktobar", - "novembar", - "decembar", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "j", - "f", - "m", - "a", - "m", - "j", - "j", - "a", - "s", - "o", - "n", - "d", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java deleted file mode 100644 index 346c88f0f76..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java +++ /dev/null @@ -1,354 +0,0 @@ -/* - * 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 - * 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_sv extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "K1", - "K2", - "K3", - "K4", - }; - - final String[] sharedQuarterNames = { - "1:a kvartalet", - "2:a kvartalet", - "3:e kvartalet", - "4:e kvartalet", - }; - - final String[] sharedAmPmMarkers = { - "fm", - "em", - }; - - final String[] sharedDatePatterns = { - "EEEE d MMMM y GGGG", - "d MMMM y GGGG", - "d MMM y GGGG", - "GGGG y-MM-dd", - }; - - final String[] sharedDayAbbreviations = { - "s\u00f6n", - "m\u00e5n", - "tis", - "ons", - "tors", - "fre", - "l\u00f6r", - }; - - final String[] sharedDayNames = { - "s\u00f6ndag", - "m\u00e5ndag", - "tisdag", - "onsdag", - "torsdag", - "fredag", - "l\u00f6rdag", - }; - - final String[] sharedDayNarrows = { - "S", - "M", - "T", - "O", - "T", - "F", - "L", - }; - - final String[] sharedTimePatterns = { - "'kl'. HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE d MMMM y G", - "d MMMM y G", - "d MMM y G", - "G y-MM-dd", - }; - - final String[] sharedJavaTimeLongEras = { - "f\u00f6re Kristus", - "efter Kristus", - }; - - final String[] sharedEras = { - "f\u00f6re R.K.", - "R.K.", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "buddistisk kalender" }, - { "calendarname.gregorian", - "gregoriansk kalender" }, - { "calendarname.gregory", - "gregoriansk kalender" }, - { "calendarname.islamic", - "islamisk kalender" }, - { "calendarname.islamic-civil", - "islamisk civil kalender" }, - { "calendarname.islamic-umalqura", - "islamisk kalender, Umm al-Qura" }, - { "calendarname.japanese", - "japansk kalender" }, - { "calendarname.roc", - "kinesiska republikens kalender" }, - { "field.dayperiod", - "fm/em" }, - { "field.era", - "era" }, - { "field.hour", - "timme" }, - { "field.minute", - "minut" }, - { "field.month", - "m\u00e5nad" }, - { "field.second", - "sekund" }, - { "field.week", - "vecka" }, - { "field.weekday", - "veckodag" }, - { "field.year", - "\u00e5r" }, - { "field.zone", - "tidszon" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "muharram", - "safar", - "rabi\u2019 al-awwal", - "rabi\u2019 al-akhir", - "jumada-l-ula", - "jumada-l-akhira", - "rajab", - "sha\u2019ban", - "ramadan", - "shawwal", - "dhu-l-ga\u2019da", - "dhu-l-hijja", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.long.Eras", - new String[] { - "efter Kristus", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "e.Kr.", - "Meiji", - "Taish\u014d", - "Sh\u014dwa", - "Heisei", - "Reiwa", - } - }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "jan.", - "feb.", - "mars", - "apr.", - "maj", - "juni", - "juli", - "aug.", - "sep.", - "okt.", - "nov.", - "dec.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "januari", - "februari", - "mars", - "april", - "maj", - "juni", - "juli", - "augusti", - "september", - "oktober", - "november", - "december", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - { "timezone.hourFormat", - "+HH:mm;\u2212HH:mm" }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java deleted file mode 100644 index 1ee3f9b7a8d..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java +++ /dev/null @@ -1,394 +0,0 @@ -/* - * 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 - * 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_th extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "\u0e44\u0e15\u0e23\u0e21\u0e32\u0e2a 1", - "\u0e44\u0e15\u0e23\u0e21\u0e32\u0e2a 2", - "\u0e44\u0e15\u0e23\u0e21\u0e32\u0e2a 3", - "\u0e44\u0e15\u0e23\u0e21\u0e32\u0e2a 4", - }; - - final String[] sharedAmPmMarkers = { - "\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07", - "\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07", - }; - - final String[] sharedDayAbbreviations = { - "\u0e2d\u0e32.", - "\u0e08.", - "\u0e2d.", - "\u0e1e.", - "\u0e1e\u0e24.", - "\u0e28.", - "\u0e2a.", - }; - - final String[] sharedDayNames = { - "\u0e27\u0e31\u0e19\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c", - "\u0e27\u0e31\u0e19\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c", - "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23", - "\u0e27\u0e31\u0e19\u0e1e\u0e38\u0e18", - "\u0e27\u0e31\u0e19\u0e1e\u0e24\u0e2b\u0e31\u0e2a\u0e1a\u0e14\u0e35", - "\u0e27\u0e31\u0e19\u0e28\u0e38\u0e01\u0e23\u0e4c", - "\u0e27\u0e31\u0e19\u0e40\u0e2a\u0e32\u0e23\u0e4c", - }; - - final String[] sharedDayNarrows = { - "\u0e2d\u0e32", - "\u0e08", - "\u0e2d", - "\u0e1e", - "\u0e1e\u0e24", - "\u0e28", - "\u0e2a", - }; - - final String[] sharedEras = { - "", - "\u0e2e.\u0e28.", - }; - - final String[] sharedTimePatterns = { - "H \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 mm \u0e19\u0e32\u0e17\u0e35 ss \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 zzzz", - "H \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 mm \u0e19\u0e32\u0e17\u0e35 ss \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 z", - "HH:mm:ss", - "HH:mm", - }; - - final String[] sharedNarrowAmPmMarkers = { - "a", - "p", - }; - - final String[] sharedJavaTimeLongEras = { - "\u0e04.\u0e28.", - "\u0e40\u0e21\u0e08\u0e34", - "\u0e17\u0e30\u0e2d\u0e34\u0e42\u0e0a", - "\u0e42\u0e0a\u0e27\u0e30", - "\u0e40\u0e2e\u0e40\u0e0b", - "\u0e40\u0e23\u0e27\u0e30", - }; - - final String[] sharedShortEras = { - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19", - "\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19", - }; - - final String[] sharedMonthNarrows = { - "\u0e21.\u0e04.", - "\u0e01.\u0e1e.", - "\u0e21\u0e35.\u0e04.", - "\u0e40\u0e21.\u0e22.", - "\u0e1e.\u0e04.", - "\u0e21\u0e34.\u0e22.", - "\u0e01.\u0e04.", - "\u0e2a.\u0e04.", - "\u0e01.\u0e22.", - "\u0e15.\u0e04.", - "\u0e1e.\u0e22.", - "\u0e18.\u0e04.", - "", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterNames }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e1e\u0e38\u0e17\u0e18" }, - { "calendarname.gregorian", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19" }, - { "calendarname.gregory", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19" }, - { "calendarname.islamic", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21" }, - { "calendarname.islamic-civil", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e0b\u0e35\u0e27\u0e34\u0e25" }, - { "calendarname.islamic-umalqura", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21 (\u0e2d\u0e38\u0e21\u0e21\u0e4c\u0e2d\u0e31\u0e25\u0e01\u0e38\u0e23\u0e32)" }, - { "calendarname.japanese", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e0d\u0e35\u0e48\u0e1b\u0e38\u0e48\u0e19" }, - { "calendarname.roc", - "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19" }, - { "field.dayperiod", - "\u0e0a\u0e48\u0e27\u0e07\u0e27\u0e31\u0e19" }, - { "field.era", - "\u0e2a\u0e21\u0e31\u0e22" }, - { "field.hour", - "\u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07" }, - { "field.minute", - "\u0e19\u0e32\u0e17\u0e35" }, - { "field.month", - "\u0e40\u0e14\u0e37\u0e2d\u0e19" }, - { "field.second", - "\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35" }, - { "field.week", - "\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c" }, - { "field.weekday", - "\u0e27\u0e31\u0e19\u0e43\u0e19\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c" }, - { "field.year", - "\u0e1b\u0e35" }, - { "field.zone", - "\u0e40\u0e02\u0e15\u0e40\u0e27\u0e25\u0e32" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM GGGG y", - "d MMMM GGGG y", - "d MMM GGGG y", - "d/M/y GGGG", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - new String[] { - "\u0e21\u0e38\u0e2e\u0e31\u0e23.", - "\u0e40\u0e28\u0e32\u0e30.", - "\u0e23\u0e2d\u0e1a\u0e35 I", - "\u0e23\u0e2d\u0e1a\u0e35 II", - "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 I", - "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 II", - "\u0e40\u0e23\u0e32\u0e30.", - "\u0e0a\u0e30\u0e2d\u0e4c.", - "\u0e40\u0e23\u0e32\u0e30\u0e21\u0e30.", - "\u0e40\u0e0a\u0e32\u0e27.", - "\u0e0b\u0e38\u0e25\u0e01\u0e34\u0e2d\u0e3a.", - "\u0e0b\u0e38\u0e25\u0e2b\u0e34\u0e08.", - "", - } - }, - { "islamic.MonthNames", - new String[] { - "\u0e21\u0e38\u0e2e\u0e30\u0e23\u0e4c\u0e23\u0e2d\u0e21", - "\u0e0b\u0e2d\u0e1f\u0e32\u0e23\u0e4c", - "\u0e23\u0e2d\u0e1a\u0e35 I", - "\u0e23\u0e2d\u0e1a\u0e35 II", - "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 I", - "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 II", - "\u0e23\u0e2d\u0e08\u0e31\u0e1a", - "\u0e0a\u0e30\u0e2d\u0e30\u0e1a\u0e32\u0e19", - "\u0e23\u0e2d\u0e21\u0e30\u0e14\u0e2d\u0e19", - "\u0e40\u0e0a\u0e32\u0e27\u0e31\u0e25", - "\u0e0b\u0e38\u0e25\u0e01\u0e34\u0e2d\u0e3a\u0e14\u0e30\u0e2e\u0e3a", - "\u0e0b\u0e38\u0e25\u0e2b\u0e34\u0e08\u0e0d\u0e30\u0e2e\u0e3a", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterNames }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - new String[] { - "", - "\u0e2e\u0e34\u0e08\u0e40\u0e23\u0e32\u0e30\u0e2b\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a", - } - }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM G y", - "d MMMM y", - "d MMM y", - "d/M/yy", - } - }, - { "java.time.buddhist.long.Eras", - new String[] { - "BC", - "\u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48", - "\u0e1e.\u0e28.", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM G y", - "d MMMM G y", - "d MMM G y", - "d/M/y G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35G\u0e17\u0e35\u0e48 y", - "d MMMM \u0e1b\u0e35G y", - "d MMM G y", - "d/M/yy G", - } - }, - { "java.time.japanese.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.long.Eras", - new String[] { - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a", - "\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a", - } - }, - { "java.time.roc.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35G\u0e17\u0e35\u0e48 y", - "d MMMM \u0e1b\u0e35G y", - "d MMM G y", - "d/M/y G", - } - }, - { "java.time.short.Eras", - new String[] { - "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48", - "\u0e04.\u0e28.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35GGGG\u0e17\u0e35\u0e48 y", - "d MMMM \u0e1b\u0e35GGGG y", - "d MMM GGGG y", - "d/M/y GGGG", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - sharedMonthNarrows }, - { "roc.MonthNames", - new String[] { - "\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21", - "\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c", - "\u0e21\u0e35\u0e19\u0e32\u0e04\u0e21", - "\u0e40\u0e21\u0e29\u0e32\u0e22\u0e19", - "\u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21", - "\u0e21\u0e34\u0e16\u0e38\u0e19\u0e32\u0e22\u0e19", - "\u0e01\u0e23\u0e01\u0e0e\u0e32\u0e04\u0e21", - "\u0e2a\u0e34\u0e07\u0e2b\u0e32\u0e04\u0e21", - "\u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19", - "\u0e15\u0e38\u0e25\u0e32\u0e04\u0e21", - "\u0e1e\u0e24\u0e28\u0e08\u0e34\u0e01\u0e32\u0e22\u0e19", - "\u0e18\u0e31\u0e19\u0e27\u0e32\u0e04\u0e21", - "", - } - }, - { "roc.MonthNarrows", - sharedMonthNarrows }, - { "roc.QuarterAbbreviations", - sharedQuarterNames }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java deleted file mode 100644 index 2ebe20fdc5b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java +++ /dev/null @@ -1,364 +0,0 @@ -/* - * 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 - * 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_tr extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "\u00c71", - "\u00c72", - "\u00c73", - "\u00c74", - }; - - final String[] sharedQuarterNames = { - "1. \u00e7eyrek", - "2. \u00e7eyrek", - "3. \u00e7eyrek", - "4. \u00e7eyrek", - }; - - final String[] sharedQuarterNarrows = { - "1.", - "2.", - "3.", - "4.", - }; - - final String[] sharedAmPmMarkers = { - "\u00d6\u00d6", - "\u00d6S", - }; - - final String[] sharedDatePatterns = { - "GGGG d MMMM y EEEE", - "GGGG d MMMM y", - "GGGG d MMM y", - "G d.MM.y", - }; - - final String[] sharedDayAbbreviations = { - "Paz", - "Pzt", - "Sal", - "\u00c7ar", - "Per", - "Cum", - "Cmt", - }; - - final String[] sharedDayNames = { - "Pazar", - "Pazartesi", - "Sal\u0131", - "\u00c7ar\u015famba", - "Per\u015fembe", - "Cuma", - "Cumartesi", - }; - - final String[] sharedDayNarrows = { - "P", - "P", - "S", - "\u00c7", - "P", - "C", - "C", - }; - - final String[] sharedEras = { - "", - "Hicri", - }; - - final String[] sharedMonthNames = { - "Muharrem", - "Safer", - "Rebi\u00fclevvel", - "Rebi\u00fclahir", - "Cemaziyelevvel", - "Cemaziyelahir", - "Recep", - "\u015eaban", - "Ramazan", - "\u015eevval", - "Zilkade", - "Zilhicce", - "", - }; - - final String[] sharedNarrowAmPmMarkers = { - "\u00f6\u00f6", - "\u00f6s", - }; - - final String[] sharedJavaTimeDatePatterns = { - "G d MMMM y EEEE", - "G d MMMM y", - "G d MMM y", - "GGGGG d.MM.y", - }; - - final String[] sharedShortEras = { - "Before R.O.C.", - "Minguo", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "QuarterNarrows", - sharedQuarterNarrows }, - { "calendarname.buddhist", - "Budist Takvimi" }, - { "calendarname.gregorian", - "Miladi Takvim" }, - { "calendarname.gregory", - "Miladi Takvim" }, - { "calendarname.islamic", - "Hicri Takvim" }, - { "calendarname.islamic-civil", - "Arap Takvimi" }, - { "calendarname.islamic-umalqura", - "Hicri Takvim (\u00dcmm\u00fc-l Kurra Takvimi)" }, - { "calendarname.japanese", - "Japon Takvimi" }, - { "calendarname.roc", - "\u00c7in Cumhuriyeti Takvimi" }, - { "field.dayperiod", - "\u00d6\u00d6/\u00d6S" }, - { "field.era", - "Miladi D\u00f6nem" }, - { "field.hour", - "Saat" }, - { "field.minute", - "Dakika" }, - { "field.month", - "Ay" }, - { "field.second", - "Saniye" }, - { "field.week", - "Hafta" }, - { "field.weekday", - "Haftan\u0131n G\u00fcn\u00fc" }, - { "field.year", - "Y\u0131l" }, - { "field.zone", - "Saat Dilimi" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - sharedMonthNames }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.QuarterNarrows", - sharedQuarterNarrows }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - new String[] { - "d MMMM y G EEEE", - "d MMMM y G", - "d MMM y G", - "d.MM.y G", - } - }, - { "java.time.long.Eras", - new String[] { - "Milattan \u00d6nce", - "Milattan Sonra", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "M\u00d6", - "MS", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - new String[] { - "Oca", - "\u015eub", - "Mar", - "Nis", - "May", - "Haz", - "Tem", - "A\u011fu", - "Eyl", - "Eki", - "Kas", - "Ara", - "", - } - }, - { "roc.MonthNames", - new String[] { - "Ocak", - "\u015eubat", - "Mart", - "Nisan", - "May\u0131s", - "Haziran", - "Temmuz", - "A\u011fustos", - "Eyl\u00fcl", - "Ekim", - "Kas\u0131m", - "Aral\u0131k", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "O", - "\u015e", - "M", - "N", - "M", - "H", - "T", - "A", - "E", - "E", - "K", - "A", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.QuarterNarrows", - sharedQuarterNarrows }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java deleted file mode 100644 index b3c0b2c841b..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java +++ /dev/null @@ -1,303 +0,0 @@ -/* - * 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 - * 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_uk extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1-\u0439 \u043a\u0432.", - "2-\u0439 \u043a\u0432.", - "3-\u0439 \u043a\u0432.", - "4-\u0439 \u043a\u0432.", - }; - - final String[] sharedQuarterNames = { - "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - }; - - final String[] sharedAmPmMarkers = { - "\u0434\u043f", - "\u043f\u043f", - }; - - final String[] sharedDatePatterns = { - "EEEE, d MMMM y '\u0440'. GGGG", - "d MMMM y '\u0440'. GGGG", - "d MMM y GGGG", - "dd.MM.yy G", - }; - - final String[] sharedDayAbbreviations = { - "\u041d\u0434", - "\u041f\u043d", - "\u0412\u0442", - "\u0421\u0440", - "\u0427\u0442", - "\u041f\u0442", - "\u0421\u0431", - }; - - final String[] sharedDayNames = { - "\u043d\u0435\u0434\u0456\u043b\u044f", - "\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a", - "\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a", - "\u0441\u0435\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0435\u0440", - "\u043f\u02bc\u044f\u0442\u043d\u0438\u0446\u044f", - "\u0441\u0443\u0431\u043e\u0442\u0430", - }; - - final String[] sharedDayNarrows = { - "\u041d", - "\u041f", - "\u0412", - "\u0421", - "\u0427", - "\u041f", - "\u0421", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, d MMMM y '\u0440'. G", - "d MMMM y '\u0440'. G", - "d MMM y G", - "dd.MM.yy GGGGG", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u0431\u0443\u0434\u0434\u0456\u0439\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregorian", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.gregory", - "\u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic", - "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.islamic-civil", - "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.japanese", - "\u044f\u043f\u043e\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "calendarname.roc", - "\u043a\u0438\u0442\u0430\u0439\u0441\u044c\u043a\u0438\u0439 \u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" }, - { "field.dayperiod", - "\u0447\u0430\u0441\u0442\u0438\u043d\u0430 \u0434\u043e\u0431\u0438" }, - { "field.era", - "\u0435\u0440\u0430" }, - { "field.hour", - "\u0433\u043e\u0434\u0438\u043d\u0430" }, - { "field.minute", - "\u0445\u0432\u0438\u043b\u0438\u043d\u0430" }, - { "field.month", - "\u043c\u0456\u0441\u044f\u0446\u044c" }, - { "field.second", - "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", - "\u0442\u0438\u0436\u0434\u0435\u043d\u044c" }, - { "field.weekday", - "\u0434\u0435\u043d\u044c \u0442\u0438\u0436\u043d\u044f" }, - { "field.year", - "\u0440\u0456\u043a" }, - { "field.zone", - "\u0447\u0430\u0441\u043e\u0432\u0438\u0439 \u043f\u043e\u044f\u0441" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - sharedDatePatterns }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.MonthNames", - new String[] { - "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c", - "\u0421\u0430\u0444\u0430\u0440", - "\u0420\u0430\u0431\u0456 I", - "\u0420\u0430\u0431\u0456 II", - "\u0414\u0436\u0443\u043c\u0430\u0434\u0430 I", - "\u0414\u0436\u0443\u043c\u0430\u0434\u0430 II", - "\u0420\u0430\u0434\u0436\u0430\u0431", - "\u0428\u0430\u0430\u0431\u0430\u043d", - "\u0420\u0430\u043c\u0430\u0434\u0430\u043d", - "\u0414\u0430\u0432\u0432\u0430\u043b", - "\u0417\u0443-\u043b\u044c-\u043a\u0430\u0430\u0434\u0430", - "\u0417\u0443-\u043b\u044c-\u0445\u0456\u0434\u0436\u0430", - "", - } - }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - new String[] { - "\u0434\u043e \u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438", - "\u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438", - } - }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - new String[] { - "\u0434\u043e \u043d.\u0435.", - "\u043f\u0456\u0441\u043b\u044f \u043d.\u0435.", - } - }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - sharedDatePatterns }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.MonthAbbreviations", - new String[] { - "\u0441\u0456\u0447.", - "\u043b\u044e\u0442.", - "\u0431\u0435\u0440.", - "\u043a\u0432\u0456\u0442.", - "\u0442\u0440\u0430\u0432.", - "\u0447\u0435\u0440\u0432.", - "\u043b\u0438\u043f.", - "\u0441\u0435\u0440\u043f.", - "\u0432\u0435\u0440.", - "\u0436\u043e\u0432\u0442.", - "\u043b\u0438\u0441\u0442.", - "\u0433\u0440\u0443\u0434.", - "", - } - }, - { "roc.MonthNames", - new String[] { - "\u0441\u0456\u0447\u043d\u044f", - "\u043b\u044e\u0442\u043e\u0433\u043e", - "\u0431\u0435\u0440\u0435\u0437\u043d\u044f", - "\u043a\u0432\u0456\u0442\u043d\u044f", - "\u0442\u0440\u0430\u0432\u043d\u044f", - "\u0447\u0435\u0440\u0432\u043d\u044f", - "\u043b\u0438\u043f\u043d\u044f", - "\u0441\u0435\u0440\u043f\u043d\u044f", - "\u0432\u0435\u0440\u0435\u0441\u043d\u044f", - "\u0436\u043e\u0432\u0442\u043d\u044f", - "\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434\u0430", - "\u0433\u0440\u0443\u0434\u043d\u044f", - "", - } - }, - { "roc.MonthNarrows", - new String[] { - "\u0421", - "\u041b", - "\u0411", - "\u041a", - "\u0422", - "\u0427", - "\u041b", - "\u0421", - "\u0412", - "\u0416", - "\u041b", - "\u0413", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java deleted file mode 100644 index 662391c46b6..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java +++ /dev/null @@ -1,307 +0,0 @@ -/* - * 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 - * 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_vi extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterNames = { - "Qu\u00fd 1", - "Qu\u00fd 2", - "Qu\u00fd 3", - "Qu\u00fd 4", - }; - - final String[] sharedAmPmMarkers = { - "SA", - "CH", - }; - - final String[] sharedDayAbbreviations = { - "CN", - "Th 2", - "Th 3", - "Th 4", - "Th 5", - "Th 6", - "Th 7", - }; - - final String[] sharedDayNames = { - "Ch\u1ee7 Nh\u1eadt", - "Th\u1ee9 Hai", - "Th\u1ee9 Ba", - "Th\u1ee9 T\u01b0", - "Th\u1ee9 N\u0103m", - "Th\u1ee9 S\u00e1u", - "Th\u1ee9 B\u1ea3y", - }; - - final String[] sharedDayNarrows = { - "CN", - "T2", - "T3", - "T4", - "T5", - "T6", - "T7", - }; - - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedNarrowAmPmMarkers = { - "s", - "c", - }; - - final String[] sharedJavaTimeDatePatterns = { - "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G", - "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G", - "dd-MM-y G", - "dd/MM/y GGGGG", - }; - - final String[] sharedJavaTimeLongEras = { - "tr. CN", - "sau CN", - }; - - final String[] sharedEras = { - "Tr\u01b0\u1edbc R.O.C", - "R.O.C.", - }; - - return new Object[][] { - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "L\u1ecbch Ph\u1eadt Gi\u00e1o" }, - { "calendarname.gregorian", - "L\u1ecbch Gregory" }, - { "calendarname.gregory", - "L\u1ecbch Gregory" }, - { "calendarname.islamic", - "L\u1ecbch H\u1ed3i Gi\u00e1o" }, - { "calendarname.islamic-civil", - "L\u1ecbch Islamic-Civil" }, - { "calendarname.islamic-umalqura", - "L\u1ecbch H\u1ed3i Gi\u00e1o - Umm al-Qura" }, - { "calendarname.japanese", - "L\u1ecbch Nh\u1eadt B\u1ea3n" }, - { "calendarname.roc", - "L\u1ecbch Trung Hoa D\u00e2n Qu\u1ed1c" }, - { "field.dayperiod", - "SA/CH" }, - { "field.era", - "Th\u1eddi \u0111\u1ea1i" }, - { "field.hour", - "Gi\u1edd" }, - { "field.minute", - "Ph\u00fat" }, - { "field.month", - "Th\u00e1ng" }, - { "field.second", - "Gi\u00e2y" }, - { "field.week", - "Tu\u1ea7n" }, - { "field.weekday", - "Ng\u00e0y trong tu\u1ea7n" }, - { "field.year", - "N\u0103m" }, - { "field.zone", - "M\u00fai gi\u1edd" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "EEEE, 'ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y GGGG", - "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG", - "dd-MM-y GGGG", - "dd/MM/y G", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "BE", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE, 'ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y G", - "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G", - "dd-MM-y G", - "dd/MM/y GGGGG", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G", - "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G", - "dd-MM-y G", - "dd/MM/y G", - } - }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG", - "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG", - "dd-MM-y GGGG", - "dd/MM/y G", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedEras }, - { "roc.MonthAbbreviations", - new String[] { - "thg 1", - "thg 2", - "thg 3", - "thg 4", - "thg 5", - "thg 6", - "thg 7", - "thg 8", - "thg 9", - "thg 10", - "thg 11", - "thg 12", - "", - } - }, - { "roc.MonthNames", - new String[] { - "th\u00e1ng 1", - "th\u00e1ng 2", - "th\u00e1ng 3", - "th\u00e1ng 4", - "th\u00e1ng 5", - "th\u00e1ng 6", - "th\u00e1ng 7", - "th\u00e1ng 8", - "th\u00e1ng 9", - "th\u00e1ng 10", - "th\u00e1ng 11", - "th\u00e1ng 12", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedEras }, - { "roc.narrow.AmPmMarkers", - sharedNarrowAmPmMarkers }, - { "roc.narrow.Eras", - sharedEras }, - { "roc.short.Eras", - sharedEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java deleted file mode 100644 index bb48d83b563..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java +++ /dev/null @@ -1,353 +0,0 @@ -/* - * 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 - * 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_zh extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1\u5b63\u5ea6", - "2\u5b63\u5ea6", - "3\u5b63\u5ea6", - "4\u5b63\u5ea6", - }; - - final String[] sharedQuarterNames = { - "\u7b2c\u4e00\u5b63\u5ea6", - "\u7b2c\u4e8c\u5b63\u5ea6", - "\u7b2c\u4e09\u5b63\u5ea6", - "\u7b2c\u56db\u5b63\u5ea6", - }; - - final String[] sharedAmPmMarkers = { - "\u4e0a\u5348", - "\u4e0b\u5348", - }; - - final String[] sharedDayAbbreviations = { - "\u5468\u65e5", - "\u5468\u4e00", - "\u5468\u4e8c", - "\u5468\u4e09", - "\u5468\u56db", - "\u5468\u4e94", - "\u5468\u516d", - }; - - final String[] sharedDayNames = { - "\u661f\u671f\u65e5", - "\u661f\u671f\u4e00", - "\u661f\u671f\u4e8c", - "\u661f\u671f\u4e09", - "\u661f\u671f\u56db", - "\u661f\u671f\u4e94", - "\u661f\u671f\u516d", - }; - - final String[] sharedDayNarrows = { - "\u65e5", - "\u4e00", - "\u4e8c", - "\u4e09", - "\u56db", - "\u4e94", - "\u516d", - }; - - final String[] sharedEras = { - "", - "\u4f0a\u65af\u5170\u5386", - }; - - final String[] sharedMonthAbbreviations = { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - "", - }; - - final String[] sharedMonthNames = { - "\u4e00\u6708", - "\u4e8c\u6708", - "\u4e09\u6708", - "\u56db\u6708", - "\u4e94\u6708", - "\u516d\u6708", - "\u4e03\u6708", - "\u516b\u6708", - "\u4e5d\u6708", - "\u5341\u6708", - "\u5341\u4e00\u6708", - "\u5341\u4e8c\u6708", - "", - }; - - final String[] sharedTimePatterns = { - "zzzz ah:mm:ss", - "z ah:mm:ss", - "ah:mm:ss", - "ah:mm", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\u4f5b\u5386", - }; - - final String[] sharedJavaTimeShortEras = { - "\u516c\u5143", - "\u660e\u6cbb", - "\u5927\u6b63", - "\u662d\u548c", - "\u5e73\u6210", - "\u4ee4\u548c", - }; - - final String[] sharedJavaTimeShortEras2 = { - "\u516c\u5143\u524d", - "\u516c\u5143", - }; - - final String[] sharedShortEras = { - "\u6c11\u56fd\u524d", - "\u6c11\u56fd", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u4f5b\u6559\u65e5\u5386" }, - { "calendarname.gregorian", - "\u516c\u5386" }, - { "calendarname.gregory", - "\u516c\u5386" }, - { "calendarname.islamic", - "\u4f0a\u65af\u5170\u65e5\u5386" }, - { "calendarname.islamic-civil", - "\u4f0a\u65af\u5170\u5e0c\u5409\u6765\u65e5\u5386" }, - { "calendarname.japanese", - "\u65e5\u672c\u65e5\u5386" }, - { "calendarname.roc", - "\u6c11\u56fd\u65e5\u5386" }, - { "field.dayperiod", - "\u4e0a\u5348/\u4e0b\u5348" }, - { "field.era", - "\u7eaa\u5143" }, - { "field.hour", - "\u5c0f\u65f6" }, - { "field.minute", - "\u5206\u949f" }, - { "field.month", - "\u6708" }, - { "field.second", - "\u79d2\u949f" }, - { "field.week", - "\u5468" }, - { "field.weekday", - "\u5de5\u4f5c\u65e5" }, - { "field.year", - "\u5e74" }, - { "field.zone", - "\u65f6\u533a" }, - { "islamic.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/M/d", - } - }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.DayNames", - sharedDayNames }, - { "islamic.DayNarrows", - sharedDayNarrows }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - sharedMonthAbbreviations }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gy-M-d", - } - }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.islamic.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gy/M/d", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gyy-MM-dd", - } - }, - { "java.time.japanese.long.Eras", - sharedJavaTimeShortEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeShortEras }, - { "java.time.long.Eras", - sharedJavaTimeShortEras2 }, - { "java.time.roc.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gyy/M/d", - } - }, - { "java.time.short.Eras", - sharedJavaTimeShortEras2 }, - { "roc.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGyy/M/d", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.DayNames", - sharedDayNames }, - { "roc.DayNarrows", - sharedDayNarrows }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthAbbreviations", - sharedMonthAbbreviations }, - { "roc.MonthNames", - sharedMonthNames }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.abbreviated.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.AmPmMarkers", - sharedAmPmMarkers }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java deleted file mode 100644 index ad2d99c33be..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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_zh_HK extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "Q1", - "Q2", - "Q3", - "Q4", - }; - - final String[] sharedJavaTimeDatePatterns = { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gy/M/d", - }; - - final String[] sharedJavaTimeLongEras = { - "\u516c\u5143\u524d", - "\u516c\u5143", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "field.week", - "\u661f\u671f" }, - { "field.weekday", - "\u661f\u671f\u5e7e" }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.short.Eras", - sharedJavaTimeLongEras }, - { "roc.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/M/d", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java deleted file mode 100644 index 79e253ddbef..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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_zh_SG extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedDatePatterns = { - "GGGGy\u5e74M\u6708d\u65e5EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGd/M/yy", - }; - - final String[] sharedJavaTimeDatePatterns = { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gd/M/yy", - }; - - return new Object[][] { - { "islamic.DatePatterns", - sharedDatePatterns }, - { "java.time.buddhist.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.islamic.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.japanese.DatePatterns", - sharedJavaTimeDatePatterns }, - { "java.time.roc.DatePatterns", - sharedJavaTimeDatePatterns }, - { "roc.DatePatterns", - sharedDatePatterns }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java deleted file mode 100644 index 00bb73bf623..00000000000 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * 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 - * 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_zh_TW extends OpenListResourceBundle { - @Override - protected final Object[][] getContents() { - final String[] sharedQuarterAbbreviations = { - "1\u5b63", - "2\u5b63", - "3\u5b63", - "4\u5b63", - }; - - final String[] sharedQuarterNames = { - "\u7b2c1\u5b63", - "\u7b2c2\u5b63", - "\u7b2c3\u5b63", - "\u7b2c4\u5b63", - }; - - final String[] sharedDayAbbreviations = { - "\u9031\u65e5", - "\u9031\u4e00", - "\u9031\u4e8c", - "\u9031\u4e09", - "\u9031\u56db", - "\u9031\u4e94", - "\u9031\u516d", - }; - - final String[] sharedEras = { - "", - "\u4f0a\u65af\u862d\u66c6", - }; - - final String[] sharedMonthNames = { - "\u7a46\u54c8\u862d\u59c6\u6708", - "\u8272\u6cd5\u723e\u6708", - "\u8cf4\u6bd4\u6708 I", - "\u8cf4\u6bd4\u6708 II", - "\u4e3b\u99ac\u9054\u6708 I", - "\u4e3b\u99ac\u9054\u6708 II", - "\u8cf4\u54f2\u535c\u6708", - "\u820d\u723e\u90a6\u6708", - "\u8cf4\u8cb7\u4e39\u6708", - "\u9583\u74e6\u9b6f\u6708", - "\u90fd\u723e\u5580\u723e\u5fb7\u6708", - "\u90fd\u723e\u9ed1\u54f2\u6708", - "", - }; - - final String[] sharedTimePatterns = { - "ah:mm:ss [zzzz]", - "ah:mm:ss [z]", - "ah:mm:ss", - "ah:mm", - }; - - final String[] sharedJavaTimeLongEras = { - "BC", - "\u4f5b\u66c6", - }; - - final String[] sharedJavaTimeShortEras = { - "\u897f\u5143", - "\u660e\u6cbb", - "\u5927\u6b63", - "\u662d\u548c", - "\u5e73\u6210", - "\u4ee4\u548c", - }; - - final String[] sharedJavaTimeShortEras2 = { - "\u897f\u5143\u524d", - "\u897f\u5143", - }; - - final String[] sharedShortEras = { - "\u6c11\u570b\u524d", - "\u6c11\u570b", - }; - - return new Object[][] { - { "QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "QuarterNames", - sharedQuarterNames }, - { "calendarname.buddhist", - "\u4f5b\u66c6" }, - { "calendarname.gregorian", - "\u516c\u66c6" }, - { "calendarname.gregory", - "\u516c\u66c6" }, - { "calendarname.islamic", - "\u4f0a\u65af\u862d\u66c6" }, - { "calendarname.islamic-civil", - "\u4f0a\u65af\u862d\u6c11\u7528\u66c6" }, - { "calendarname.islamic-umalqura", - "\u70cf\u59c6\u5eab\u62c9\u66c6" }, - { "calendarname.japanese", - "\u65e5\u672c\u66c6" }, - { "calendarname.roc", - "\u6c11\u570b\u66c6" }, - { "field.era", - "\u5e74\u4ee3" }, - { "field.hour", - "\u5c0f\u6642" }, - { "field.minute", - "\u5206\u9418" }, - { "field.second", - "\u79d2" }, - { "field.week", - "\u9031" }, - { "field.weekday", - "\u9031\u5929" }, - { "field.zone", - "\u6642\u5340" }, - { "islamic.DayAbbreviations", - sharedDayAbbreviations }, - { "islamic.Eras", - sharedEras }, - { "islamic.MonthAbbreviations", - sharedMonthNames }, - { "islamic.MonthNames", - sharedMonthNames }, - { "islamic.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "islamic.QuarterNames", - sharedQuarterNames }, - { "islamic.TimePatterns", - sharedTimePatterns }, - { "islamic.long.Eras", - sharedEras }, - { "islamic.narrow.Eras", - sharedEras }, - { "islamic.short.Eras", - sharedEras }, - { "java.time.buddhist.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gy/M/d", - } - }, - { "java.time.buddhist.long.Eras", - sharedJavaTimeLongEras }, - { "java.time.buddhist.short.Eras", - sharedJavaTimeLongEras }, - { "java.time.japanese.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy/M/d", - "Gy/M/d", - } - }, - { "java.time.japanese.long.Eras", - sharedJavaTimeShortEras }, - { "java.time.japanese.short.Eras", - sharedJavaTimeShortEras }, - { "java.time.long.Eras", - sharedJavaTimeShortEras2 }, - { "java.time.roc.DatePatterns", - new String[] { - "Gy\u5e74M\u6708d\u65e5 EEEE", - "Gy\u5e74M\u6708d\u65e5", - "Gy\u5e74M\u6708d\u65e5", - "Gy/M/d", - } - }, - { "java.time.short.Eras", - sharedJavaTimeShortEras2 }, - { "roc.DatePatterns", - new String[] { - "GGGGy\u5e74M\u6708d\u65e5 EEEE", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy\u5e74M\u6708d\u65e5", - "GGGGy/M/d", - } - }, - { "roc.DayAbbreviations", - sharedDayAbbreviations }, - { "roc.Eras", - sharedShortEras }, - { "roc.MonthNames", - new String[] { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - "", - } - }, - { "roc.QuarterAbbreviations", - sharedQuarterAbbreviations }, - { "roc.QuarterNames", - sharedQuarterNames }, - { "roc.TimePatterns", - sharedTimePatterns }, - { "roc.long.Eras", - sharedShortEras }, - { "roc.narrow.Eras", - sharedShortEras }, - { "roc.short.Eras", - sharedShortEras }, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties deleted file mode 100644 index d4d3468ed03..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=7 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties deleted file mode 100644 index 0e4542ce6d9..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties deleted file mode 100644 index f7cf7e3a6c1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties deleted file mode 100644 index 6f4b1fa4695..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties deleted file mode 100644 index 01d97226b30..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -firstDayOfWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties deleted file mode 100644 index 6d7df92f9e5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=1 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_he.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_he.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_he.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties deleted file mode 100644 index 4040553fafd..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -firstDayOfWeek=2 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_id_ID.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_id_ID.properties deleted file mode 100644 index 7f5c400dca5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_id_ID.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -firstDayOfWeek=2 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties deleted file mode 100644 index 9849f42b84a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties deleted file mode 100644 index 7f5c400dca5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -firstDayOfWeek=2 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties deleted file mode 100644 index f7cf7e3a6c1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties deleted file mode 100644 index 9ef9b6100a8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties deleted file mode 100644 index 6f4b1fa4695..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties deleted file mode 100644 index ea543b258e8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties +++ /dev/null @@ -1,40 +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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=1 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties deleted file mode 100644 index 54b8449a943..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties deleted file mode 100644 index 6f4b1fa4695..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties deleted file mode 100644 index 4d5f29bdcb8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 - diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties deleted file mode 100644 index a758c00e2ca..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties deleted file mode 100644 index 7f5c400dca5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -firstDayOfWeek=2 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties deleted file mode 100644 index 14180a9a265..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties deleted file mode 100644 index 14180a9a265..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties deleted file mode 100644 index 14180a9a265..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties deleted file mode 100644 index f1322141930..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=4 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties deleted file mode 100644 index 6f4b1fa4695..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties deleted file mode 100644 index 6f4b1fa4695..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -firstDayOfWeek=2 -minimalDaysInFirstWeek=1 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties deleted file mode 100644 index ca2ae0f185f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# This bundle is empty because the data of the base bundle -# is adequate for this locale. -# The bundle is necessary to prevent the resource -# bundle lookup from falling back to the default -# locale. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties deleted file mode 100644 index b9eb4416bf9..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -AED=د.إ.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties deleted file mode 100644 index 85f9b230116..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -BHD=د.ب.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties deleted file mode 100644 index 6cbff925fe9..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -DZD=د.ج.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties deleted file mode 100644 index 5bc7432420a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EGP=ج.م.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties deleted file mode 100644 index 7f789f73948..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -IQD=د.ع.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties deleted file mode 100644 index a4892b421e5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -JOD=د.أ.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties deleted file mode 100644 index 90822d5c14a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -KWD=د.ك.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties deleted file mode 100644 index 63d9c8c7778..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -LBP=ل.ل.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties deleted file mode 100644 index 3a688fe0a54..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -LYD=د.ل.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties deleted file mode 100644 index 1cbd3a09e0c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -MAD=د.م.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties deleted file mode 100644 index 2ad8f771ae8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -OMR=ر.ع.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties deleted file mode 100644 index e23b805cd1a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -QAR=ر.ق.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties deleted file mode 100644 index e01772cb904..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -SAR=ر.س.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties deleted file mode 100644 index a4579035f61..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -SDG=ج.س.‏ -SDD=د.س.‏ - diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties deleted file mode 100644 index 3e3801fec84..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -SYP=ل.س.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties deleted file mode 100644 index 75405e4d612..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -TND=د.ت.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties deleted file mode 100644 index 44a08d5204d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -YER=ر.ي.‏ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties deleted file mode 100644 index b74c0df0397..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -BYN=Руб -BYR=Руб diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties deleted file mode 100644 index 14a755a7f6b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -BGN=лв. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties deleted file mode 100644 index f28d2994346..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -ESP=Pts diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties deleted file mode 100644 index e336ca32ed4..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CZK=Kč diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties deleted file mode 100644 index 711095f4327..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -DKK=kr diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties deleted file mode 100644 index 382d075b222..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties +++ /dev/null @@ -1,285 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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. - -adp=Andorranische Pesete -aed=VAE-Dirham -afa=Afghani (1927-2002) -afn=Afghani -all=Albanischer Lek -amd=Armenischer Dram -ang=Gulden (Niederländische Antillen) -aoa=Kwanza (Angola) -ars=Argentinischer Peso -ats=Österreichischer Schilling -aud=Australische Dollar -awg=Aruba Florin -azm=Aserbaidschainischer Manat (1993-2006) -azn=Aserbaidschainischer Manat -bam=Konvertible Mark (Bosnien und Herzegowina) -bbd=Dollar (Barbados) -bdt=Bangladeschischer Taka -bef=Belgischer Franc -bgl=Bulgarischer Lew -bgn=Bulgarischer Lew -bhd=Bahrain-Dinar -bif=Burundi-Franc -bmd=Bermuda-Dollar -bnd=Brunei-Dollar -bob=Bolivianischer Boliviano -bov=Bolivianischer Mvdol -brl=Brasilianischer Real -bsd=Bahama-Dollar -btn=Ngultrum (Bhutan) -bwp=Botswanischer Pula -byb=Weißrussischer Rubel (1994-1999) -byn=Weißrussischer Rubel -byr=Weißrussischer Rubel (2000-2016) -bzd=Belize-Dollar -cad=Kanadischer Dollar -cdf=Kongo-Franc -chf=Schweizer Franken -clf=Chilenische Unidad de Fomento (UF) -clp=Chilenischer Peso -cny=Chinesischer Yuan -cop=Kolumbianischer Peso -crc=Costa-Rica-Colón -csd=Serbischer Dinar (2002-2006) -cuc=Kubanischer konvertibler Peso -cup=Kubanischer Peso -cve=Kap-Verde-Escudo -cyp=Zypern-Pfund -czk=Tschechische Krone -dem=Deutsche Mark -djf=Dschibuti-Franc -dkk=Dänische Krone -dop=Dominikanischer Peso -dzd=Algerischer Dinar -eek=Estnische Krone -egp=Ägyptisches Pfund -ern=Eritreischer Nakfa -esp=Spanische Pesete -etb=Äthiopischer Birr -eur=Euro -fim=Finnische Mark -fjd=Fidschi-Dollar -fkp=Falklandinseln-Pfund -frf=Französischer Franc -gbp=Britisches Pfund -gel=Georgische Lari -ghc=Ghanaischer Cedi (1979-2007) -ghs=Ghanaischer Cedi -gip=Gibraltar-Pfund -gmd=Gambischer Dalasi -gnf=Guinea-Franc -grd=Griechische Drachme -gtq=Guatemaltekischer Quetzal -gwp=Guinea-Bissau-Peso -gyd=Guyana-Dollar -hkd=Hongkong-Dollar -hnl=Honduranische Lempira -hrk=Kuna -htg=Haitianische Gourde -huf=Ungarischer Forint -idr=Indonesische Rupiah -iep=Irisches Pfund -ils=Neuer israelischer Schekel -inr=Indische Rupie -iqd=Irakischer Dinar -irr=Iranischer Rial -isk=Isländische Krone -itl=Italienische Lire -jmd=Jamaikanischer Dollar -jod=Jordanischer Dinar -jpy=Japanischer Yen -kes=Kenianischer Schilling -kgs=Kirgisischer Som -khr=Kambodschanischer Riel -kmf=Komoren-Franc -kpw=Nordkoreanischer Won -krw=Südkoreanischer Won -kwd=Kuwaitischer Dinar -kyd=Kaiman-Dollar -kzt=Kasachischer Tenge -lak=Laotischer Kip -lbp=Libanesisches Pfund -lkr=Sri-Lanka-Rupie -lrd=Liberianischer Dollar -lsl=Lesothischer Loti -ltl=Litauische Litas -luf=Luxemburgischer Franc -lvl=Lettische Lats -lyd=Libyscher Dinar -mad=Marokkanischer Dirham -mdl=Moldova-Leu -mga=Madagaskar-Ariary -mgf=Madagaskar-Franc -mkd=Mazedonischer Denar -mmk=Myanmar-Kyat -mnt=Mongolischer Tugrik -mop=Macau-Pataca -mro=Mauretanische Ouguiya -mru=Mauretanische Ouguiya -mtl=Maltesische Lire -mur=Mauritius-Rupie -mvr=Rufiyaa (Malediven) -mwk=Malawi-Kwacha -mxn=Mexikanischer Peso -mxv=Unidad De Inversion (Mexiko) -myr=Malaysischer Ringgit -mzm=Mosambikanischer Metical (1980-2006) -mzn=Mosambikanischer Metical -nad=Namibischer Dollar -ngn=Nigerianische Naira -nio=Córdoba Oro -nlg=Niederländischer Gulden -nok=Norwegische Krone -npr=Nepalesische Rupie -nzd=Neuseeländischer Dollar -omr=Omani-Rial -pab=Panamaischer Balboa -pen=Peruanischer Sol -pgk=Kina (Papua-Neuguinea) -php=Philippinischer Peso -pkr=Pakistanische Rupie -pln=Polnischer Zloty -pte=Portuguiesischer Escudo -pyg=Paraguayischer Guarani -qar=Katar-Riyal -rol=Rumänischer Leu (1952-2006) -ron=Rumänischer Leu -rsd=Serbischer Dinar -rub=Russischer Rubel -rur=Russischer Rubel (1991-1998) -rwf=Ruanda-Franc -sar=Saudischer Rial -sbd=Salomonen-Dollar -scr=Seychellen-Rupie -sdd=Sudanesischer Dinar (1992-2007) -sdg=Sudanesisches Pfund -sek=Schwedische Krone -sgd=Singapur-Dollar -shp=St. Helena-Pfund -sit=Slowenischer Tolar -skk=Slowakische Krone -sle=Sierra-leonischer Leone -sll=Sierra-leonischer Leone -sos=Somalischer Schilling -srd=Suriname-Dollar -srg=Suriname-Gulden -ssp=Südsudanesisches Pfund -std=Dobra (São Tomé und Príncipe) -stn=Dobra (São Tomé und Príncipe) -svc=El-Salvador-Colón -syp=Syrisches Pfund -szl=Lilangeni (Swasiland) -thb=Thailändischer Baht -tjs=Somoni (Tadschikistan) -tmm=Turkmenistan-Manat (1993-2009) -tmt=Turkmenistan-Manat -tnd=Tunesischer Dinar -top=Pa'anga (Tonga) -tpe=Escudo (Portugiesisch-Timor) -trl=Türkische Lira (1922-2005) -try=Türkische Lira -ttd=Trinidad/Tobago-Dollar -twd=Neu-Taiwan Dollar -tzs=Tansania-Schilling -uah=Ukrainische Hrywnja -ugx=Uganda-Schilling -usd=US-Dollar -usn=US-Dollar (nächster Tag) -uss=US-Dollar (gleicher Tag) -uyu=Peso -uzs=Usbekistan-Sum -veb=Venezolanischer Bolívar (1871-2008) -ved=Venezolanischer Bolívar -vef=Venezolanischer Bolívar Fuerte -ves=Venezolanischer Bolívar -vnd=Vietnamesischer Dong -vuv=Vanuatu-Vatu -wst=Samoanischer Tala -xaf=CFA-Franc BEAC -xag=Silber -xau=Gold -xba=European Composite Unit -xbb=European Monetary Unit -xbc=Europäische Rechnungseinheit (XBC) -xbd=Europäische Rechnungseinheit (XBD) -xcd=Dollar, Ostkaribik -xdr=Sonderziehungsrechte -xfo=Französischer Goldfranken -xfu=Französischer UIC-Franc -xof=CFA-Franc BCEAO -xpd=Palladium -xpf=CFP-Franc -xpt=Platin -xsu=Sucre -xts=Testwährungscode -xua=ADB Unit of Account -xxx=Unbekannte Währung -yer=Jemen-Rial -yum=Neuer jugoslawischer Dinar (1994-2002) -zar=Südafrikanischer Rand -zmk=Sambischer Kwacha -zwd=Simbabwe-Dollar (1980-2008) -zwl=Simbabwe-Dollar (2009) -zwr=Simbabwe-Dollar (2008) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties deleted file mode 100644 index 678e62c5136..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -ATS=öS diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties deleted file mode 100644 index 47fa9eb8579..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CHF=SFr. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties deleted file mode 100644 index 5bd79dfb9b0..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -DEM=DM diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties deleted file mode 100644 index 45bc48db0eb..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -LUF=F diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties deleted file mode 100644 index 14b7419daf6..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -CYP=£ -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties deleted file mode 100644 index 51c5a5c19a4..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -GRD=δρχ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties deleted file mode 100644 index a307b52f167..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -AUD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties deleted file mode 100644 index 1bb687cc801..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CAD=$ -USD=US$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties deleted file mode 100644 index 7d54eef1d20..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -GBP=£ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties deleted file mode 100644 index 09f53561af3..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -IEP=IR£ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties deleted file mode 100644 index b52c2cc9e34..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -INR=Rs. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties deleted file mode 100644 index 5c14061e65c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -MTL=Lm -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties deleted file mode 100644 index 835c4163274..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -NZD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties deleted file mode 100644 index 1f7bf65bfc1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -PHP=Php diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties deleted file mode 100644 index 74feebaab6e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -SGD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties deleted file mode 100644 index af33382999e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ZAR=R diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties deleted file mode 100644 index 77fe00691cc..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties +++ /dev/null @@ -1,278 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=peseta andorrana -aed=dírham de los Emiratos Árabes Unidos -afa=afgani (1927–2002) -afn=afgani -all=lek -amd=dram -ang=florín antillano -aoa=kuanza -ars=peso argentino -ats=chelín austriaco -aud=dólar australiano -awg=florín arubeño -azm=manat azerí (1993–2006) -azn=manat azerbaiyano -bam=marco convertible de Bosnia y Herzegovina -bbd=dólar barbadense -bdt=taka -bef=franco belga -bgl=lev fuerte búlgaro -bgn=leva búlgara -bhd=dinar bareiní -bif=franco burundés -bmd=dólar bermudeño -bnd=dólar bruneano -bob=boliviano -bov=MVDOL boliviano -brl=real brasileño -bsd=dólar bahameño -btn=gultrum -bwp=pula -byb=nuevo rublo bielorruso (1994–1999) -byr=rublo bielorruso (2000–2016) -bzd=dólar beliceño -cad=dólar canadiense -cdf=franco congoleño -chf=franco suizo -clf=unidad de fomento chilena -clp=peso chileno -cny=yuan -cop=peso colombiano -crc=colón costarricense -csd=antiguo dinar serbio -cuc=peso cubano convertible -cup=peso cubano -cve=escudo de Cabo Verde -cyp=libra chipriota -czk=corona checa -dem=marco alemán -djf=franco yibutiano -dkk=corona danesa -dop=peso dominicano -dzd=dinar argelino -eek=corona estonia -egp=libra egipcia -ern=nakfa -esp=peseta española -etb=bir -eur=euro -fim=marco finlandés -fjd=dólar fiyiano -fkp=libra malvinense -frf=franco francés -gbp=libra esterlina -gel=lari -ghc=cedi ghanés (1979–2007) -ghs=cedi -gip=libra gibraltareña -gmd=dalasi -gnf=franco guineano -grd=dracma griego -gtq=quetzal guatemalteco -gwp=peso de Guinea-Bissáu -gyd=dólar guyanés -hkd=dólar hongkonés -hnl=lempira hondureño -hrk=kuna -htg=gurde haitiano -huf=forinto húngaro -idr=rupia indonesia -iep=libra irlandesa -ils=nuevo séquel israelí -inr=rupia india -iqd=dinar iraquí -irr=rial iraní -isk=corona islandesa -itl=lira italiana -jmd=dólar jamaicano -jod=dinar jordano -jpy=yen -kes=chelín keniano -kgs=som -khr=riel -kmf=franco comorense -kpw=won norcoreano -krw=won surcoreano -kwd=dinar kuwaití -kyd=dólar de las Islas Caimán -kzt=tengue kazajo -lak=kip -lbp=libra libanesa -lkr=rupia esrilanquesa -lrd=dólar liberiano -lsl=loti lesotense -ltl=litas lituano -luf=franco luxemburgués -lvl=lats letón -lyd=dinar libio -mad=dírham marroquí -mdl=leu moldavo -mga=ariari -mgf=franco malgache -mkd=dinar macedonio -mmk=kiat -mnt=tugrik -mop=pataca de Macao -mro=uguiya (1973–2017) -mtl=lira maltesa -mur=rupia mauriciana -mvr=rufiya -mwk=kuacha malauí -mxn=peso mexicano -mxv=unidad de inversión (UDI) mexicana -myr=ringit -mzm=antiguo metical mozambiqueño -mzn=metical -nad=dólar namibio -ngn=naira -nio=córdoba oro -nlg=florín neerlandés -nok=corona noruega -npr=rupia nepalí -nzd=dólar neozelandés -omr=rial omaní -pab=balboa panameño -pen=sol peruano -pgk=kina -php=peso filipino -pkr=rupia pakistaní -pln=esloti -pte=escudo portugués -pyg=guaraní paraguayo -qar=rial catarí -rol=antiguo leu rumano -ron=leu rumano -rsd=dinar serbio -rub=rublo ruso -rur=rublo ruso (1991–1998) -rwf=franco ruandés -sar=rial saudí -sbd=dólar salomonense -scr=rupia seychellense -sdd=dinar sudanés -sdg=libra sudanesa -sek=corona sueca -sgd=dólar singapurense -shp=libra de Santa Elena -sit=tólar esloveno -skk=corona eslovaca -sll=leona -sos=chelín somalí -srd=dólar surinamés -srg=florín surinamés -std=dobra (1977–2017) -svc=colón salvadoreño -syp=libra siria -szl=lilangeni -thb=bat -tjs=somoni tayiko -tmm=manat turcomano (1993–2009) -tmt=manat turcomano -tnd=dinar tunecino -top=paanga -tpe=escudo timorense -trl=lira turca (1922–2005) -try=lira turca -ttd=dólar de Trinidad y Tobago -twd=nuevo dólar taiwanés -tzs=chelín tanzano -uah=grivna -ugx=chelín ugandés -usd=dólar estadounidense -usn=dólar estadounidense (día siguiente) -uss=dólar estadounidense (mismo día) -uyu=peso uruguayo -uzs=sum -veb=bolívar venezolano (1871–2008) -vef=bolívar venezolano (2008–2018) -vnd=dong -vuv=vatu -wst=tala -xaf=franco CFA de África Central -xag=plata -xau=oro -xba=unidad compuesta europea -xbb=unidad monetaria europea -xbc=unidad de cuenta europea (XBC) -xbd=unidad de cuenta europea (XBD) -xcd=dólar del Caribe Oriental -xdr=derechos especiales de giro -xfo=franco oro francés -xfu=franco UIC francés -xof=franco CFA de África Occidental -xpd=paladio -xpf=franco CFP -xpt=platino -xts=código reservado para pruebas -xxx=moneda desconocida -yer=rial yemení -yum=super dinar yugoslavo -zar=rand -zmk=kwacha zambiano (1968–2012) -zwd=dólar de Zimbabue -zwl=dólar zimbabuense diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties deleted file mode 100644 index 9005e8cc124..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ARS=$ -USD=US$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties deleted file mode 100644 index 5f12c178641..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -BOB=B$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties deleted file mode 100644 index cfa116a6d08..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CLP=Ch$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties deleted file mode 100644 index 0a10d0b7899..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -COP=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties deleted file mode 100644 index 6100c1b8a7b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CRC=C diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties deleted file mode 100644 index 69a366adb65..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (c) 2011, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -CUP=CU$ -CUC=CUC$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties deleted file mode 100644 index e27c3c1519e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -DOP=RD$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties deleted file mode 100644 index 009773ad3df..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -USD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties deleted file mode 100644 index f28d2994346..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -ESP=Pts diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties deleted file mode 100644 index d5101713cfc..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -GTQ=Q diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties deleted file mode 100644 index 153d4bc2d6c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -HNL=L diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties deleted file mode 100644 index dd8975d487f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -MXN=$ -USD=US$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties deleted file mode 100644 index 3805fe66098..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -NIO=$C diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties deleted file mode 100644 index 24dbfdd07c4..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -PAB=B diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties deleted file mode 100644 index 12c405552d3..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -PEN=S/. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties deleted file mode 100644 index 009773ad3df..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -USD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties deleted file mode 100644 index 4b2e5801d3f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -PYG=G diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties deleted file mode 100644 index d1e839ac414..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -SVC=C diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties deleted file mode 100644 index 1e7344875f4..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -USD=US$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties deleted file mode 100644 index 251428f6fc6..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -UYU=NU$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties deleted file mode 100644 index 031b4979326..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2005, 2018, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -VEB=Bs -VEF=Bs.F. -VES=Bs.S. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties deleted file mode 100644 index 9de98942878..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -EEK=kr -eek=Eesti kroon -EUR=€ -eur=euro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties deleted file mode 100644 index 61a5103231d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -FIM=mk diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties deleted file mode 100644 index acba66e9bca..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties +++ /dev/null @@ -1,277 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=peseta andorrane -aed=dirham des Émirats arabes unis -afa=afghani (1927–2002) -afn=afghani afghan -all=lek albanais -amd=dram arménien -ang=florin antillais -aoa=kwanza angolais -ars=peso argentin -ats=schilling autrichien -aud=dollar australien -awg=florin arubais -azm=manat azéri (1993–2006) -azn=manat azéri -bam=mark convertible bosniaque -bbd=dollar barbadien -bdt=taka bangladeshi -bef=franc belge -bgl=lev bulgare (1962–1999) -bgn=lev bulgare -bhd=dinar bahreïni -bif=franc burundais -bmd=dollar bermudien -bnd=dollar brunéien -bob=boliviano bolivien -bov=mvdol bolivien -brl=réal brésilien -bsd=dollar bahaméen -btn=ngultrum bouthanais -bwp=pula botswanais -byb=nouveau rouble biélorusse (1994–1999) -byr=rouble biélorusse (2000–2016) -bzd=dollar bélizéen -cad=dollar canadien -cdf=franc congolais -chf=franc suisse -clf=unité d’investissement chilienne -clp=peso chilien -cny=yuan renminbi chinois -cop=peso colombien -crc=colón costaricain -csd=dinar serbo-monténégrin -cuc=peso cubain convertible -cup=peso cubain -cve=escudo capverdien -cyp=livre chypriote -czk=couronne tchèque -dem=mark allemand -djf=franc djiboutien -dkk=couronne danoise -dop=peso dominicain -dzd=dinar algérien -eek=couronne estonienne -egp=livre égyptienne -ern=nafka érythréen -esp=peseta espagnole -etb=birr éthiopien -eur=euro -fim=mark finlandais -fjd=dollar fidjien -fkp=livre des îles Malouines -frf=franc français -gbp=livre sterling -gel=lari géorgien -ghc=cédi -ghs=cédi ghanéen -gip=livre de Gibraltar -gmd=dalasi gambien -gnf=franc guinéen -grd=drachme grecque -gtq=quetzal guatémaltèque -gwp=peso bissau-guinéen -gyd=dollar du Guyana -hkd=dollar de Hong Kong -hnl=lempira hondurien -hrk=kuna croate -htg=gourde haïtienne -huf=forint hongrois -idr=roupie indonésienne -iep=livre irlandaise -ils=nouveau shekel israélien -inr=roupie indienne -iqd=dinar irakien -irr=riyal iranien -isk=couronne islandaise -itl=lire italienne -jmd=dollar jamaïcain -jod=dinar jordanien -jpy=yen japonais -kes=shilling kényan -kgs=som kirghize -khr=riel cambodgien -kmf=franc comorien -kpw=won nord-coréen -krw=won sud-coréen -kwd=dinar koweïtien -kyd=dollar des îles Caïmans -kzt=tenge kazakh -lak=kip loatien -lbp=livre libanaise -lkr=roupie srilankaise -lrd=dollar libérien -lsl=loti lesothan -ltl=litas lituanien -luf=franc luxembourgeois -lvl=lats letton -lyd=dinar libyen -mad=dirham marocain -mdl=leu moldave -mga=ariary malgache -mgf=franc malgache -mkd=denar macédonien -mmk=kyat myanmarais -mnt=tugrik mongol -mop=pataca macanaise -mro=ouguiya mauritanien (1973–2017) -mtl=lire maltaise -mur=roupie mauricienne -mvr=rufiyaa maldivien -mwk=kwacha malawite -mxn=peso mexicain -mxv=unité de conversion mexicaine (UDI) -myr=ringgit malais -mzm=métical -mzn=metical mozambicain -nad=dollar namibien -ngn=naira nigérian -nio=córdoba oro nicaraguayen -nlg=florin néerlandais -nok=couronne norvégienne -npr=roupie népalaise -nzd=dollar néo-zélandais -omr=riyal omanais -pab=balboa panaméen -pen=sol péruvien -pgk=kina papouan-néo-guinéen -php=peso philippin -pkr=roupie pakistanaise -pln=zloty polonais -pte=escudo portugais -pyg=guaraní paraguayen -qar=riyal qatari -rol=ancien leu roumain -ron=leu roumain -rsd=dinar serbe -rub=rouble russe -rur=rouble russe (1991–1998) -rwf=franc rwandais -sar=riyal saoudien -sbd=dollar des îles Salomon -scr=roupie des Seychelles -sdd=dinar soudanais -sdg=livre soudanaise -sek=couronne suédoise -sgd=dollar de Singapour -shp=livre de Sainte-Hélène -sit=tolar slovène -skk=couronne slovaque -sll=leone sierra-léonais -sos=shilling somalien -srd=dollar surinamais -srg=florin surinamais -std=dobra santoméen (1977–2017) -svc=colón salvadorien -syp=livre syrienne -szl=lilangeni swazi -thb=baht thaïlandais -tjs=somoni tadjik -tmm=manat turkmène -tmt=nouveau manat turkmène -tnd=dinar tunisien -top=pa’anga tongan -tpe=escudo timorais -trl=livre turque (1844–2005) -try=livre turque -ttd=dollar de Trinité-et-Tobago -twd=nouveau dollar taïwanais -tzs=shilling tanzanien -uah=hryvnia ukrainienne -ugx=shilling ougandais -usd=dollar des États-Unis -usn=dollar des Etats-Unis (jour suivant) -uss=dollar des Etats-Unis (jour même) -uyu=peso uruguayen -uzs=sum ouzbek -veb=bolivar vénézuélien (1871–2008) -vef=bolivar vénézuélien (2008–2018) -vnd=dông vietnamien -vuv=vatu vanuatuan -wst=tala samoan -xaf=franc CFA (BEAC) -xag=argent -xau=or -xba=unité européenne composée -xbb=unité monétaire européenne -xbc=unité de compte européenne (XBC) -xbd=unité de compte européenne (XBD) -xcd=dollar des Caraïbes orientales -xdr=droit de tirage spécial -xfo=franc or -xfu=franc UIC -xof=franc CFA (BCEAO) -xpd=palladium -xpf=franc CFP -xpt=platine -xts=(devise de test) -xxx=devise inconnue ou non valide -yer=riyal yéménite -yum=dinar yougoslave Noviy -zar=rand sud-africain -zmk=kwacha zambien (1968–2012) -zwd=dollar zimbabwéen diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties deleted file mode 100644 index 2756c4b3970..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -BEF=FB diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties deleted file mode 100644 index cc6d08a3aa5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CAD=$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties deleted file mode 100644 index 47fa9eb8579..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CHF=SFr. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties deleted file mode 100644 index 37ef59334e0..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -FRF=F diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties deleted file mode 100644 index 45bc48db0eb..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -LUF=F diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties deleted file mode 100644 index 770a47ce5e2..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties deleted file mode 100644 index ddc6e578314..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ILS=ש\"ח diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties deleted file mode 100644 index fa3755e45b9..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -INR=रू diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties deleted file mode 100644 index a9d887d4af3..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2023, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -HRK=Kn diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties deleted file mode 100644 index 1787bb2366e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -HUF=Ft diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_id_ID.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_id_ID.properties deleted file mode 100644 index 92f36cf4cc1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_id_ID.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -IDR=Rp diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties deleted file mode 100644 index 3fc34ebd059..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ISK=kr. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties deleted file mode 100644 index 13595c13707..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties +++ /dev/null @@ -1,270 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=peseta andorrana -aed=dirham degli Emirati Arabi Uniti -afa=afgani (1927–2002) -afn=afghani -all=lek albanese -amd=dram armeno -ang=fiorino delle Antille olandesi -aoa=kwanza angolano -ars=peso argentino -ats=scellino austriaco -aud=dollaro australiano -awg=fiorino di Aruba -azm=manat azero (1993–2006) -azn=manat azero -bam=marco convertibile della Bosnia-Herzegovina -bbd=dollaro di Barbados -bdt=taka bangladese -bef=franco belga -bgl=lev bulgaro (1962–1999) -bgn=lev bulgaro -bhd=dinaro del Bahrein -bif=franco del Burundi -bmd=dollaro delle Bermuda -bnd=dollaro del Brunei -bob=boliviano -bov=mvdol boliviano -brl=real brasiliano -bsd=dollaro delle Bahamas -btn=ngultrum bhutanese -bwp=pula del Botswana -byb=nuovo rublo bielorusso (1994–1999) -byr=rublo bielorusso (2000–2016) -bzd=dollaro del Belize -cad=dollaro canadese -cdf=franco congolese -chf=franco svizzero -clf=unidades de fomento chilene -clp=peso cileno -cny=renminbi cinese -cop=peso colombiano -crc=colón costaricano -cup=peso cubano -cve=escudo capoverdiano -cyp=sterlina cipriota -czk=corona ceca -dem=marco tedesco -djf=franco di Gibuti -dkk=corona danese -dop=peso dominicano -dzd=dinaro algerino -eek=corona dell’Estonia -egp=sterlina egiziana -ern=nakfa eritreo -esp=peseta spagnola -etb=birr etiope -fim=markka finlandese -fjd=dollaro delle Figi -fkp=sterlina delle Falkland -frf=franco francese -gbp=sterlina britannica -gel=lari georgiano -ghc=cedi del Ghana -ghs=cedi ghanese -gip=sterlina di Gibilterra -gmd=dalasi gambiano -gnf=franco della Guinea -grd=dracma greca -gtq=quetzal guatemalteco -gwp=peso della Guinea-Bissau -gyd=dollaro della Guyana -hkd=dollaro di Hong Kong -hnl=lempira honduregna -hrk=kuna croata -htg=gourde haitiano -huf=fiorino ungherese -idr=rupia indonesiana -iep=sterlina irlandese -ils=nuovo siclo israeliano -inr=rupia indiana -iqd=dinaro iracheno -irr=rial iraniano -isk=corona islandese -itl=lira italiana -jmd=dollaro giamaicano -jod=dinaro giordano -jpy=yen giapponese -kes=scellino keniota -kgs=som kirghiso -khr=riel cambogiano -kmf=franco comoriano -kpw=won nordcoreano -krw=won sudcoreano -kwd=dinaro kuwaitiano -kyd=dollaro delle Isole Cayman -kzt=tenge kazako -lak=kip laotiano -lbp=lira libanese -lkr=rupia di Sri Lanka -lrd=dollaro liberiano -lsl=loti del Lesotho -ltl=litas lituano -luf=franco del Lussemburgo -lvl=lats lettone -lyd=dinaro libico -mad=dirham marocchino -mdl=leu moldavo -mga=ariary malgascio -mgf=franco malgascio -mkd=dinaro macedone -mmk=kyat di Myanmar -mnt=tugrik mongolo -mop=pataca di Macao -mro=ouguiya della Mauritania (1973–2017) -mtl=lira maltese -mur=rupia mauriziana -mvr=rufiyaa delle Maldive -mwk=kwacha malawiano -mxn=peso messicano -mxv=unidad de inversion (UDI) messicana -myr=ringgit malese -mzn=metical mozambicano -nad=dollaro namibiano -ngn=naira nigeriana -nio=córdoba nicaraguense -nlg=fiorino olandese -nok=corona norvegese -npr=rupia nepalese -nzd=dollaro neozelandese -omr=rial omanita -pab=balboa panamense -pen=sol peruviano -pgk=kina papuana -php=peso filippino -pkr=rupia pakistana -pln=złoty polacco -pte=escudo portoghese -pyg=guaraní paraguayano -qar=rial qatariano -rol=leu della Romania -ron=leu rumeno -rsd=dinaro serbo -rub=rublo russo -rur=rublo della CSI -rwf=franco ruandese -sar=riyal saudita -sbd=dollaro delle Isole Salomone -scr=rupia delle Seychelles -sdd=dinaro sudanese -sdg=sterlina sudanese -sek=corona svedese -sgd=dollaro di Singapore -shp=sterlina di Sant’Elena -sit=tallero sloveno -skk=corona slovacca -sll=leone della Sierra Leone -sos=scellino somalo -srd=dollaro del Suriname -srg=fiorino del Suriname -std=dobra di Sao Tomé e Principe (1977–2017) -svc=colón salvadoregno -syp=lira siriana -szl=lilangeni dello Swaziland -thb=baht thailandese -tjs=somoni tagiko -tmm=manat turkmeno (1993–2009) -tnd=dinaro tunisino -top=paʻanga tongano -tpe=escudo di Timor -trl=lira turca (1922–2005) -try=lira turca -ttd=dollaro di Trinidad e Tobago -twd=nuovo dollaro taiwanese -tzs=scellino della Tanzania -uah=grivnia ucraina -ugx=scellino ugandese -usd=dollaro statunitense -usn=dollaro statunitense (next day) -uss=dollaro statunitense (same day) -uyu=peso uruguayano -uzs=sum uzbeco -veb=bolivar venezuelano (1871–2008) -vef=bolívar venezuelano (2008–2018) -vnd=dong vietnamita -vuv=vatu di Vanuatu -wst=tala samoano -xaf=franco CFA BEAC -xag=argento -xau=oro -xba=unità composita europea -xbb=unità monetaria europea -xbc=unità di acconto europea (XBC) -xbd=unità di acconto europea (XBD) -xcd=dollaro dei Caraibi orientali -xdr=diritti speciali di incasso -xfo=franco oro francese -xfu=franco UIC francese -xof=franco CFA BCEAO -xpd=palladio -xpf=franco CFP -xxx=valuta sconosciuta -yer=riyal yemenita -yum=dinaro noviy yugoslavo -zar=rand sudafricano -zmk=kwacha dello Zambia (1968–2012) -zwd=dollaro dello Zimbabwe diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties deleted file mode 100644 index 47fa9eb8579..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -CHF=SFr. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties deleted file mode 100644 index 7af1ecb52e1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -ITL=L. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties deleted file mode 100644 index b7e345de032..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties +++ /dev/null @@ -1,285 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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. - -adp=アンドラ・ペセタ -aed=アラブ首長国連邦ディルハム -afa=アフガニスタン・アフガニー(1927-2002) -afn=アフガニスタン・アフガニー -all=アルバニア・レク -amd=アルメニア・ドラム -ang=オランダ領アンティル・ギルダー -aoa=アンゴラ・クワンザ -ars=アルゼンチン・ペソ -ats=オーストリア・シリング -aud=オーストラリア・ドル -awg=アルバ・フローリン -azm=アゼルバイジャン・マナト(1993-2006) -azn=アゼルバイジャン・マナト -bam=ボスニア・ヘルツェゴビナ兌換マルク -bbd=バルバドス・ドル -bdt=バングラデシュ・タカ -bef=ベルギー・フラン -bgl=ブルガリア・ハード・レフ -bgn=ブルガリア新レフ -bhd=バーレーン・ディナール -bif=ブルンジ・フラン -bmd=バルミューダ・ドル -bnd=ブルネイ・ドル -bob=ボリビア・ボリビアーノ -bov=ボリビアMvdol -brl=ブラジル・レアル -bsd=バハマ・ドル -btn=ブータン・ニュルタム -bwp=ボツワナ・プラ -byb=ベラルーシ・ルーブル(1994-1999) -byn=ベラルーシ・ルーブル -byr=ベラルーシ・ルーブル(2000-2016) -bzd=ベリーズ・ドル -cad=カナダ・ドル -cdf=コンゴ・フラン -chf=スイス・フラン -clf=チリ計算単位(UF) -clp=チリ・ペソ -cny=中国人民元 -cop=コロンビア・ペソ -crc=コスタリカ・コロン -csd=セルビア・ディナール(2002-2006) -cuc=キューバ兌換ペソ -cup=キューバ・ペソ -cve=カーボベルデ・エスクード -cyp=キプロス・ポンド -czk=チェコ共和国コルナ -dem=ドイツ・マルク -djf=ジブチ・フラン -dkk=デンマーク・クローネ -dop=ドミニカ・ペソ -dzd=アルジェリア・ディナール -eek=エストニア・クルーン -egp=エジプト・ポンド -ern=エリトリア・ナクファ -esp=スペイン・ペセタ -etb=エチオピア・ブル -eur=ユーロ -fim=フィンランド・マルカ -fjd=フィジー・ドル -fkp=フォークランド諸島ポンド -frf=フランス・フラン -gbp=英ポンド -gel=ジョージア・ラリ -ghc=ガーナ・セディ(1979-2007) -ghs=ガーナ・セディ -gip=ジブラルタル・ポンド -gmd=ガンビア・ダラシ -gnf=ギニア・フラン -grd=ギリシャ・ドラクマ -gtq=グアテマラ・ケツァル -gwp=ギニアビサウ・ペソ -gyd=ガイアナ・ドル -hkd=香港ドル -hnl=ホンジュラス・レンピラ -hrk=クーナ -htg=ハイチ・グールド -huf=ハンガリー・フォリント -idr=インドネシア・ルピア -iep=アイルランド・ポンド -ils=イスラエル新シェケル -inr=インド・ルピー -iqd=イラク・ディナール -irr=イラン・リアル -isk=アイスランド・クローナ -itl=イタリア・リラ -jmd=ジャマイカ・ドル -jod=ヨルダン・ディナール -jpy=日本円 -kes=ケニア・シリング -kgs=キルギス・ソム -khr=カンボジア・リエル -kmf=コモロ・フラン -kpw=北朝鮮ウォン -krw=韓国ウォン -kwd=クウェート・ディナール -kyd=ケイマン諸島ドル -kzt=カザフスタン・テンゲ -lak=ラオス・キープ -lbp=レバノン・ポンド -lkr=スリランカ・ルピー -lrd=リベリア・ドル -lsl=レソト・ロティ -ltl=リトアニア・リタス -luf=ルクセンブルク・フラン -lvl=ラトビア・ラッツ -lyd=リビア・ディナール -mad=モロッコ・ディルハム -mdl=モルドバ・レイ -mga=マダガスカル・アリアリ -mgf=マダガスカル・フラン -mkd=マケドニア・デナル -mmk=ミャンマー・チャット -mnt=モンゴル・トグログ -mop=マカオ・パタカ -mro=モーリタニア・ウギア -mru=モーリタニア・ウギア -mtl=マルタ・リラ -mur=モーリシャス・ルピー -mvr=モルジブ・ルフィア -mwk=マラウィアン・マラウイ・クワチャ -mxn=メキシコ・ペソ -mxv=メキシコ投資単位 -myr=マレーシア・リンギット -mzm=モザンビーク・メティカル(1980-2006) -mzn=モザンビーク・メティカル -nad=ナミビア・ドル -ngn=ナイジェリア・ナイラ -nio=ニカラグア・コルドバ -nlg=オランダ・ギルダー -nok=ノルウェー・クローネ -npr=ネパール・ルピー -nzd=ニュージーランド・ドル -omr=オマーン・リアル -pab=パナマ・バルボア -pen=ペルー・ソル -pgk=パプアニューギニア・キナ -php=フィリピン・ペソ -pkr=パキスタン・ルピー -pln=ポーランド・ズロチ -pte=ポルトガル・エスクード -pyg=パラグアイ・グアラニー -qar=カタール・リアル -rol=ルーマニア・レイ(1952-2006) -ron=ルーマニア・レイ -rsd=セルビア・ディナール -rub=ロシア・ルーブル -rur=ロシア・ルーブル(1991-1998) -rwf=ルワンダ・フラン -sar=サウジ・リヤル -sbd=ソロモン諸島ドル -scr=モーリシャス・ルピー -sdd=スーダン・ディナール(1992-2007) -sdg=スーダン・ポンド -sek=スウェーデン・クローナ -sgd=シンガポール・ドル -shp=セントヘレナ・ポンド -sit=スロベニア・トラール -skk=スロバキア・コルナ -sle=シエラレオネ・レオン -sll=シエラレオネ・レオン -sos=ソマリア・シリング -srd=スリナム・ドル -srg=スリナム・ギルダー -ssp=南スーダン・ポンド -std=サントメ・プリンシペ・ドブラ -stn=サントメ・プリンシペ・ドブラ -svc=エルサルバドル・コロン -syp=シリア・ポンド -szl=スワジランド・リランジェニ -thb=タイ・バーツ -tjs=タジキスタン・ソモニ -tmm=トルクメニスタン・マナト(1993-2009) -tmt=トルクメニスタン・マナト -tnd=チュニジア・ディナール -top=トンガ・パ・アンガ -tpe=ティモール・エスクード -trl=トルコリラ(1922-2005) -try=トルコ・リラ -ttd=トリニダード・トバゴ・ドル -twd=新台湾ドル -tzs=タンザニア・シリング -uah=ウクライナ・グリブナ -ugx=ウガンダ・シリング -usd=USドル -usn=USドル(翌日) -uss=USドル(同日) -uyu=ウルグアイ・ペソ -uzs=ウズベキスタン・ソム -veb=ベネズエラ・ボリバル(1871-2008) -ved=ベネズエラ・ボリバル・ソベラノ -vef=ベネズエラ・ボリバル -ves=ベネズエラ・ボリバル・ソベラノ -vnd=ベトナム・ドン -vuv=バヌアツ・バツ -wst=サモア・タラ -xaf=CFAフランBEAC -xag=銀 -xau=金 -xba=欧州通貨混合単位 -xbb=欧州通貨計算単位 -xbc=欧州計算単位(XBC) -xbd=欧州計算単位(XBD) -xcd=東カリブECドル -xdr=特別引出権 -xfo=フランス金フラン -xfu=フランスUICフラン -xof=CFAフランBCEAO -xpd=パラジウム -xpf=CFPフラン -xpt=プラチナ -xsu=スクレ -xts=テスト通貨コード -xua=ADB計算単位 -xxx=不明な通貨 -yer=イエメン・リアル -yum=ユーゴスラビア新ディナール(1994-2002) -zar=南アフリカ・ランド -zmk=ザンビア・クワチャ -zwd=ジンバブエ・ドル(1980-2008) -zwl=ジンバブエ・ドル(2009) -zwr=ジンバブエ・ドル(2008) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties deleted file mode 100644 index 4b643f98254..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -JPY=￥ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties deleted file mode 100644 index 39de2c7bd7e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties +++ /dev/null @@ -1,276 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=안도라 페세타 -aed=아랍에미리트 디르함 -afa=아프가니 (1927–2002) -afn=아프가니스탄 아프가니 -all=알바니아 레크 -amd=아르메니아 드람 -ang=네덜란드령 안틸레스 길더 -aoa=앙골라 콴자 -ars=아르헨티나 페소 -ats=호주 실링 -aud=호주 달러 -awg=아루바 플로린 -azm=아제르바이젠 마나트(1993–2006) -azn=아제르바이잔 마나트 -bam=보스니아-헤르체고비나 태환 마르크 -bbd=바베이도스 달러 -bdt=방글라데시 타카 -bef=벨기에 프랑 -bgl=불가리아 동전 렛 -bgn=불가리아 레프 -bhd=바레인 디나르 -bif=부룬디 프랑 -bmd=버뮤다 달러 -bnd=부루나이 달러 -bob=볼리비아노 -bov=볼리비아노 Mvdol(기금) -brl=브라질 레알 -bsd=바하마 달러 -btn=부탄 눌투눔 -bwp=보츠와나 폴라 -byb=벨라루스 신권 루블 (1994–1999) -byr=벨라루스 루블 (2000–2016) -bzd=벨리즈 달러 -cad=캐나다 달러 -cdf=콩고 프랑 콩골라스 -chf=스위스 프랑 -clf=칠레 (UF) -clp=칠레 페소 -cny=중국 위안화 -cop=콜롬비아 페소 -crc=코스타리카 콜론 -csd=고 세르비아 디나르 -cuc=쿠바 태환 페소 -cup=쿠바 페소 -cve=카보베르데 에스쿠도 -cyp=싸이프러스 파운드 -czk=체코 공화국 코루나 -dem=독일 마르크 -djf=지부티 프랑 -dkk=덴마크 크로네 -dop=도미니카 페소 -dzd=알제리 디나르 -eek=에스토니아 크룬 -egp=이집트 파운드 -ern=에리트리아 나크파 -esp=스페인 페세타 -etb=에티오피아 비르 -eur=유로 -fim=핀란드 마르카 -fjd=피지 달러 -fkp=포클랜드제도 파운드 -frf=프랑스 프랑 -gbp=영국 파운드 -gel=조지아 라리 -ghc=가나 시디 (1979–2007) -ghs=가나 시디 -gip=지브롤터 파운드 -gmd=감비아 달라시 -gnf=기니 프랑 -grd=그리스 드라크마 -gtq=과테말라 케트살 -gwp=기네비쏘 페소 -gyd=가이아나 달러 -hkd=홍콩 달러 -hnl=온두라스 렘피라 -hrk=크로아티아 쿠나 -htg=하이티 구르드 -huf=헝가리 포린트 -idr=인도네시아 루피아 -iep=아일랜드 파운드 -ils=이스라엘 신권 세켈 -inr=인도 루피 -iqd=이라크 디나르 -irr=이란 리얄 -isk=아이슬란드 크로나 -itl=이탈리아 리라 -jmd=자메이카 달러 -jod=요르단 디나르 -jpy=일본 엔화 -kes=케냐 실링 -kgs=키르기스스탄 솜 -khr=캄보디아 리얄 -kmf=코모르 프랑 -kpw=조선 민주주의 인민 공화국 원 -krw=대한민국 원 -kwd=쿠웨이트 디나르 -kyd=케이맨 제도 달러 -kzt=카자흐스탄 텐게 -lak=라오스 키프 -lbp=레바논 파운드 -lkr=스리랑카 루피 -lrd=라이베리아 달러 -lsl=레소토 로티 -ltl=리투아니아 리타 -luf=룩셈부르크 프랑 -lvl=라트비아 라트 -lyd=리비아 디나르 -mad=모로코 디렘 -mdl=몰도바 레이 -mga=마다가스카르 아리아리 -mgf=마다가스카르 프랑 -mkd=마케도니아 디나르 -mmk=미얀마 키얏 -mnt=몽골 투그릭 -mop=마카오 파타카 -mro=모리타니 우기야 (1973–2017) -mtl=몰타 리라 -mur=모리셔스 루피 -mvr=몰디브 제도 루피아 -mwk=말라위 콰쳐 -mxn=멕시코 페소 -mxv=멕시코 (UDI) -myr=말레이시아 링깃 -mzm=고 모잠비크 메티칼 -mzn=모잠비크 메티칼 -nad=나미비아 달러 -ngn=니제르 나이라 -nio=니카라과 코르도바 오로 -nlg=네델란드 길더 -nok=노르웨이 크로네 -npr=네팔 루피 -nzd=뉴질랜드 달러 -omr=오만 리얄 -pab=파나마 발보아 -pen=페루 솔 -pgk=파푸아뉴기니 키나 -php=필리핀 페소 -pkr=파키스탄 루피 -pln=폴란드 즐로티 -pte=포르투갈 에스쿠도 -pyg=파라과이 과라니 -qar=카타르 리얄 -rol=루마니아 레이 -ron=루마니아 레우 -rsd=세르비아 디나르 -rub=러시아 루블 -rur=러시아 루블 (1991–1998) -rwf=르완다 프랑 -sar=사우디아라비아 리얄 -sbd=솔로몬 제도 달러 -scr=세이셸 루피 -sdd=수단 디나르 -sdg=수단 파운드 -sek=스웨덴 크로나 -sgd=싱가폴 달러 -shp=세인트헬레나 파운드 -sit=슬로베니아 톨라르 -skk=슬로바키아 코루나 -sll=시에라리온 리온 -sos=소말리아 실링 -srd=수리남 달러 -srg=수리남 길더 -std=상투메 프린시페 도브라 (1977–2017) -svc=엘살바도르 콜론 -syp=시리아 파운드 -szl=스와질란드 릴랑게니 -thb=태국 바트 -tjs=타지키스탄 소모니 -tmm=투르크메니스탄 마나트 (1993–2009) -tnd=튀니지 디나르 -top=통가 파앙가 -tpe=티모르 에스쿠도 -trl=터키 리라 -try=신 터키 리라 -ttd=트리니다드 토바고 달러 -twd=신 타이완 달러 -tzs=탄자니아 실링 -uah=우크라이나 그리브나 -ugx=우간다 실링 -usd=미국 달러 -usn=미국 달러(다음날) -uss=미국 달러(당일) -uyu=우루과이 페소 우루과요 -uzs=우즈베키스탄 숨 -veb=베네주엘라 볼리바르 (1871–2008) -vef=베네수엘라 볼리바르 (2008–2018) -vnd=베트남 동 -vuv=바누아투 바투 -wst=서 사모아 탈라 -xaf=중앙아프리카 CFA 프랑 -xag=은화 -xau=금 -xba=유르코 (유럽 회계 단위) -xbb=유럽 통화 동맹 -xbc=유럽 계산 단위 (XBC) -xbd=유럽 계산 단위 (XBD) -xcd=동카리브 달러 -xdr=특별인출권 -xfo=프랑스 프랑 (Gold) -xfu=프랑스 프랑 (UIC) -xof=서아프리카 CFA 프랑 -xpd=팔라듐 -xpf=CFP 프랑 -xpt=백금 -xts=테스트 통화 코드 -xxx=알 수 없는 통화 단위 -yer=예멘 리알 -yum=유고슬라비아 노비 디나르 -zar=남아프리카 랜드 -zmk=쟘비아 콰쳐 (1968–2012) -zwd=짐바브웨 달러 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties deleted file mode 100644 index 74e8786712b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -KRW=￦ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties deleted file mode 100644 index beb39501bfb..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2014, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -LTL=Lt diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties deleted file mode 100644 index ccd8ba8cb96..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -LVL=Ls diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties deleted file mode 100644 index a3cdb8c87d6..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -MKD=Den diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties deleted file mode 100644 index 804d88a2baf..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -MYR=RM diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties deleted file mode 100644 index 5c14061e65c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -MTL=Lm -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties deleted file mode 100644 index 6152ace855d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -BEF=BF diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties deleted file mode 100644 index 4c7d87bd361..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -NLG=fl diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties deleted file mode 100644 index 2f18e148c57..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -NOK=kr diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties deleted file mode 100644 index 56fb2b8871b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -PLN=zł diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties deleted file mode 100644 index df7f52ca86a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties +++ /dev/null @@ -1,278 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=Peseta de Andorra -aed=Dirham dos Emirados Árabes Unidos -afa=Afegane (1927–2002) -afn=Afegane afegão -all=Lek albanês -amd=Dram armênio -ang=Florim das Antilhas Holandesas -aoa=Kwanza angolano -ars=Peso argentino -ats=Xelim austríaco -aud=Dólar australiano -awg=Florim arubano -azm=Manat azerbaijano (1993–2006) -azn=Manat azeri -bam=Marco conversível da Bósnia e Herzegovina -bbd=Dólar barbadense -bdt=Taka bengali -bef=Franco belga -bgl=Lev forte búlgaro -bgn=Lev búlgaro -bhd=Dinar bareinita -bif=Franco burundiano -bmd=Dólar bermudense -bnd=Dólar bruneano -bob=Boliviano da Bolívia -bov=Mvdol boliviano -brl=Real brasileiro -bsd=Dólar bahamense -btn=Ngultrum butanês -bwp=Pula botsuanesa -byb=Rublo novo bielo-russo (1994–1999) -byr=Rublo bielorrusso (2000–2016) -bzd=Dólar belizenho -cad=Dólar canadense -cdf=Franco congolês -chf=Franco suíço -clf=Unidades de Fomento chilenas -clp=Peso chileno -cny=Yuan chinês -cop=Peso colombiano -crc=Colón costarriquenho -csd=Dinar sérvio (2002–2006) -cuc=Peso cubano conversível -cup=Peso cubano -cve=Escudo cabo-verdiano -cyp=Libra cipriota -czk=Coroa tcheca -dem=Marco alemão -djf=Franco djiboutiano -dkk=Coroa dinamarquesa -dop=Peso dominicano -dzd=Dinar argelino -eek=Coroa estoniana -egp=Libra egípcia -ern=Nakfa da Eritreia -esp=Peseta espanhola -etb=Birr etíope -fim=Marca finlandesa -fjd=Dólar fijiano -fkp=Libra malvinense -frf=Franco francês -gbp=Libra esterlina -gel=Lari georgiano -ghc=Cedi de Gana (1979–2007) -ghs=Cedi ganês -gip=Libra de Gibraltar -gmd=Dalasi gambiano -gnf=Franco guineano -grd=Dracma grego -gtq=Quetzal guatemalteco -gwp=Peso da Guiné-Bissau -gyd=Dólar guianense -hkd=Dólar de Hong Kong -hnl=Lempira hondurenha -hrk=Kuna croata -htg=Gourde haitiano -huf=Florim húngaro -idr=Rupia indonésia -iep=Libra irlandesa -ils=Novo shekel israelense -inr=Rupia indiana -iqd=Dinar iraquiano -irr=Rial iraniano -isk=Coroa islandesa -itl=Lira italiana -jmd=Dólar jamaicano -jod=Dinar jordaniano -jpy=Iene japonês -kes=Xelim queniano -kgs=Som quirguiz -khr=Riel cambojano -kmf=Franco comoriano -kpw=Won norte-coreano -krw=Won sul-coreano -kwd=Dinar kuwaitiano -kyd=Dólar das Ilhas Cayman -kzt=Tenge cazaque -lak=Kip laosiano -lbp=Libra libanesa -lkr=Rupia cingalesa -lrd=Dólar liberiano -lsl=Loti lesotiano -ltl=Litas lituano -luf=Franco luxemburguês -lvl=Lats letão -lyd=Dinar líbio -mad=Dirham marroquino -mdl=Leu moldávio -mga=Ariary malgaxe -mgf=Franco de Madagascar -mkd=Dinar macedônio -mmk=Quiate mianmarense -mnt=Tugrik mongol -mop=Pataca macaense -mro=Ouguiya mauritana (1973–2017) -mtl=Lira maltesa -mur=Rupia mauriciana -mvr=Rupia maldivana -mwk=Kwacha malauiana -mxn=Peso mexicano -mxv=Unidade Mexicana de Investimento (UDI) -myr=Ringgit malaio -mzm=Metical de Moçambique (1980–2006) -mzn=Metical moçambicano -nad=Dólar namibiano -ngn=Naira nigeriana -nio=Córdoba nicaraguense -nlg=Florim holandês -nok=Coroa norueguesa -npr=Rupia nepalesa -nzd=Dólar neozelandês -omr=Rial omanense -pab=Balboa panamenho -pen=Novo sol peruano -pgk=Kina papuásia -php=Peso filipino -pkr=Rupia paquistanesa -pln=Zloty polonês -pte=Escudo português -pyg=Guarani paraguaio -qar=Rial catariano -rol=Leu romeno (1952–2006) -ron=Leu romeno -rsd=Dinar sérvio -rub=Rublo russo -rur=Rublo russo (1991–1998) -rwf=Franco ruandês -sar=Riyal saudita -sbd=Dólar das Ilhas Salomão -scr=Rupia seichelense -sdd=Dinar sudanês (1992–2007) -sdg=Libra sudanesa -sek=Coroa sueca -sgd=Dólar singapuriano -shp=Libra de Santa Helena -sit=Tolar Bons esloveno -skk=Coroa eslovaca -sll=Leone de Serra Leoa -sos=Xelim somali -srd=Dólar surinamês -srg=Florim do Suriname -std=Dobra de São Tomé e Príncipe (1977–2017) -svc=Colom salvadorenho -syp=Libra síria -szl=Lilangeni suazi -thb=Baht tailandês -tjs=Somoni tadjique -tmm=Manat do Turcomenistão (1993–2009) -tmt=Manat turcomeno -tnd=Dinar tunisiano -top=Paʻanga tonganesa -tpe=Escudo timorense -trl=Lira turca (1922–2005) -try=Lira turca -ttd=Dólar de Trinidad e Tobago -twd=Novo dólar taiwanês -tzs=Xelim tanzaniano -uah=Hryvnia ucraniano -ugx=Xelim ugandense -usd=Dólar americano -usn=Dólar norte-americano (Dia seguinte) -uss=Dólar norte-americano (Mesmo dia) -uyu=Peso uruguaio -uzs=Som uzbeque -veb=Bolívar venezuelano (1871–2008) -vef=Bolívar venezuelano (2008–2018) -vnd=Dong vietnamita -vuv=Vatu de Vanuatu -wst=Tala samoano -xaf=Franco CFA de BEAC -xag=Prata -xau=Ouro -xba=Unidade Composta Europeia -xbb=Unidade Monetária Europeia -xbc=Unidade de Conta Europeia (XBC) -xbd=Unidade de Conta Europeia (XBD) -xcd=Dólar do Caribe Oriental -xdr=Direitos Especiais de Giro -xfo=Franco-ouro francês -xfu=Franco UIC francês -xof=Franco CFA de BCEAO -xpd=Paládio -xpf=Franco CFP -xpt=Platina -xts=Código de Moeda de Teste -xxx=Moeda desconhecida -yer=Rial iemenita -yum=Dinar noviy iugoslavo (1994–2002) -zar=Rand sul-africano -zmk=Cuacha zambiano (1968–2012) -zwd=Dólar do Zimbábue (1980–2008) -zwl=Dólar do Zimbábue (2009) -zwr=Dólar do Zimbábue (2008) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties deleted file mode 100644 index 9680081bc0c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -BRL=R$ -USD=US$ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties deleted file mode 100644 index 0b9a51574cb..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -PTE=Esc. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties deleted file mode 100644 index 37bb44a84d3..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ROL=LEI -RON=LEI diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties deleted file mode 100644 index 69c0a2f7f24..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -RUB=руб. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties deleted file mode 100644 index 692d6ce3b7c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -SKK=Sk -skk=slovenská koruna -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties deleted file mode 100644 index 4fc0f46ca5e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -SIT=tol -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties deleted file mode 100644 index 1078bcd9d66..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -ALL=Lek diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties deleted file mode 100644 index a929e59103d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -BAM=КМ. -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties deleted file mode 100644 index 1214cf7bed5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties deleted file mode 100644 index 5312a1852bc..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -BAM=KM -bam=Bosanskohercegovačka konvertibilna marka -EUR=€ -eur=Evro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties deleted file mode 100644 index 6f475270885..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -EUR=€ -eur=Evro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties deleted file mode 100644 index d7dd167151c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -RSD=din. -rsd=srpski dinar diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties deleted file mode 100644 index 3d4a62e99f8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -EUR=€ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties deleted file mode 100644 index 7d86b234bce..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -RSD=дин. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties deleted file mode 100644 index 5ed800c274c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties +++ /dev/null @@ -1,275 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -adp=andorransk peseta -aed=emiratisk dirham -afa=afghani (1927–2002) -afn=afghansk afghani -all=albansk lek -amd=armenisk dram -ang=antillergulden -aoa=angolansk kwanza -ars=argentinsk peso -ats=österrikisk schilling -aud=australisk dollar -awg=arubansk florin -azm=azerbajdzjansk manat (1993–2006) -azn=azerbajdzjansk manat -bam=bosnisk-hercegovinsk mark (konvertibel) -bbd=barbadisk dollar -bdt=bangladeshisk taka -bef=belgisk franc -bgl=bulgarisk hård lev (1962–1999) -bgn=bulgarisk lev -bhd=bahrainsk dinar -bif=burundisk franc -bmd=bermudisk dollar -bnd=bruneisk dollar -bob=boliviansk boliviano -bov=boliviansk mvdol -brl=brasiliansk real -bsd=bahamansk dollar -btn=bhutanesisk ngultrum -bwp=botswansk pula -byb=vitrysk ny rubel (1994–1999) -byr=vitrysk rubel (2000–2016) -bzd=belizisk dollar -cad=kanadensisk dollar -cdf=kongolesisk franc -chf=schweizisk franc -clf=chilensk unidad de fomento -clp=chilensk peso -cny=kinesisk yuan -cop=colombiansk peso -crc=costarikansk colón -csd=serbisk dinar (2002–2006) -cup=kubansk peso -cve=kapverdisk escudo -cyp=cypriotiskt pund -czk=tjeckisk koruna -dem=tysk mark -djf=djiboutisk franc -dkk=dansk krona -dop=dominikansk peso -dzd=algerisk dinar -eek=estnisk krona -egp=egyptiskt pund -ern=eritreansk nakfa -esp=spansk peseta -etb=etiopisk birr -eur=euro -fim=finsk mark -fjd=Fijidollar -fkp=Falklandspund -frf=fransk franc -gbp=brittiskt pund -gel=georgisk lari -ghc=ghanansk cedi (1979–2007) -ghs=ghanansk cedi -gip=gibraltiskt pund -gmd=gambisk dalasi -gnf=guineansk franc -grd=grekisk drachma -gtq=guatemalansk quetzal -gwp=Guinea-Bissau-peso -gyd=Guyanadollar -hkd=Hongkongdollar -hnl=honduransk lempira -hrk=kroatisk kuna -htg=haitisk gourde -huf=ungersk forint -idr=indonesisk rupie -iep=irländskt pund -ils=israelisk ny shekel -inr=indisk rupie -iqd=irakisk dinar -irr=iransk rial -isk=isländsk krona -itl=italiensk lire -jmd=jamaicansk dollar -jod=jordansk dinar -jpy=japansk yen -kes=kenyansk shilling -kgs=kirgizisk som -khr=kambodjansk riel -kmf=komorisk franc -kpw=nordkoreansk won -krw=sydkoreansk won -kwd=kuwaitisk dinar -kyd=caymansk dollar -kzt=kazakisk tenge -lak=laotisk kip -lbp=libanesiskt pund -lkr=srilankesisk rupie -lrd=liberiansk dollar -lsl=lesothisk loti -ltl=litauisk litas -luf=luxemburgsk franc -lvl=lettisk lats -lyd=libysk dinar -mad=marockansk dirham -mdl=moldavisk leu -mga=madagaskisk ariary -mgf=madagaskisk franc -mkd=makedonisk denar -mmk=myanmarisk kyat -mnt=mongolisk tögrög -mop=makanesisk pataca -mro=mauretansk ouguiya (1973–2017) -mtl=maltesisk lire -mur=mauritisk rupie -mvr=maldivisk rufiyaa -mwk=malawisk kwacha -mxn=mexikansk peso -mxv=mexikansk unidad de inversion -myr=malaysisk ringgit -mzm=gammal moçambikisk metical -mzn=moçambikisk metical -nad=namibisk dollar -ngn=nigeriansk naira -nio=nicaraguansk córdoba -nlg=nederländsk gulden -nok=norsk krona -npr=nepalesisk rupie -nzd=nyzeeländsk dollar -omr=omansk rial -pab=panamansk balboa -pen=peruansk sol -pgk=papuansk kina -php=filippinsk peso -pkr=pakistansk rupie -pln=polsk zloty -pte=portugisisk escudo -pyg=paraguayansk guarani -qar=qatarisk rial -rol=rumänsk leu (1952–2005) -ron=rumänsk leu -rsd=serbisk dinar -rub=rysk rubel -rur=rysk rubel (1991–1998) -rwf=rwandisk franc -sar=saudisk riyal -sbd=Salomondollar -scr=seychellisk rupie -sdd=sudansk dinar (1992–2007) -sdg=sudanesiskt pund -sek=svensk krona -sgd=singaporiansk dollar -shp=sankthelenskt pund -sit=slovensk tolar -skk=slovakisk koruna -sll=sierraleonsk leone -sos=somalisk shilling -srd=surinamesisk dollar -srg=surinamesisk gulden -std=saotomeansk dobra (1977–2017) -svc=salvadoransk colón -syp=syriskt pund -szl=swaziländsk lilangeni -thb=thailändsk baht -tjs=tadzjikisk somoni -tmm=turkmenistansk manat (1993–2009) -tnd=tunisisk dinar -top=tongansk paʻanga -tpe=östtimoresisk escudo -trl=turkisk lire (1922–2005) -try=turkisk lira -ttd=Trinidaddollar -twd=taiwanesisk dollar -tzs=tanzanisk shilling -uah=ukrainsk hryvnia -ugx=ugandisk shilling -usd=amerikansk dollar -usn=US-dollar (nästa dag) -uss=US-dollar (samma dag) -uyu=uruguayansk peso -uzs=uzbekisk sum -veb=venezuelansk bolivar (1871–2008) -vef=venezuelansk bolívar (2008–2018) -vnd=vietnamesisk dong -vuv=vanuatisk vatu -wst=västsamoansk tala -xaf=centralafrikansk franc -xag=silver -xau=guld -xba=europeisk kompositenhet -xbb=europeisk monetär enhet -xbc=europeisk kontoenhet (XBC) -xbd=europeisk kontoenhet (XBD) -xcd=östkaribisk dollar -xdr=IMF särskild dragningsrätt -xfo=fransk guldfranc -xfu=internationella järnvägsunionens franc -xof=västafrikansk franc -xpd=palladium -xpf=CFP-franc -xpt=platina -xts=testvalutaenhet -xxx=okänd valuta -yer=jemenitisk rial -yum=jugoslavisk dinar (1994–2002) -zar=sydafrikansk rand -zmk=zambisk kwacha (1968–2012) -zwd=Zimbabwe-dollar diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties deleted file mode 100644 index 1c3ed3faf27..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -EUR=€ -SEK=kr diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties deleted file mode 100644 index 83f45b5d18e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -THB=฿ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties deleted file mode 100644 index 0850350abd5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -TRL=TL -TRY=TL diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties deleted file mode 100644 index 7cdbc2a70a7..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -UAH=грн. diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties deleted file mode 100644 index 72de5aa39a2..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -VND=đ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties deleted file mode 100644 index eb31d40b691..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties +++ /dev/null @@ -1,286 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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. - -CNY=￥ -adp=安道尔比塞塔 -aed=阿拉伯联合酋长国迪拉姆 -afa=阿富汗阿富汗尼 (1927-2002) -afn=阿富汗阿富汗尼 -all=阿尔巴尼亚列克 -amd=亚美尼亚德拉姆 -ang=荷属安的列斯盾 -aoa=安哥拉宽扎 -ars=阿根廷比索 -ats=奥地利先令 -aud=澳大利亚元 -awg=阿鲁巴岛弗罗林 -azm=阿塞拜疆马纳特 (1993-2006) -azn=阿塞拜疆马纳特 -bam=波斯尼亚和黑塞哥维那可兑换马克 -bbd=巴巴多斯元 -bdt=孟加拉塔卡 -bef=比利时法郎 -bgl=保加利亚列弗（硬币） -bgn=保加利亚列弗 -bhd=巴林第纳尔 -bif=布隆迪法郎 -bmd=百慕大元 -bnd=文莱元 -bob=波利维亚玻利维亚诺 -bov=玻利维亚 Mvdol -brl=巴西雷亚尔 -bsd=巴哈马元 -btn=不丹努扎姆 -bwp=博茨瓦纳普拉 -byb=白俄罗斯卢布 (1994-1999) -byn=白俄罗斯卢布 -byr=白俄罗斯卢布 (2000-2016) -bzd=伯利兹元 -cad=加拿大元 -cdf=刚果法郎 -chf=瑞士法郎 -clf=智利记账单位 (UF) -clp=智利比索 -cny=人民币 -cop=哥伦比亚比索 -crc=哥斯达黎加科朗 -csd=塞尔维亚第纳尔 (2002-2006) -cuc=古巴可兑换比索 -cup=古巴比索 -cve=佛得角埃斯库多 -cyp=塞浦路斯镑 -czk=捷克共和国克郎 -dem=德国马克 -djf=吉布提法郎 -dkk=丹麦克朗 -dop=多米尼加比索 -dzd=阿尔及利亚第纳尔 -eek=爱沙尼亚克朗 -egp=埃及镑 -ern=厄立特里亚纳克法 -esp=西班牙比塞塔 -etb=埃塞俄比亚比尔 -eur=欧元 -fim=芬兰马克 -fjd=斐济元 -fkp=福克兰群岛镑 -frf=法国法郎 -gbp=英镑 -gel=格鲁吉亚拉里 -ghc=加纳塞地 (1979-2007) -ghs=加纳塞地 -gip=直布罗陀镑 -gmd=冈比亚达拉西 -gnf=几内亚法郎 -grd=希腊德拉马克 -gtq=危地马拉格查尔 -gwp=几内亚比绍比索 -gyd=圭亚那元 -hkd=港元 -hnl=洪都拉斯伦皮拉 -hrk=库纳 -htg=海地古德 -huf=匈牙利福林 -idr=印度尼西亚卢比 -iep=爱尔兰镑 -ils=以色列新谢克尔 -inr=印度卢比 -iqd=伊拉克第纳尔 -irr=伊朗里亚尔 -isk=冰岛克朗 -itl=意大利里拉 -jmd=牙买加元 -jod=约旦第纳尔 -jpy=日元 -kes=肯尼亚先令 -kgs=吉尔吉斯斯坦索姆 -khr=柬埔寨瑞尔 -kmf=科摩罗法郎 -kpw=北朝鲜元 -krw=韩元 -kwd=科威特第纳尔 -kyd=开曼群岛元 -kzt=哈萨克斯坦腾格 -lak=老挝基普 -lbp=黎巴嫩镑 -lkr=斯里兰卡卢比 -lrd=利比里亚元 -lsl=莱索托洛提 -ltl=立陶宛立特 -luf=卢森堡法郎 -lvl=拉脱维亚拉特 -lyd=利比亚第纳尔 -mad=摩洛哥迪拉姆 -mdl=摩尔多瓦列伊 -mga=马达加斯加阿里亚里 -mgf=马达加斯加法郎 -mkd=马其顿第纳尔 -mmk=缅甸元 -mnt=蒙古图格里克 -mop=澳门元 -mro=毛里塔尼亚乌吉亚 -mru=毛里塔尼亚乌吉亚 -mtl=马耳他里拉 -mur=毛里求斯卢比 -mvr=马尔代夫罗非亚 -mwk=马拉维马拉维克瓦查 -mxn=墨西哥比索 -mxv=墨西哥投资单位 -myr=马来西亚林吉特 -mzm=莫桑比克美提卡 (1980-2006) -mzn=莫桑比克美提卡 -nad=纳米比亚元 -ngn=尼日利亚奈拉 -nio=尼加拉瓜科多巴 -nlg=荷兰盾 -nok=挪威克朗 -npr=尼泊尔卢比 -nzd=新西兰元 -omr=阿曼里亚尔 -pab=巴拿马巴波亚 -pen=秘鲁索尔 -pgk=巴布亚新几内亚基那 -php=菲律宾比索 -pkr=巴基斯坦卢比 -pln=波兰兹罗提 -pte=葡萄牙埃斯库多 -pyg=巴拉圭瓜拉尼 -qar=卡塔尔里亚尔 -rol=罗马尼亚列伊 (1952-2006) -ron=罗马尼亚列伊 -rsd=塞尔维亚第纳尔 -rub=俄罗斯卢布 -rur=俄罗斯卢布 (1991-1998) -rwf=卢旺达法郎 -sar=沙特里亚尔 -sbd=所罗门群岛元 -scr=塞舌尔卢比 -sdd=苏丹第纳尔 (1992-2007) -sdg=苏丹镑 -sek=瑞典克朗 -sgd=新加坡元 -shp=圣赫勒拿镑 -sit=斯洛文尼亚托拉尔 -skk=斯洛伐克克朗 -sle=塞拉利昂利昂 -sll=塞拉利昂利昂 -sos=索马里先令 -srd=苏里南元 -srg=苏里南盾 -ssp=南苏丹镑 -std=圣多美和普林西比多布拉 -stn=圣多美和普林西比多布拉 -svc=萨尔瓦多科朗 -syp=叙利亚镑 -szl=斯威士兰里兰吉尼 -thb=泰铢 -tjs=塔吉克斯坦索摩尼 -tmm=土库曼斯坦马纳特 (1993-2009) -tmt=土库曼斯坦马纳特 -tnd=突尼斯第纳尔 -top=东加币 -tpe=东帝汶埃斯库多 -trl=土耳其里拉 (1922-2005) -try=土耳其里拉 -ttd=特立尼达多巴哥元 -twd=新台币 -tzs=坦桑尼亚先令 -uah=乌克兰格里夫尼亚 -ugx=乌干达先令 -usd=美元 -usn=美元（次日） -uss=美元（同日） -uyu=乌拉圭 比索 -uzs=乌兹别克期坦索姆 -veb=委内瑞拉玻利瓦尔 (1871-2008) -ved=委内瑞拉主权玻利瓦尔 -vef=委内瑞拉玻利瓦尔 -ves=委内瑞拉主权玻利瓦尔 -vnd=越南盾 -vuv=瓦努阿图瓦图 -wst=萨摩亚塔拉 -xaf=CFA 法郎 BEAC -xag=银色 -xau=金色 -xba=欧洲货币合成单位 -xbb=欧洲货币单位 -xbc=欧洲记账单位 (XBC) -xbd=欧洲记账单位 (XBD) -xcd=东加勒比元 -xdr=特别提款权 -xfo=法国金法郎 -xfu=法国 UIC 法郎 -xof=CFA 法郎 BCEAO -xpd=钯 -xpf=太平洋法郎 -xpt=白金 -xsu=苏克雷 -xts=测试货币代码 -xua=ADB 记账单位 -xxx=未知货币 -yer=也门里亚尔 -yum=南斯拉夫新第纳尔 (1994-2002) -zar=南非兰特 -zmk=赞比亚克瓦查 -zwd=津巴布韦元 (1980-2008) -zwl=津巴布韦元 (2009) -zwr=津巴布韦元 (2008) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java deleted file mode 100644 index 8e437181cc0..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2005, 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. - */ - -/* - * Derived from Common Locale Data Repository data. - * COPYRIGHT AND PERMISSION NOTICE - * - * Copyright (C) 1991-2005 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. - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.util.resources.ext; - -import java.util.Locale; -import java.util.ResourceBundle; -import sun.util.locale.provider.LocaleProviderAdapter; -import sun.util.locale.provider.ResourceBundleBasedAdapter; -import sun.util.resources.OpenListResourceBundle; - -public final class CurrencyNames_zh_HK extends OpenListResourceBundle { - - // reparent to zh_TW for traditional Chinese names - public CurrencyNames_zh_HK() { - ResourceBundle bundle = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getCurrencyNames(Locale.TAIWAN); - setParent(bundle); - } - - @Override - protected Object[][] getContents() { - return new Object[][] { - {"HKD", "HK$"}, - {"TWD", "TWD"}, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java deleted file mode 100644 index 433f626e406..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2007, 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. - */ - -package sun.util.resources.ext; - -import java.util.Locale; -import java.util.ResourceBundle; -import sun.util.locale.provider.LocaleProviderAdapter; -import sun.util.locale.provider.ResourceBundleBasedAdapter; -import sun.util.resources.OpenListResourceBundle; - -public final class CurrencyNames_zh_SG extends OpenListResourceBundle { - - // reparent to zh_CN for simplified Chinese names - public CurrencyNames_zh_SG() { - ResourceBundle bundle = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getCurrencyNames(Locale.CHINA); - setParent(bundle); - } - - @Override - protected Object[][] getContents() { - return new Object[][] { - {"CNY", "CNY"}, - {"SGD", "S$"}, - }; - } -} diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties deleted file mode 100644 index 3f68856e9a1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties +++ /dev/null @@ -1,279 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -TWD=NT$ -twd=新台幣 -adp=安道爾陪士特 -aed=阿拉伯聯合大公國迪爾汗 -afa=阿富汗尼 (1927–2002) -afn=阿富汗尼 -all=阿爾巴尼亞列克 -amd=亞美尼亞德拉姆 -ang=荷屬安地列斯盾 -aoa=安哥拉寬扎 -ars=阿根廷披索 -ats=奧地利先令 -aud=澳幣 -awg=阿路巴盾 -azm=亞塞拜然馬納特 (1993–2006) -azn=亞塞拜然馬納特 -bam=波士尼亞-赫塞哥維納可轉換馬克 -bbd=巴貝多元 -bdt=孟加拉塔卡 -bef=比利時法郎 -bgl=保加利亞硬列弗 -bgn=保加利亞新列弗 -bhd=巴林第納爾 -bif=蒲隆地法郎 -bmd=百慕達幣 -bnd=汶萊元 -bob=玻利維亞諾 -bov=玻利維亞幕多 -brl=巴西里拉 -bsd=巴哈馬元 -btn=不丹那特倫 -bwp=波札那普拉 -byb=白俄羅斯新盧布 (1994–1999) -byr=白俄羅斯盧布 (2000–2016) -bzd=貝里斯元 -cad=加幣 -cdf=剛果法郎 -chf=瑞士法郎 -clf=卡林油達佛曼跎 -clp=智利披索 -cny=人民幣 -cop=哥倫比亞披索 -crc=哥斯大黎加科朗 -csd=舊塞爾維亞第納爾 -cuc=古巴可轉換披索 -cup=古巴披索 -cve=維德角埃斯庫多 -cyp=賽普勒斯鎊 -czk=捷克克朗 -dem=德國馬克 -djf=吉布地法郎 -dkk=丹麥克朗 -dop=多明尼加披索 -dzd=阿爾及利亞第納爾 -eek=愛沙尼亞克朗 -egp=埃及鎊 -ern=厄立特里亞納克法 -esp=西班牙陪士特 -etb=衣索比亞比爾 -eur=歐元 -fim=芬蘭馬克 -fjd=斐濟元 -fkp=福克蘭群島鎊 -frf=法國法郎 -gbp=英鎊 -gel=喬治亞拉里 -ghc=迦納賽地 (1979–2007) -ghs=迦納塞地 -gip=直布羅陀鎊 -gmd=甘比亞達拉西 -gnf=幾內亞法郎 -grd=希臘德拉克馬 -gtq=瓜地馬拉格查爾 -gwp=幾內亞比索披索 -gyd=圭亞那元 -hkd=港幣 -hnl=洪都拉斯倫皮拉 -hrk=克羅埃西亞庫納 -htg=海地古德 -huf=匈牙利福林 -idr=印尼盾 -iep=愛爾蘭鎊 -ils=以色列新謝克爾 -inr=印度盧比 -iqd=伊拉克第納爾 -irr=伊朗里亞爾 -isk=冰島克朗 -itl=義大利里拉 -jmd=牙買加元 -jod=約旦第納爾 -jpy=日圓 -kes=肯尼亞先令 -kgs=吉爾吉斯索姆 -khr=柬埔寨瑞爾 -kmf=科摩羅法郎 -kpw=北韓元 -krw=韓元 -kwd=科威特第納爾 -kyd=開曼群島元 -kzt=哈薩克堅戈 -lak=寮國基普 -lbp=黎巴嫩鎊 -lkr=斯里蘭卡盧比 -lrd=賴比瑞亞元 -lsl=賴索托洛蒂 -ltl=立陶宛立特 -luf=盧森堡法郎 -lvl=拉脫維亞拉特銀幣 -lyd=利比亞第納爾 -mad=摩洛哥迪拉姆 -mdl=摩杜雲列伊 -mga=馬達加斯加阿里亞里 -mgf=馬達加斯加法郎 -mkd=馬其頓第納爾 -mmk=緬甸元 -mnt=蒙古圖格里克 -mop=澳門元 -mro=茅利塔尼亞烏吉亞 (1973–2017) -mtl=馬爾他里拉 -mur=模里西斯盧比 -mvr=馬爾地夫盧非亞 -mwk=馬拉維克瓦查 -mxn=墨西哥披索 -mxv=墨西哥轉換單位 (UDI) -myr=馬來西亞令吉 -mzm=莫三比克梅蒂卡爾 (1980–2006) -mzn=莫三比克梅蒂卡爾 -nad=納米比亞元 -ngn=奈及利亞奈拉 -nio=尼加拉瓜金科多巴 -nlg=荷蘭盾 -nok=挪威克朗 -npr=尼泊爾盧比 -nzd=紐西蘭幣 -omr=阿曼里亞爾 -pab=巴拿馬巴波亞 -pen=秘魯太陽幣 -pgk=巴布亞紐幾內亞基那 -php=菲律賓披索 -pkr=巴基斯坦盧比 -pln=波蘭茲羅提 -pte=葡萄牙埃斯庫多 -pyg=巴拉圭瓜拉尼 -qar=卡達里亞爾 -rol=舊羅馬尼亞列伊 -ron=羅馬尼亞列伊 -rsd=塞爾維亞戴納 -rub=俄羅斯盧布 -rur=俄羅斯盧布 (1991–1998) -rwf=盧安達法郎 -sar=沙烏地里亞爾 -sbd=索羅門群島元 -scr=塞席爾盧比 -sdd=蘇丹第納爾 -sdg=蘇丹鎊 -sek=瑞典克朗 -sgd=新加坡幣 -shp=聖赫勒拿鎊 -sit=斯洛維尼亞托勒 -skk=斯洛伐克克朗 -sll=獅子山利昂 -sos=索馬利亞先令 -srd=蘇利南元 -srg=蘇利南基爾 -std=聖多美島和普林西比島多布拉 (1977–2017) -svc=薩爾瓦多科郎 -syp=敘利亞鎊 -szl=史瓦濟蘭里朗吉尼 -thb=泰銖 -tjs=塔吉克索莫尼 -tmm=土庫曼馬納特 (1993–2009) -tmt=土庫曼馬納特 -tnd=突尼西亞第納爾 -top=東加潘加 -tpe=帝汶埃斯庫多 -trl=土耳其里拉 -try=新土耳其里拉 -ttd=千里達及托巴哥元 -tzs=坦尚尼亞先令 -uah=烏克蘭格里夫納 -ugx=烏干達先令 -usd=美元 -usn=美元（次日） -uss=美元（當日） -uyu=烏拉圭披索 -uzs=烏茲別克索姆 -veb=委內瑞拉玻利瓦 (1871–2008) -vef=委內瑞拉玻利瓦 (2008–2018) -vnd=越南盾 -vuv=萬那杜瓦圖 -wst=西薩摩亞塔拉 -xaf=法郎 (CFA–BEAC) -xag=白銀 -xau=黃金 -xba=歐洲綜合單位 -xbb=歐洲貨幣單位 (XBB) -xbc=歐洲會計單位 (XBC) -xbd=歐洲會計單位 (XBD) -xcd=格瑞那達元 -xdr=特殊提款權 -xfo=法國金法郎 -xfu=法國法郎 (UIC) -xof=法郎 (CFA–BCEAO) -xpd=帕拉狄昂 -xpf=法郎 (CFP) -xpt=白金 -xts=測試用貨幣代碼 -xxx=未知貨幣 -yer=葉門里亞爾 -yum=南斯拉夫挪威亞第納爾 -zar=南非蘭特 -zmk=尚比亞克瓦查 (1968–2012) -zwd=辛巴威元 (1980–2008) -zwl=辛巴威元 (2009) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties deleted file mode 100644 index 83ced4ca33c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ar=العربية - -# country names -# key is ISO 3166 country code - -EG=مصر -DZ=الجزائر -BH=البحرين -IQ=العراق -JO=الأردن -KW=الكويت -LB=لبنان -LY=ليبيا -MA=المغرب -OM=عُمان -QA=قطر -SA=المملكة العربية السعودية -SD=السودان -SY=سوريا -TN=تونس -AE=الإمارات العربية المتحدة -YE=اليمن diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties deleted file mode 100644 index 2d76c54828d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -be=беларуская - -# country names -# key is ISO 3166 country code - -BY=Беларусь diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties deleted file mode 100644 index f6e4f90d911..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -bg=български - -# country names -# key is ISO 3166 country code - -BG=България diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties deleted file mode 100644 index c7266fbf6e9..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ab=abkhaz -aa=àfar -af=afrikaans -sq=albanès -am=amhàric -ar=àrab -hy=armeni -as=assamès -ay=aimara -az=azerbaidjanès -ba=baixkir -eu=basc -bn=bengalí -dz=dzongka -bh=bihari -bi=bislama -br=bretó -bg=búlgar -my=birmà -be=belarús -km=khmer -ca=català -zh=xinès -co=cors -hr=croat -cs=txec -da=danès -nl=neerlandès -en=anglès -eo=esperanto -et=estonià -fo=feroès -fj=fijià -fi=finès -fr=francès -fy=frisó occidental -gl=gallec -ka=georgià -de=alemany -el=grec -kl=groenlandès -gn=guaraní -gu=gujarati -ha=haussa -he=hebreu -iw=hebreu -hi=hindi -hu=hongarès -is=islandès -id=indonesi -in=indonesi -ia=interlingua -ie=interlingue -iu=inuktitut -ik=inupiak -ga=irlandès -it=italià -ja=japonès -jw=javanès -kn=kannada -ks=caixmiri -kk=kazakh -rw=ruandès -ky=kirguís -rn=rundi -ko=coreà -ku=kurd -lo=laosià -la=llatí -lv=letó -ln=lingala -lt=lituà -mk=macedoni -mg=malgaix -ms=malai -ml=malaiàlam -mt=maltès -mi=maori -mr=marathi -mo=moldau -mn=mongol -na=nauruà -ne=nepalès -no=noruec -oc=occità -or=oriya -om=oromo -ps=paixtu -fa=persa -pl=polonès -pt=portuguès -pa=panjabi -qu=quítxua -rm=retoromànic -ro=romanès -ru=rus -sm=samoà -sg=sango -sa=sànscrit -gd=gaèlic escocès -sr=serbi -st=sotho meridional -tn=setswana -sn=shona -sd=sindi -si=singalès -ss=swazi -sk=eslovac -sl=eslovè -so=somali -es=espanyol -su=sondanès -sw=suahili -sv=suec -tl=tagal -tg=tadjik -ta=tàmil -tt=tàtar -te=telugu -th=tai -bo=tibetà -ti=tigrinya -to=tongalès -ts=tsonga -tr=turc -tk=turcman -tw=twi -ug=uigur -uk=ucraïnès -ur=urdú -uz=uzbek -vi=vietnamita -vo=volapük -cy=gal·lès -wo=wòlof -xh=xosa -ji=ídix -yi=ídix -yo=ioruba -za=zhuang -zu=zulu - -# country names -# key is ISO 3166 country code - -AF=Afganistan -AL=Albània -DZ=Algèria -AM=Armènia -AU=Austràlia -AT=Àustria -AZ=Azerbaidjan -BS=Bahames -BY=Belarús -BE=Bèlgica -BJ=Benín -BM=Bermudes -BO=Bolívia -BA=Bòsnia i Hercegovina -BR=Brasil -BG=Bulgària -KH=Cambodja -CM=Camerun -CA=Canadà -CV=Cap Verd -CF=República Centreafricana -TD=Txad -CL=Xile -CN=Xina -CO=Colòmbia -KM=Comores -HR=Croàcia -CY=Xipre -CZ=Txèquia -DK=Dinamarca -DO=República Dominicana -TP=Timor Oriental -EC=Equador -EG=Egipte -GQ=Guinea Equatorial -EE=Estònia -ET=Etiòpia -FI=Finlàndia -FR=França -GF=Guaiana Francesa -PF=Polinèsia Francesa -TF=Territoris Australs Francesos -GM=Gàmbia -GE=Geòrgia -DE=Alemanya -GR=Grècia -GP=Guadalupe -GW=Guinea Bissau -HT=Haití -HN=Hondures -HK=Hong Kong (RAE Xina) -HU=Hongria -IS=Islàndia -IN=Índia -ID=Indonèsia -IE=Irlanda -IT=Itàlia -JP=Japó -JO=Jordània -KP=Corea del Nord -KR=Corea del Sud -KG=Kirguizistan -LV=Letònia -LB=Líban -LR=Libèria -LY=Líbia -LT=Lituània -LU=Luxemburg -MK=Macedònia del Nord -MY=Malàisia -MQ=Martinica -MR=Mauritània -MU=Maurici -MX=Mèxic -FM=Micronèsia -MD=Moldàvia -MC=Mònaco -MN=Mongòlia -MA=Marroc -MZ=Moçambic -MM=Myanmar (Birmània) -NA=Namíbia -NL=Països Baixos -AN=Antilles Holandeses -NC=Nova Caledònia -NZ=Nova Zelanda -NE=Níger -NG=Nigèria -NO=Noruega -PA=Panamà -PG=Papua Nova Guinea -PY=Paraguai -PE=Perú -PH=Filipines -PL=Polònia -RU=Rússia -RW=Ruanda -SA=Aràbia Saudita -SP=Sèrbia -SG=Singapur -SK=Eslovàquia -SI=Eslovènia -SO=Somàlia -ZA=República de Sud-àfrica -ES=Espanya -SR=Surinam -SZ=eSwatini -SE=Suècia -CH=Suïssa -SY=Síria -TJ=Tadjikistan -TZ=Tanzània -TH=Tailàndia -TT=Trinitat i Tobago -TN=Tunísia -TR=Turquia -UA=Ucraïna -AE=Emirats Àrabs Units -GB=Regne Unit -US=Estats Units -UY=Uruguai -VA=Ciutat del Vaticà -VE=Veneçuela -VG=Illes Verges britàniques -VI=Illes Verges nord-americanes -EH=Sàhara Occidental -YE=Iemen -ZR=Zaire -ZM=Zàmbia -ZW=Zimbàbue diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties deleted file mode 100644 index fbb5ed68f87..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -cs=čeština - -# country names -# key is ISO 3166 country code - -CZ=Česko diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties deleted file mode 100644 index 497001c76a3..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -da=dansk - -# country names -# key is ISO 3166 country code - -DK=Danmark diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties deleted file mode 100644 index ef06daa8577..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties +++ /dev/null @@ -1,770 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ab=Abchasisch -ae=Avestisch -am=Amharisch -an=Aragonesisch -ar=Arabisch -as=Assamesisch -av=Awarisch -az=Aserbaidschanisch -ba=Baschkirisch -be=Belarussisch -bg=Bulgarisch -bh=Biharisch -bn=Bengalisch -bo=Tibetisch -br=Bretonisch -bs=Bosnisch -ca=Katalanisch -ce=Tschetschenisch -co=Korsisch -cs=Tschechisch -cu=Kirchenslawisch -cv=Tschuwaschisch -cy=Walisisch -da=Dänisch -de=Deutsch -dv=Dhivehi -el=Griechisch -en=Englisch -es=Spanisch -et=Estnisch -eu=Baskisch -fa=Persisch -ff=Ful -fi=Finnisch -fj=Fidschi -fo=Färöisch -fr=Französisch -fy=Westfriesisch -ga=Irisch -gd=Gälisch (Schottland) -gl=Galicisch -gn=Guaraní -ha=Haussa -he=Hebräisch -ho=Hiri-Motu -hr=Kroatisch -ht=Haiti-Kreolisch -hu=Ungarisch -hy=Armenisch -id=Indonesisch -ii=Yi -ik=Inupiak -in=Indonesisch -is=Isländisch -it=Italienisch -iw=Hebräisch -ja=Japanisch -ji=Jiddisch -jv=Javanisch -ka=Georgisch -kg=Kongolesisch -kj=Kwanyama -kk=Kasachisch -kl=Grönländisch -ko=Koreanisch -ks=Kaschmiri -ku=Kurdisch -kw=Kornisch -ky=Kirgisisch -la=Latein -lb=Luxemburgisch -li=Limburgisch -lo=Laotisch -lt=Litauisch -lv=Lettisch -mh=Marschallesisch -mi=Māori -mk=Mazedonisch -mn=Mongolisch -mo=Moldavisch -ms=Malaiisch -mt=Maltesisch -my=Birmanisch -na=Nauruisch -nb=Norwegisch (Bokmål) -nd=Nord-Ndebele -ne=Nepalesisch -nl=Niederländisch -nn=Norwegisch (Nynorsk) -no=Norwegisch -nr=Süd-Ndebele -oc=Okzitanisch -or=Oriya -os=Ossetisch -pl=Polnisch -ps=Paschtu -pt=Portugiesisch -rm=Rätoromanisch -ro=Rumänisch -ru=Russisch -sc=Sardisch -se=Nordsamisch -si=Singhalesisch -sk=Slowakisch -sl=Slowenisch -sm=Samoanisch -sq=Albanisch -sr=Serbisch -ss=Swazi -st=Süd-Sotho -su=Sundanesisch -sv=Schwedisch -sw=Suaheli -tg=Tadschikisch -th=Thailändisch -tk=Turkmenisch -to=Tongaisch -tr=Türkisch -tt=Tatarisch -ty=Tahitisch -ug=Uigurisch -uk=Ukrainisch -uz=Usbekisch -vi=Vietnamesisch -wa=Wallonisch -yi=Jiddisch -zh=Chinesisch - -# key is ISO 639.2 language code -abk=Abchasisch -ace=Aceh -ach=Acholi -ady=Adygeisch -afa=Afro-Asiatisch -akk=Akkadisch -alb=Albanisch -ale=Aleutisch -alg=Algonkin-Sprache -alt=Süd-Altaisch -amh=Amharisch -ang=Altenglisch -apa=Apache-Sprache -ara=Arabisch -arc=Aramäisch -arg=Aragonisch -arm=Armenisch -arn=Mapudungun -art=Kunstsprache -asm=Assamesisch -ast=Asturisch -ath=Athapaskisch -aus=Australisch -ava=Avarisch -ave=Avestisch -aze=Aserbaidschanisch -bai=Bamileke-Sprache -bak=Baschkirisch -bal=Belutschisch -ban=Balinesisch -baq=Baskisch -bas=Bassa -bat=Baltisch -bej=Bedauye -bel=Belorussisch -ben=Bengalisch -ber=Berber-Sprache -bho=Bhodschpuri -bih=Biharisch -bis=Bislamisch -bla=Blackfoot -bnt=Bantu-Sprache -bos=Bosnisch -bra=Braj-Bhakha -bre=Bretonisch -btk=Battakisch -bua=Burjatisch -bug=Buginesisch -bul=Bulgarisch -bur=Burmesisch -cai=Zentralamerikanische Indianersprache -car=Karibisch -cat=Katalanisch -cau=Kaukasisch -cel=Keltisch -che=Tschetschenisch -chg=Tschagataisch -chi=Chinesisch -chk=Chuukesisch -chn=Chinook -chu=Kirchenslawisch -cmc=Cham-Sprache -cop=Koptisch -cos=Korsisch -cpe=Kreolisch-Englische Sprache -cpf=Kreolisch-Französische Sprache -cpp=Kreolisch-Portugiesische Sprache -crh=Krimtatarisch -crp=Kreolische Sprache -csb=Kaschubisch -cus=Kuschitisch -cze=Tschechisch -dan=Dänisch -dar=Darginisch -day=Dajak -dra=Drawidisch -dsb=Niedersorbisch -dum=Mittelniederländisch -dut=Niederländisch -dzo=Bhutani -egy=Ägyptisch -elx=Elamisch -eng=Englisch -enm=Mittelenglisch -est=Estnisch -fan=Pangwe -fao=Färöisch -fij=Fidschi -fin=Finnisch -fiu=Finnougrisch -fre=Französisch -frm=Mittelfranzösisch -fro=Altfranzösisch -frr=Nordfriesisch -frs=Ostfriesisch -fry=Westfriesisch -fur=Friaulisch -gem=Germanisch -geo=Georgisch -ger=Deutsch -gil=Kiribatisch -gla=Gälisch -gle=Irisch -glg=Galizisch -gmh=Mittelhochdeutsch -goh=Althochdeutsch -gor=Mongondou -got=Gotisch -grc=Altgriechisch -gre=Modernes Griechisch (1453-) -gsw=Schweizerdeutsch -guj=Gujaratisch -gwi=Kutchin -hat=Haitisch -hau=Haussa -haw=Hawaiisch -heb=Hebräisch -hit=Hethitisch -hmn=Miao -hrv=Kroatisch -hsb=Obersorbisch -hun=Ungarisch -ice=Isländisch -ijo=Ijo-Sprache -ilo=Ilokano -ina=Interlingua (Internationale Hilfssprache, Vereinigung) -inc=Indoarisch -ind=Indonesisch -ine=Indogermanisch -inh=Inguschisch -ipk=Inupiak -ira=Iranische Sprache -iro=Irokesische Sprache -ita=Italienisch -jav=Javanesisch -jpn=Japanisch -jpr=Jüdisch-Persisch -jrb=Jüdisch-Arabisch -kaa=Karakalpakisch -kab=Kabylisch -kal=Kalaallisut (Grönländisch) -kar=Karenisch -kas=Kaschmirisch -kaz=Kasachisch -kbd=Kabardinisch -khi=Khoisan-Sprache -khm=Khmerisch, Zentral -kho=Sakisch -kir=Kirgisisch -kor=Koreanisch -kos=Kosraeanisch -krc=Karatschaiisch-Balkarisch -krl=Karelisch -kro=Kru-Sprache -kru=Oraon -kum=Kumükisch -kur=Kurdisch -lao=Laotisch -lat=Lateinisch -lav=Lettisch -lez=Lesgisch -lim=Limburgisch -lin=Lingalisch -lit=Litauisch -ltz=Luxemburgisch -lus=Lushai -mac=Mazedonisch -mad=Maduresisch -mag=Khotta -mah=Marshall -mak=Makassarisch -mal=Malaysisch -man=Malinke -mao=Maorisch -map=Austronesisch -mas=Massai -mdf=Mokschanisch -mdr=Mandaresisch -mga=Mittelirisch -mic=Micmac -mis=(andere Sprache) -mkh=Mon-Khmer-Sprache -mlg=Malagasisch -mlt=Maltesisch -mnc=Mandschurisch -mni=Meithei -mno=Manobo-Sprache -mon=Mongolisch -mul=Mehrsprachig -mun=Munda-Sprache -mus=Muskogee -mwl=Mirandesisch -myn=Maya-Sprache -myv=Ersja-Mordwinisch -nai=Nordamerikanische Indianersprache -nap=Neapolitanisch -nbl=Ndebele, Süd -nde=Ndebele, Nord -nds=Niederdeutsch -nep=Nepalesisch -nic=Cordoba -niu=Niue -nno=Norwegisch, Nynorsk -nob=Bokmal, Norwegisch -non=Altnordisch -nor=Norwegisch -nso=Nord-Sotho -nub=Nubisch -nwc=Alt-Newari -oci=Okzitanisch (nach 1500) -ori=Orija -orm=Oromo (Afan) -oss=Ossetisch -ota=Osmanisch -oto=Otomangue-Sprache -paa=Papuasprache -pal=Mittelpersisch -pam=Pampanggan -pan=Pundjabisch -pau=Palau -peo=Altpersisch -per=Persisch -phi=Philippinisch -phn=Phönizisch -pol=Polnisch -pon=Ponapeanisch -por=Portugiesisch -pro=Altprovenzalisch -pus=Paschtunisch -rar=Rarotonganisch -roa=Romanische Sprache -roh=Romantsch -rom=Romani -rum=Rumänisch -run=Kirundisch -rup=Aromunisch -rus=Russisch -sah=Jakutisch -sai=Südamerikanische Indianersprache -sal=Salish-Sprache -sam=Samaritanisch -scn=Sizilianisch -sco=Schottisch -sel=Selkupisch -sem=Semitisch -sga=Altirisch -sgn=Gebärdensprache -shn=Schan -sin=Singhalesisch -sio=Sioux-Sprache -sit=Tolar -sla=Slawisch -slo=Slowakisch -slv=Slowenisch -sma=Südsamisch -sme=Nord-Samisch -smi=Lappisch -smj=Lule-Samisch -smn=Inari-Samisch -smo=Samoanisch -sms=Skolt-Samisch -sna=Schonisch -snd=Zinti-Sprache -sog=Sogdisch -som=Somalisch -son=Songhai-Sprache -sot=Süd-Sotho -spa=Spanisch -srd=Sardisch -srn=Srananisch -srp=Serbisch -ssa=Nilosaharanisch -ssw=Swasiländisch -sun=Sundanesisch -sux=Sumerisch -swa=Suaheli -swe=Schwedisch -syc=Altsyrisch -syr=Syrisch -tah=Tahitisch -tai=Tai-Sprache -tam=Tsongaisch -tat=Tatarisch -tem=Temne -tgk=Tadschikisch -tib=Tibetanisch -tir=Tigrinja -tkl=Tokelauanisch -tlh=Klingonisch -tmh=Tamaseq -ton=Tonga (Tonga-Inseln) -tpi=Neumelanesisch -tsn=Sezuan -tuk=Turkmenisch -tup=Tupi-Sprache -tur=Türkisch -tut=Altaisch -tvl=Tuvaluisch -tyv=Tuwinisch -udm=Udmurtisch -uga=Ugaritisch -uig=Uigurisch -ukr=Ukrainisch -und=Unbekannte Sprache -uzb=Usbekisch -vie=Vietnamesisch -vot=Wotisch -wak=Wakashanisch -wal=Walamo -wel=Walisisch -wen=Sorbisch -wln=Wallonisch -xal=Kalmückisch -yap=Yapesisch -yid=Jiddish -yor=Joruba -ypk=Yupik-Sprache -zap=Zapotekisch -zbl=Bliss-Symbole -znd=Zande-Sprache -zxx=Keine Sprachinhalte - -# script names -# key is ISO 15924 script code - -Arab=Arabisch -Armi=Armi -Armn=Armenisch -Avst=Avestisch -Bali=Balinesisch -Bamu=Bamun -Bass=Bassa -Batk=Battakisch -Beng=Bengalisch -Blis=Bliss-Symbole -Bugi=Buginesisch -Cans=UCAS -Cari=Karisch -Copt=Koptisch -Cprt=Zypriotisch -Cyrl=Kyrillisch -Cyrs=Altkirchenslawisch -Dupl=Duployanisch -Egyd=Ägyptisch - Demotisch -Egyh=Ägyptisch - Hieratisch -Egyp=Ägyptische Hieroglyphen -Elba=Elbasanisch -Ethi=Äthiopisch -Geok=Khutsuri -Geor=Georgisch -Glag=Glagolitisch -Goth=Gotisch -Grek=Griechisch -Hani=Chinesisch -Hans=Vereinfacht -Hant=Traditionell -Hebr=Hebräisch -Hrkt=Japanische Silbenschrift -Hung=Altungarisch -Inds=Indus-Schrift -Ital=Altitalisch -Java=Javanesisch -Jpan=Japanisch -Kore=Koreanisch -Laoo=Laotisch -Latf=Lateinisch - Fraktur-Variante -Latg=Lateinisch - Gälische Variante -Latn=Lateinisch -Lyci=Lykisch -Lydi=Lydisch -Mand=Mandäisch -Mani=Manichäisch -Maya=Maya-Hieroglyphen -Merc=Meroitisch kursiv -Mero=Meroitisch -Mong=Mongolisch -Mymr=Birmanisch -Narb=Altnordarabisch -Nbat=Nabatäisch -Nkgb=Geba -Orkh=Orchon-Runen -Orya=Oriya -Osma=Osmanisch -Palm=Palmyrenisch -Perm=Altpermisch -Phli=Buch-Pahlavi -Phlp=Psalter-Pahlavi -Phlv=Pahlavi -Phnx=Phönizisch -Plrd=Pollard Phonetisch -Prti=Parthisch -Runr=Runenschrift -Samr=Samaritanisch -Sarb=Altsüdarabisch -Sgnw=Gebärdensprache -Shaw=Shaw-Alphabet -Sinh=Singhalesisch -Sund=Sundanesisch -Syrc=Syrisch -Syre=Syrisch - Estrangelo-Variante -Syrj=Westsyrisch -Syrn=Ostsyrisch -Talu=Tai Lue -Taml=Tamilisch -Tavt=Tai-Viet -Tibt=Tibetisch -Ugar=Ugaritisch -Visp=Sichtbare Sprache -Xpeo=Altpersisch -Xsux=Sumerisch-akkadische Keilschrift -Zinh=Geerbter Schriftwert -Zmth=Mathematische Notation -Zsym=Symbole -Zxxx=Schriftlos -Zyyy=Verbreitet -Zzzz=Unbekannte Schrift - -# country names -# key is ISO 3166 country code - -AE=Vereinigte Arabische Emirate -AG=Antigua und Barbuda -AL=Albanien -AM=Armenien -AN=Niederländische Antillen -AQ=Antarktis -AR=Argentinien -AS=Amerikanisch-Samoa -AT=Österreich -AU=Australien -AX=Ålandinseln -AZ=Aserbaidschan -BA=Bosnien und Herzegowina -BD=Bangladesch -BE=Belgien -BG=Bulgarien -BN=Brunei Darussalam -BO=Bolivien -BR=Brasilien -BV=Bouvetinsel -BW=Botsuana -CA=Kanada -CC=Kokosinseln -CD=Kongo-Kinshasa -CF=Zentralafrikanische Republik -CG=Kongo-Brazzaville -CH=Schweiz -CK=Cookinseln -CM=Kamerun -CO=Kolumbien -CS=Serbien und Montenegro -CU=Kuba -CV=Cabo Verde -CX=Weihnachtsinsel -CY=Zypern -CZ=Tschechien -DE=Deutschland -DJ=Dschibuti -DK=Dänemark -DO=Dominikanische Republik -DZ=Algerien -EE=Estland -EG=Ägypten -EH=Westsahara -ES=Spanien -ET=Äthiopien -FI=Finnland -FJ=Fidschi -FK=Falklandinseln -FM=Mikronesien -FO=Färöer -FR=Frankreich -GA=Gabun -GB=Vereinigtes Königreich -GE=Georgien -GF=Französisch-Guayana -GL=Grönland -GQ=Äquatorialguinea -GR=Griechenland -GS=Südgeorgien und die Südlichen Sandwichinseln -HK=Sonderverwaltungsregion Hongkong -HM=Heard und McDonaldinseln -HR=Kroatien -HU=Ungarn -ID=Indonesien -IE=Irland -IN=Indien -IO=Britisches Territorium im Indischen Ozean -IQ=Irak -IS=Island -IT=Italien -JM=Jamaika -JO=Jordanien -KE=Kenia -KG=Kirgisistan -KH=Kambodscha -KM=Komoren -KN=St. Kitts und Nevis -KP=Nordkorea -KR=Südkorea -KY=Kaimaninseln -KZ=Kasachstan -LB=Libanon -LT=Litauen -LU=Luxemburg -LV=Lettland -LY=Libyen -MA=Marokko -MD=Republik Moldau -MG=Madagaskar -MH=Marshallinseln -MK=Nordmazedonien -MM=Myanmar -MN=Mongolei -MO=Sonderverwaltungsregion Macau -MP=Nördliche Marianen -MR=Mauretanien -MV=Malediven -MX=Mexiko -MZ=Mosambik -NC=Neukaledonien -NF=Norfolkinsel -NL=Niederlande -NO=Norwegen -NZ=Neuseeland -PF=Französisch-Polynesien -PG=Papua-Neuguinea -PH=Philippinen -PL=Polen -PM=St. Pierre und Miquelon -PN=Pitcairninseln -PS=Palästinensische Autonomiegebiete -QA=Katar -RO=Rumänien -RS=Serbien -RU=Russland -RW=Ruanda -SA=Saudi-Arabien -SB=Salomonen -SC=Seychellen -SE=Schweden -SG=Singapur -SI=Slowenien -SJ=Spitzbergen und Jan Mayen -SK=Slowakei -ST=São Tomé und Príncipe -SY=Syrien -TC=Turks- und Caicosinseln -TD=Tschad -TF=Französische Süd- und Antarktisgebiete -TJ=Tadschikistan -TN=Tunesien -TR=Türkei -TT=Trinidad und Tobago -TZ=Tansania -UM=Amerikanische Überseeinseln -US=Vereinigte Staaten -UZ=Usbekistan -VA=Vatikanstadt -VC=St. Vincent und die Grenadinen -VG=Britische Jungferninseln -VI=Amerikanische Jungferninseln -WF=Wallis und Futuna -YE=Jemen -ZA=Südafrika -ZM=Sambia -ZW=Simbabwe - -# territory names -# key is UN M.49 country and area code - -001=Welt -002=Afrika -003=Nordamerika -005=Südamerika -009=Ozeanien -011=Westafrika -013=Mittelamerika -014=Ostafrika -015=Nordafrika -017=Zentralafrika -018=Südliches Afrika -019=Amerika -021=Nördliches Amerika -029=Karibik -030=Ostasien -034=Südasien -035=Südostasien -039=Südeuropa -053=Australasien -054=Melanesien -057=Mikronesisches Inselgebiet -061=Polynesien -142=Asien -143=Zentralasien -145=Westasien -150=Europa -151=Osteuropa -154=Nordeuropa -155=Westeuropa -419=Lateinamerika diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties deleted file mode 100644 index 3cfbaf1da82..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties +++ /dev/null @@ -1,342 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ar=Αραβικά -be=Λευκορωσικά -bg=Βουλγαρικά -bn=Βεγγαλικά -bo=Θιβετιανά -bs=Βοσνιακά -ca=Καταλανικά -co=Κορσικανικά -cs=Τσεχικά -cy=Ουαλικά -da=Δανικά -de=Γερμανικά -el=Ελληνικά -en=Αγγλικά -es=Ισπανικά -et=Εσθονικά -eu=Βασκικά -fa=Περσικά -fi=Φινλανδικά -fr=Γαλλικά -ga=Ιρλανδικά -gd=Σκωτικά Κελτικά -he=Εβραϊκά -hi=Χίντι -hr=Κροατικά -hu=Ουγγρικά -hy=Αρμενικά -id=Ινδονησιακά -in=Ινδονησιακά -is=Ισλανδικά -it=Ιταλικά -iw=Εβραϊκά -ja=Ιαπωνικά -ji=Γίντις -ka=Γεωργιανά -ko=Κορεατικά -la=Λατινικά -lt=Λιθουανικά -lv=Λετονικά -mk=Σλαβομακεδονικά -mn=Μογγολικά -mo=Μολδαβικά -mt=Μαλτεζικά -nl=Ολλανδικά -no=Νορβηγικά -pl=Πολωνικά -pt=Πορτογαλικά -ro=Ρουμανικά -ru=Ρωσικά -sk=Σλοβακικά -sl=Σλοβενικά -sq=Αλβανικά -sr=Σερβικά -sv=Σουηδικά -th=Ταϊλανδικά -tr=Τουρκικά -uk=Ουκρανικά -vi=Βιετναμικά -yi=Γίντις -zh=Κινεζικά -AD=Ανδόρα -AE=Ηνωμένα Αραβικά Εμιράτα -AF=Αφγανιστάν -AG=Αντίγκουα και Μπαρμπούντα -AI=Ανγκουίλα -AL=Αλβανία -AM=Αρμενία -AN=Ολλανδικές Αντίλλες -AO=Αγκόλα -AQ=Ανταρκτική -AR=Αργεντινή -AS=Αμερικανική Σαμόα -AT=Αυστρία -AU=Αυστραλία -AW=Αρούμπα -AX=Νήσοι Όλαντ -AZ=Αζερμπαϊτζάν -BA=Βοσνία - Ερζεγοβίνη -BB=Μπαρμπέιντος -BD=Μπανγκλαντές -BE=Βέλγιο -BF=Μπουρκίνα Φάσο -BG=Βουλγαρία -BH=Μπαχρέιν -BI=Μπουρούντι -BJ=Μπενίν -BM=Βερμούδες -BN=Μπρουνέι -BO=Βολιβία -BR=Βραζιλία -BS=Μπαχάμες -BT=Μπουτάν -BV=Νήσος Μπουβέ -BW=Μποτσουάνα -BY=Λευκορωσία -BZ=Μπελίζ -CA=Καναδάς -CC=Νήσοι Κόκος (Κίλινγκ) -CD=Κονγκό - Κινσάσα -CF=Κεντροαφρικανική Δημοκρατία -CG=Κονγκό - Μπραζαβίλ -CH=Ελβετία -CI=Ακτή Ελεφαντοστού -CK=Νήσοι Κουκ -CL=Χιλή -CM=Καμερούν -CN=Κίνα -CO=Κολομβία -CR=Κόστα Ρίκα -CS=Σερβία και Μαυροβούνιο -CU=Κούβα -CV=Πράσινο Ακρωτήριο -CX=Νήσος των Χριστουγέννων -CY=Κύπρος -CZ=Τσεχία -DE=Γερμανία -DJ=Τζιμπουτί -DK=Δανία -DM=Ντομίνικα -DO=Δομινικανή Δημοκρατία -DZ=Αλγερία -EC=Ισημερινός -EE=Εσθονία -EG=Αίγυπτος -EH=Δυτική Σαχάρα -ER=Ερυθραία -ES=Ισπανία -ET=Αιθιοπία -FI=Φινλανδία -FJ=Φίτζι -FK=Νήσοι Φόκλαντ -FM=Μικρονησία -FO=Νήσοι Φερόες -FR=Γαλλία -GA=Γκαμπόν -GB=Ηνωμένο Βασίλειο -GD=Γρενάδα -GE=Γεωργία -GF=Γαλλική Γουιάνα -GH=Γκάνα -GI=Γιβραλτάρ -GL=Γροιλανδία -GM=Γκάμπια -GN=Γουινέα -GP=Γουαδελούπη -GQ=Ισημερινή Γουινέα -GR=Ελλάδα -GS=Νήσοι Νότια Γεωργία και Νότιες Σάντουιτς -GT=Γουατεμάλα -GU=Γκουάμ -GW=Γουινέα Μπισάου -GY=Γουιάνα -HK=Χονγκ Κονγκ ΕΔΠ Κίνας -HM=Νήσοι Χερντ και Μακντόναλντ -HN=Ονδούρα -HR=Κροατία -HT=Αϊτή -HU=Ουγγαρία -ID=Ινδονησία -IE=Ιρλανδία -IL=Ισραήλ -IN=Ινδία -IO=Βρετανικά Εδάφη Ινδικού Ωκεανού -IQ=Ιράκ -IR=Ιράν -IS=Ισλανδία -IT=Ιταλία -JM=Τζαμάικα -JO=Ιορδανία -JP=Ιαπωνία -KE=Κένυα -KG=Κιργιστάν -KH=Καμπότζη -KI=Κιριμπάτι -KM=Κομόρες -KN=Σεν Κιτς και Νέβις -KP=Βόρεια Κορέα -KR=Νότια Κορέα -KW=Κουβέιτ -KY=Νήσοι Κέιμαν -KZ=Καζακστάν -LA=Λάος -LB=Λίβανος -LC=Αγία Λουκία -LI=Λιχτενστάιν -LK=Σρι Λάνκα -LR=Λιβερία -LS=Λεσότο -LT=Λιθουανία -LU=Λουξεμβούργο -LV=Λετονία -LY=Λιβύη -MA=Μαρόκο -MC=Μονακό -MD=Μολδαβία -MG=Μαδαγασκάρη -MH=Νήσοι Μάρσαλ -MK=Βόρεια Μακεδονία -ML=Μάλι -MM=Μιανμάρ (Βιρμανία) -MN=Μογγολία -MO=Μακάο ΕΔΠ Κίνας -MP=Νήσοι Βόρειες Μαριάνες -MQ=Μαρτινίκα -MR=Μαυριτανία -MS=Μονσεράτ -MT=Μάλτα -MU=Μαυρίκιος -MV=Μαλδίβες -MW=Μαλάουι -MX=Μεξικό -MY=Μαλαισία -MZ=Μοζαμβίκη -NA=Ναμίμπια -NC=Νέα Καληδονία -NE=Νίγηρας -NF=Νήσος Νόρφολκ -NG=Νιγηρία -NI=Νικαράγουα -NL=Ολλανδία -NO=Νορβηγία -NP=Νεπάλ -NR=Ναουρού -NU=Νιούε -NZ=Νέα Ζηλανδία -OM=Ομάν -PA=Παναμάς -PE=Περού -PF=Γαλλική Πολυνησία -PG=Παπούα Νέα Γουινέα -PH=Φιλιππίνες -PK=Πακιστάν -PL=Πολωνία -PM=Σεν Πιερ και Μικελόν -PN=Νήσοι Πίτκερν -PR=Πουέρτο Ρίκο -PS=Παλαιστινιακά Εδάφη -PT=Πορτογαλία -PW=Παλάου -PY=Παραγουάη -QA=Κατάρ -RE=Ρεϊνιόν -RO=Ρουμανία -RU=Ρωσία -RW=Ρουάντα -SA=Σαουδική Αραβία -SB=Νήσοι Σολομώντος -SC=Σεϋχέλλες -SD=Σουδάν -SE=Σουηδία -SG=Σιγκαπούρη -SH=Αγία Ελένη -SI=Σλοβενία -SJ=Σβάλμπαρντ και Γιαν Μαγιέν -SK=Σλοβακία -SL=Σιέρα Λεόνε -SM=Άγιος Μαρίνος -SN=Σενεγάλη -SO=Σομαλία -SR=Σουρινάμ -ST=Σάο Τομέ και Πρίνσιπε -SV=Ελ Σαλβαδόρ -SY=Συρία -SZ=Εσουατίνι -TC=Νήσοι Τερκς και Κάικος -TD=Τσαντ -TF=Γαλλικά Νότια Εδάφη -TG=Τόγκο -TH=Ταϊλάνδη -TJ=Τατζικιστάν -TK=Τοκελάου -TL=Τιμόρ-Λέστε -TM=Τουρκμενιστάν -TN=Τυνησία -TO=Τόνγκα -TR=Τουρκία -TT=Τρινιντάντ και Τομπάγκο -TV=Τουβαλού -TW=Ταϊβάν -TZ=Τανζανία -UA=Ουκρανία -UG=Ουγκάντα -UM=Απομακρυσμένες Νησίδες ΗΠΑ -US=Ηνωμένες Πολιτείες -UY=Ουρουγουάη -UZ=Ουζμπεκιστάν -VA=Βατικανό -VC=Άγιος Βικέντιος και Γρεναδίνες -VE=Βενεζουέλα -VG=Βρετανικές Παρθένες Νήσοι -VI=Αμερικανικές Παρθένες Νήσοι -VN=Βιετνάμ -VU=Βανουάτου -WF=Γουάλις και Φουτούνα -WS=Σαμόα -YE=Υεμένη -YT=Μαγιότ -ZA=Νότια Αφρική -ZM=Ζάμπια -ZW=Ζιμπάμπουε diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties deleted file mode 100644 index d144f4279c8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties deleted file mode 100644 index b7bb6eaacf8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -CS=Serbia And Montenegro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties deleted file mode 100644 index b7bb6eaacf8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -CS=Serbia And Montenegro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties deleted file mode 100644 index b7bb6eaacf8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -CS=Serbia And Montenegro diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties deleted file mode 100644 index cf5ce32076f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties +++ /dev/null @@ -1,1007 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=afar -ab=abjasio -ae=avéstico -af=afrikáans -ak=akan -am=amárico -an=aragonés -ar=árabe -as=asamés -av=avar -ay=aimara -az=azerbaiyano -ba=baskir -be=bielorruso -bg=búlgaro -bh=bihari -bi=bislama -bm=bambara -bn=bengalí -bo=tibetano -br=bretón -bs=bosnio -ca=catalán -ce=checheno -ch=chamorro -co=corso -cr=cree -cs=checo -cu=eslavo eclesiástico -cv=chuvasio -cy=galés -da=danés -de=alemán -dv=divehi -dz=dzongkha -ee=ewé -el=griego -en=inglés -eo=esperanto -es=español -et=estonio -eu=euskera -fa=persa -ff=fula -fi=finés -fj=fiyiano -fo=feroés -fr=francés -fy=frisón occidental -ga=irlandés -gd=gaélico escocés -gl=gallego -gn=guaraní -gu=guyaratí -gv=manés -ha=hausa -he=hebreo -hi=hindi -ho=hiri motu -hr=croata -ht=criollo haitiano -hu=húngaro -hy=armenio -hz=herero -ia=interlingua -id=indonesio -ie=interlingue -ig=igbo -ii=yi de Sichuán -ik=inupiaq -in=indonesio -io=ido -is=islandés -it=italiano -iu=inuktitut -iw=hebreo -ja=japonés -ji=yidis -jv=javanés -ka=georgiano -kg=kongo -ki=kikuyu -kj=kuanyama -kk=kazajo -kl=groenlandés -km=jemer -kn=canarés -ko=coreano -kr=kanuri -ks=cachemir -ku=kurdo -kv=komi -kw=córnico -ky=kirguís -la=latín -lb=luxemburgués -lg=ganda -li=limburgués -ln=lingala -lo=lao -lt=lituano -lu=luba-katanga -lv=letón -mg=malgache -mh=marshalés -mi=maorí -mk=macedonio -ml=malayálam -mn=mongol -mo=moldavo -mr=maratí -ms=malayo -mt=maltés -my=birmano -na=nauruano -nb=noruego bokmal -nd=ndebele septentrional -ne=nepalí -ng=ndonga -nl=neerlandés -nn=noruego nynorsk -no=noruego -nr=ndebele meridional -nv=navajo -ny=nyanja -oc=occitano -oj=ojibwa -om=oromo -or=oriya -os=osético -pa=punyabí -pi=pali -pl=polaco -ps=pastún -pt=portugués -qu=quechua -rm=romanche -rn=kirundi -ro=rumano -ru=ruso -rw=kinyarwanda -sa=sánscrito -sc=sardo -sd=sindhi -se=sami septentrional -sg=sango -si=cingalés -sk=eslovaco -sl=esloveno -sm=samoano -sn=shona -so=somalí -sq=albanés -sr=serbio -ss=suazi -st=sotho meridional -su=sundanés -sv=sueco -sw=suajili -ta=tamil -te=telugu -tg=tayiko -th=tailandés -ti=tigriña -tk=turcomano -tl=tagalo -tn=setsuana -to=tongano -tr=turco -ts=tsonga -tt=tártaro -tw=twi -ty=tahitiano -ug=uigur -uk=ucraniano -ur=urdu -uz=uzbeko -ve=venda -vi=vietnamita -vo=volapük -wa=valón -wo=wólof -xh=xhosa -yi=yidis -yo=yoruba -za=zhuang -zh=chino -zu=zulú - -# key is ISO 639.2 language code -aar=afar -abk=Abjasio -ace=acehnés -ach=acoli -ada=adangme -ady=adigué -afa=afgani (1927-2002) -afh=afrihili -ain=ainu -aka=Acano -akk=acadio -alb=Albanés -ale=aleutiano -alg=lenguas algonquinas -alt=altái meridional -amh=Amárico -ang=inglés antiguo -anp=angika -apa=lenguas apache -ara=australes argentinos -arc=arameo -arg=Aragonés -arm=Armenio -arn=mapuche -arp=arapaho -art=lengua artificial -arw=arahuaco -asm=Asamés -ast=asturiano -ath=lenguas atabascas -aus=lenguas australianas -ava=Ávaro -ave=Avéstico -awa=avadhi -aym=Aimara -aze=Azerbaiyano -bad=dinares bosnios -bai=lenguas bamileke -bal=baluchi -bam=marcos convertibles de Bosnia-Herzegovina -ban=balinés -baq=Vasco -bas=basaa -bat=lengua báltica -bej=beja -bel=francos belgas (financieros) -bem=bemba -ben=Bengalí -ber=bereber -bho=bhoyapurí -bih=Biharí -bik=bicol -bin=bini -bla=siksika -bnt=bantú -bos=Bosnio -bra=braj -bre=cruceiros brasileños (BRE) -btk=batak -bua=buriato -bug=buginés -bul=Búlgaro -bur=Birmano -byn=blin -cad=caddo -cai=lengua india centroamericana -car=caribe -cat=Catalán -cau=lengua caucásica -ceb=cebuano -cel=lengua celta -chb=chibcha -che=euros WIR -chg=chagatái -chi=Chino -chk=trukés -chm=marí -chn=jerga chinuk -cho=choctaw -chp=chipewyan -chr=cheroqui -chu=Eslavo Eclesiástico -chv=Chuvacho -chy=cheyene -cmc=lenguas chámicas -cop=copto -cor=Córnico -cos=corso -cpe=lengua criolla o pidgin basada en el inglés -cpf=lengua criolla o pidgin basada en el francés -cpp=lengua criolla o pidgin basada en el portugués -cre=cree -crh=tártaro de Crimea -crp=lengua criolla o pidgin -csb=casubio -cus=lengua cusita -cze=checo -dak=dakota -dan=danés -dar=dargva -day=dayak -del=delaware -den=slave -dgr=dogrib -din=dinka -div=Dhivehi -doi=dogri -dra=lengua dravídica -dsb=bajo sorbio -dua=duala -dum=neerlandés medio -dut=Holandés -dyu=diula -efi=efik -egy=egipcio antiguo -eka=ekajuk -elx=elamita -eng=Inglés -enm=inglés medio -est=Estonio -ewe=Efé -ewo=ewondo -fan=fang -fao=Faroés -fat=fanti -fij=fidjiano -fil=filipino -fin=Finlandés -fiu=lengua finoúgria -fon=fon -fre=francés -frm=francés medio -fro=francés antiguo -frr=frisón septentrional -frs=frisón oriental -fry=Frisio del Oeste -ful=Fula -fur=friulano -gaa=ga -gay=gayo -gba=gbaya -gem=lengua germánica -geo=Georgiano -ger=Alemán -gez=geez -gil=gilbertés -gla=Gaélico -gle=Irlandés -glg=Gallego -glv=Manés -gmh=alto alemán medio -goh=alto alemán antiguo -gon=gondi -gor=gorontalo -got=gótico -grb=grebo -grc=griego antiguo -gre=Griego moderno (1453-) -grn=Guaraní -gsw=alemán suizo -gwi=kutchin -hai=haida -hat=Haitiano -haw=hawaiano -heb=hebreo -her=herero -hil=hiligaynon -him=himachali -hin=hindi -hit=hitita -hmn=hmong -hmo=Hiri motu -hrv=Croata -hsb=alto sorbio -hun=húngaro -hup=hupa -iba=iban -ibo=Ibo -ice=Islandés -iii=Yi de Sichuán -ijo=ijo -ile=Interlingüe -ilo=ilocano -ina=Interlingua (IALA, del inglés International Auxiliary Language Association) -inc=lengua índica -ind=Indonesio -ine=lengua indoeuropea -inh=ingush -ipk=Iñupiaq -ira=lengua irania -iro=lenguas iroquesas -ita=Italiano -jav=Javanés -jbo=lojban -jpn=Japonés -jpr=judeo-persa -jrb=judeo-árabe -kaa=karakalpako -kab=cabila -kac=kachin -kam=kamba -kan=Canarés -kar=karen -kas=Cachemirí -kaw=kawi -kaz=Kazajo -kbd=kabardiano -kha=khasi -khi=lengua joisana -khm=Jemer Central -kho=kotanés -kin=Ruandés -kir=kirghiz -kmb=kimbundu -kok=konkaní -kon=Congo -kor=Coreano -kos=kosraeano -kpe=kpelle -krc=karachay-balkar -krl=carelio -kro=kru -kru=kurukh -kum=kumyk -kur=Curdo -kut=kutenai -lad=ladino -lah=lahnda -lam=lamba -lao=Laosiano -lat=latín -lav=Letón -lez=lezgiano -lim=Limburgués -lit=Lituano -lol=mongo -loz=lozi -ltz=Luxemburgués -lua=luba-lulua -lub=Luba-katanga -lug=Luganda -lui=luiseño -lun=lunda -luo=luo -lus=mizo -mac=Macedonio -mad=madurés -mag=magahi -mah=marshalés -mai=maithili -mak=macasar -man=mandingo -mao=Maorí -map=lengua austronesia -mas=masái -may=malayo -mdf=moksha -mdr=mandar -men=mende -mga=irlandés medio -mic=micmac -min=minangkabau -mis=lenguas varias -mkh=lengua mon-jemer -mlg=Malgache -mlt=Maltés -mnc=manchú -mni=manipuri -mno=lenguas manobo -moh=mohawk -mon=Mongol -mos=mossi -mul=varios idiomas -mun=lenguas munda -mus=creek -mwl=mirandés -mwr=marwari -myn=maya -myv=erzya -nah=náhuatl -nai=lengua india norteamericana -nap=napolitano -nau=Nauruano -nbl=Ndebele del Sur -nde=ndebele septentrional -nds=bajo alemán -nep=Nepalí -new=newari -nia=nias -nic=córdobas nicaragüenses -niu=niueano -nno=Noruego Nynorsk -nob=Noruego Bokmal -nog=nogai -non=nórdico antiguo -nor=Noruego -nqo=n’ko -nso=sotho septentrional -nub=lenguas nubias -nwc=newari clásico -nym=nyamwezi -nyn=nyankole -nyo=nyoro -nzi=nzima -oci=Occitano (posterior a 1500) -ori=oriya -osa=osage -oss=Osético -ota=turco otomano -oto=lenguas otomanas -paa=lengua papú -pag=pangasinán -pal=pahlavi -pam=pampanga -pan=Penyabí -pap=papiamento -pau=palauano -peo=persa antiguo -per=Persa -phi=lengua filipina -phn=fenicio -pol=Polaco -pon=pohnpeiano -por=Portugués -pra=lenguas prácritas -pro=provenzal antiguo -raj=rajasthani -rap=rapanui -rar=rarotongano -roa=lengua romance -rom=romaní -rum=rumano -run=Rundí -rup=arrumano -rus=Ruso -sad=sandawe -sah=sakha -sai=lengua india sudamericana -sal=lenguas salish -sam=arameo samaritano -san=Sánscrito -sas=sasak -sat=santali -scn=siciliano -sco=escocés -sel=selkup -sem=lengua semítica -sga=irlandés antiguo -sgn=lenguajes de signos -shn=shan -sid=sidamo -sin=Cingalés -sio=lenguas sioux -sit=tólares eslovenos -sla=lengua eslava -slo=Eslovaco -slv=Esloveno -sma=sami meridional -sme=Sami del Norte -smi=lengua sami -smj=sami lule -smn=sami inari -smo=Samoano -sms=sami skolt -sna=shona -snk=soninké -sog=sogdiano -som=Somalí -son=songhai -sot=Sotho del Sur -spa=Español -srd=dólar surinamés -srn=sranan tongo -srp=serbio -srr=serer -ssa=lengua nilo-sahariana -ssw=Suazi -suk=sukuma -sun=sudanés -sus=susu -sux=sumerio -swe=Sueco -syc=siríaco clásico -syr=siriaco -tah=tahitiano -tai=lengua tai -tem=temne -ter=tereno -tet=tetún -tgl=Tagalo -tha=Tailandés -tib=Tibetano -tig=tigré -tiv=tiv -tkl=tokelauano -tlh=klingon -tli=tlingit -tmh=tamashek -tog=tonga del Nyasa -ton=Tongano (Islas Tonga) -tpi=tok pisin -tsi=tsimshiano -tuk=Turcomano -tum=tumbuka -tup=lenguas tupí -tur=Turco -tut=lengua altaica -tvl=tuvaluano -twi=Tui -tyv=tuviniano -udm=udmurt -uga=ugarítico -uig=Uiguro -ukr=Ucraniano -umb=umbundu -und=lengua desconocida -uzb=Uzbeco -vai=vai -vie=vietnamita -vol=Volapuk -vot=vótico -wak=lenguas wakasha -wal=wolayta -war=waray -was=washo -wel=Galés -wen=lenguas sorbias -wln=valón -wol=Uolof -xal=kalmyk -yao=yao -yap=yapés -yid=Yídish -ypk=lenguas yupik -zap=zapoteco -zbl=símbolos Bliss -zen=zenaga -znd=zande -zul=Zulú -zun=zuñi -zxx=sin contenido lingüístico -zza=zazaki - -# script names -# key is ISO 15924 script code - -Arab=árabe -Armi=Arameo Imperial -Armn=armenio -Avst=avéstico -Bali=balinés -Batk=batak -Beng=bengalí -Blis=símbolos blis -Bopo=bopomofo -Brah=brahmi -Brai=braille -Bugi=buginés -Buhd=buhid -Cans=silabarios aborígenes canadienses unificados -Cari=cario -Cham=cham -Cher=cherokee -Cirt=cirth -Copt=copto -Cprt=chipriota -Cyrl=cirílico -Cyrs=cirílico del antiguo eslavo eclesiástico -Deva=devanagari -Dsrt=deseret -Dupl=Taquigrafía Duployé -Egyd=egipcio demótico -Egyh=egipcio hierático -Egyp=jeroglíficos egipcios -Ethi=etiópico -Geok=georgiano eclesiástico -Geor=georgiano -Glag=glagolítico -Goth=gótico -Grek=griego -Gujr=guyaratí -Guru=gurmuji -Hang=hangul -Hani=han -Hano=hanunoo -Hans=simplificado -Hant=tradicional -Hebr=hebreo -Hira=hiragana -Hmng=pahawh hmong -Hrkt=silabarios japoneses -Hung=húngaro antiguo -Inds=Indio (harappan) -Ital=antigua bastardilla -Java=javanés -Jpan=japonés -Kali=kayah li -Kana=katakana -Khar=kharosthi -Khmr=jemer -Knda=canarés -Kore=coreano -Lana=lanna -Laoo=laosiano -Latf=latino fraktur -Latg=latino gaélico -Latn=latino -Lepc=lepcha -Limb=limbu -Lina=lineal A -Linb=lineal B -Lisu=Lisu -Lyci=licio -Lydi=lidio -Mand=mandeo -Mani=Maniqueísmo -Maya=jeroglíficos mayas -Mend=Mendé -Merc=Meroítico Cursivo -Mero=meroítico -Mlym=malayálam -Mong=mongol -Moon=moon -Mtei=manipuri -Mymr=birmano -Narb=Árabe del Norte Antiguo -Nbat=Nabateo -Nkgb=Nakhi Geba -Nkoo=n’ko -Ogam=ogham -Olck=ol ciki -Orkh=orkhon -Orya=oriya -Osma=osmaniya -Palm=Palmireño -Perm=permiano antiguo -Phag=phags-pa -Phli=Pahlavi, Inscripciones -Phlp=Pahlavi, Salterio -Phlv=Pahlavi, Libros -Phnx=fenicio -Plrd=Pollard Miao -Prti=Parto, Inscripciones -Rjng=rejang -Roro=rongo-rongo -Runr=rúnico -Samr=Samaritano -Sara=sarati -Sarb=Árabe del Sur Antiguo -Saur=saurashtra -Shaw=shaviano -Sind=Sindhi -Sinh=cingalés -Sund=sundanés -Sylo=syloti nagri -Syrc=siriaco -Syre=siriaco estrangelo -Syrj=siriaco occidental -Syrn=siriaco oriental -Tagb=tagbanúa -Tale=tai le -Talu=nuevo tai lue -Taml=tamil -Telu=telugu -Teng=tengwar -Tfng=tifinagh -Tglg=tagalo -Thaa=thaana -Thai=tailandés -Tibt=tibetano -Ugar=ugarítico -Vaii=vai -Visp=lenguaje visible -Wara=Warang Citi -Xpeo=persa antiguo -Xsux=cuneiforme sumerio-acadio -Yiii=yi -Zinh=heredado -Zmth=notación matemática -Zsym=símbolos -Zxxx=no escrito -Zyyy=común -Zzzz=alfabeto desconocido - -# country names -# key is ISO 3166 country code - -AE=Emiratos Árabes Unidos -AF=Afganistán -AG=Antigua y Barbuda -AI=Anguila -AN=Antillas Holandesas -AQ=Antártida -AS=Samoa Americana -AX=Islas Aland -AZ=Azerbaiyán -BA=Bosnia y Herzegovina -BD=Bangladés -BE=Bélgica -BH=Baréin -BJ=Benín -BM=Bermudas -BN=Brunéi -BR=Brasil -BT=Bután -BV=Isla Bouvet -BW=Botsuana -BY=Bielorrusia -BZ=Belice -CA=Canadá -CC=Islas Cocos -CD=República Democrática del Congo -CF=República Centroafricana -CG=Congo -CH=Suiza -CK=Islas Cook -CM=Camerún -CS=Serbia y Montenegro -CV=Cabo Verde -CX=Isla de Navidad -CY=Chipre -CZ=Chequia -DE=Alemania -DJ=Yibuti -DK=Dinamarca -DO=República Dominicana -DZ=Argelia -EG=Egipto -EH=Sáhara Occidental -ES=España -ET=Etiopía -FI=Finlandia -FJ=Fiyi -FK=Islas Malvinas -FO=Islas Feroe -FR=Francia -GA=Gabón -GB=Reino Unido -GD=Granada -GF=Guayana Francesa -GL=Groenlandia -GP=Guadalupe -GQ=Guinea Ecuatorial -GR=Grecia -GS=Islas Georgia del Sur y Sandwich del Sur -GW=Guinea-Bisáu -HK=RAE de Hong Kong (China) -HM=Islas Heard y McDonald -HR=Croacia -HT=Haití -HU=Hungría -IE=Irlanda -IO=Territorio Británico del Océano Índico -IQ=Irak -IR=Irán -IS=Islandia -IT=Italia -JO=Jordania -JP=Japón -KE=Kenia -KG=Kirguistán -KH=Camboya -KM=Comoras -KN=San Cristóbal y Nieves -KP=Corea del Norte -KR=Corea del Sur -KY=Islas Caimán -KZ=Kazajistán -LB=Líbano -LC=Santa Lucía -LS=Lesoto -LT=Lituania -LU=Luxemburgo -LV=Letonia -LY=Libia -MA=Marruecos -MC=Mónaco -MD=Moldavia -MH=Islas Marshall -MK=Macedonia del Norte -MM=Myanmar (Birmania) -MO=RAE de Macao (China) -MP=Islas Marianas del Norte -MQ=Martinica -MU=Mauricio -MV=Maldivas -MW=Malaui -MX=México -MY=Malasia -NC=Nueva Caledonia -NE=Níger -NF=Isla Norfolk -NL=Países Bajos -NO=Noruega -NZ=Nueva Zelanda -OM=Omán -PA=Panamá -PE=Perú -PF=Polinesia Francesa -PG=Papúa Nueva Guinea -PH=Filipinas -PK=Pakistán -PL=Polonia -PM=San Pedro y Miquelón -PN=Islas Pitcairn -PS=Territorios Palestinos -PW=Palaos -QA=Catar -RE=Reunión -RO=Rumanía -RU=Rusia -RW=Ruanda -SA=Arabia Saudí -SB=Islas Salomón -SD=Sudán -SE=Suecia -SG=Singapur -SH=Santa Elena -SI=Eslovenia -SJ=Svalbard y Jan Mayen -SK=Eslovaquia -SL=Sierra Leona -SR=Surinam -ST=Santo Tomé y Príncipe -SY=Siria -SZ=Esuatini -TC=Islas Turcas y Caicos -TF=Territorios Australes Franceses -TH=Tailandia -TJ=Tayikistán -TM=Turkmenistán -TN=Túnez -TR=Turquía -TT=Trinidad y Tobago -TW=Taiwán -UA=Ucrania -UM=Islas menores alejadas de EE. UU. -US=Estados Unidos -UZ=Uzbekistán -VA=Ciudad del Vaticano -VC=San Vicente y las Granadinas -VG=Islas Vírgenes Británicas -VI=Islas Vírgenes de EE. UU. -WF=Wallis y Futuna -ZA=Sudáfrica -ZW=Zimbabue - -# territory names -# key is UN M.49 country and area code - -001=Mundo -002=África -003=América del Norte -005=Sudamérica -009=Oceanía -011=África occidental -013=Centroamérica -014=África oriental -015=África septentrional -017=África central -018=África meridional -019=América -021=Norteamérica -029=Caribe -030=Asia oriental -034=Asia meridional -035=Sudeste asiático -039=Europa meridional -057=Región de Micronesia -061=Polinesia -143=Asia central -145=Asia occidental -150=Europa -151=Europa oriental -154=Europa septentrional -155=Europa occidental -419=Latinoamérica diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties deleted file mode 100644 index 5a2f0330cbe..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -gu=gurayatí -ks=cachemiro -nd=ndebele del norte -se=sami del norte -ss=siswati -st=sesoto -sw=swahili -tn=setchwana -AN=Antillas Neerlandesas -AX=Islas Åland -EH=Sahara Occidental diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties deleted file mode 100644 index 374b8ab161e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -et=eesti - -# country names -# key is ISO 3166 country code - -EE=Eesti diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties deleted file mode 100644 index 68ede9b5ba1..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ar=arabia -ba=baškiiri -bg=bulgaria -ca=katalaani -cs=tšekki -da=tanska -de=saksa -el=kreikka -en=englanti -es=espanja -fi=suomi -fr=ranska -he=heprea -iw=heprea -hi=hindi -it=italia -ja=japani -lt=liettua -lv=latvia -nl=hollanti -no=norja -pl=puola -pt=portugali -ru=venäjä -sv=ruotsi -th=thai -tr=turkki -zh=kiina - -# country names -# key is ISO 3166 country code - -BE=Belgia -BR=Brasilia -CA=Kanada -CH=Sveitsi -CN=Kiina -CZ=Tšekki -DE=Saksa -DK=Tanska -ES=Espanja -FI=Suomi -FR=Ranska -GB=Iso-Britannia -GR=Kreikka -IE=Irlanti -IT=Italia -JP=Japani -KR=Etelä-Korea -NL=Alankomaat -NO=Norja -PL=Puola -PT=Portugali -RU=Venäjä -SE=Ruotsi -TR=Turkki -US=Yhdysvallat diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties deleted file mode 100644 index 0caa9be2f6f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties +++ /dev/null @@ -1,993 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=afar -ab=abkhaze -ae=avestique -af=afrikaans -ak=akan -am=amharique -an=aragonais -ar=arabe -as=assamais -av=avar -ay=aymara -az=azerbaïdjanais -ba=bachkir -be=biélorusse -bg=bulgare -bh=bihari -bi=bichelamar -bm=bambara -bn=bengali -bo=tibétain -br=breton -bs=bosniaque -ca=catalan -ce=tchétchène -ch=chamorro -co=corse -cr=cree -cs=tchèque -cu=slavon d’église -cv=tchouvache -cy=gallois -da=danois -de=allemand -dv=maldivien -dz=dzongkha -ee=éwé -el=grec -en=anglais -eo=espéranto -es=espagnol -et=estonien -eu=basque -fa=persan -ff=peul -fi=finnois -fj=fidjien -fo=féroïen -fr=français -fy=frison occidental -ga=irlandais -gd=gaélique écossais -gl=galicien -gn=guarani -gu=goudjarati -gv=mannois -ha=haoussa -he=hébreu -hi=hindi -ho=hiri motu -hr=croate -ht=créole haïtien -hu=hongrois -hy=arménien -hz=héréro -ia=interlingua -id=indonésien -ie=interlingue -ig=igbo -ii=yi du Sichuan -ik=inupiaq -in=indonésien -io=ido -is=islandais -it=italien -iu=inuktitut -iw=hébreu -ja=japonais -ji=yiddish -jv=javanais -ka=géorgien -kg=kikongo -ki=kikuyu -kj=kuanyama -kk=kazakh -kl=groenlandais -km=khmer -kn=kannada -ko=coréen -kr=kanouri -ks=cachemiri -ku=kurde -kv=komi -kw=cornique -ky=kirghize -la=latin -lb=luxembourgeois -lg=ganda -li=limbourgeois -ln=lingala -lo=lao -lt=lituanien -lu=luba-katanga (kiluba) -lv=letton -mg=malgache -mh=marshallais -mi=maori -mk=macédonien -ml=malayalam -mn=mongol -mo=moldave -mr=marathi -ms=malais -mt=maltais -my=birman -na=nauruan -nb=norvégien bokmål -nd=ndébélé du Nord -ne=népalais -ng=ndonga -nl=néerlandais -nn=norvégien nynorsk -no=norvégien -nr=ndébélé du Sud -nv=navajo -ny=chewa -oc=occitan -oj=ojibwa -om=oromo -or=odia -os=ossète -pa=pendjabi -pi=pali -pl=polonais -ps=pachto -pt=portugais -qu=quechua -rm=romanche -rn=roundi -ro=roumain -ru=russe -rw=kinyarwanda -sa=sanskrit -sc=sarde -sd=sindhi -se=same du Nord -sg=sango -si=cingalais -sk=slovaque -sl=slovène -sm=samoan -sn=shona -so=somali -sq=albanais -sr=serbe -ss=swati -st=sotho du Sud -su=soundanais -sv=suédois -sw=swahili -ta=tamoul -te=télougou -tg=tadjik -th=thaï -ti=tigrigna -tk=turkmène -tl=tagalog -tn=tswana -to=tongien -tr=turc -ts=tsonga -tt=tatar -tw=twi -ty=tahitien -ug=ouïghour -uk=ukrainien -ur=ourdou -uz=ouzbek -ve=venda -vi=vietnamien -vo=volapük -wa=wallon -wo=wolof -xh=xhosa -yi=yiddish -yo=yoruba -za=zhuang -zh=chinois -zu=zoulou - -# key is ISO 639.2 language code -abk=Abkhaze -ace=aceh -ach=acoli -ada=adangme -ady=adyguéen -afa=Afro-asiatique -afh=afrihili -ain=aïnou -akk=akkadien -alb=Albanais -ale=aléoute -alg=Langue algonquienne -alt=altaï du Sud -amh=Amharique -ang=ancien anglais -anp=angika -apa=Langue apache -ara=Arabe -arc=araméen -arg=Aragonais -arm=Arménien -arn=mapuche -arp=arapaho -art=Langue artificielle -arw=arawak -asm=Assamais -ast=asturien -ath=Langue athapascane -aus=Langue australienne -ava=Avar -ave=Avestique -awa=awadhi -aze=Azéri -bai=Langue bamilékée -bak=Bachkir -bal=baloutchi -ban=balinais -bas=bassa -bat=Langue balte -bej=bedja -bel=Biélorusse -bem=bemba -ber=Berbère -bho=bhodjpouri -bik=bikol -bin=bini -bis=Bichlamar -bla=siksika -bnt=Bantou -bos=Bosniaque -bra=braj -bua=bouriate -bug=bugi -bul=Bulgare -bur=Birman -byn=blin -cad=caddo -cai=Langue amérindienne centrale -car=caribe -cau=Langue caucasienne -ceb=cebuano -cel=Langue celtique -chb=chibcha -che=Tchétchène -chg=tchaghataï -chi=Chinois -chk=chuuk -chm=mari -chn=jargon chinook -cho=choctaw -chp=chipewyan -chr=cherokee -chu=Slavon liturgique -chv=Tchouvache -chy=cheyenne -cmc=Langue chame -cop=copte -cor=Cornouaillais -cos=Corse -cpe=Créole ou pidgin anglais -cpf=Créole ou pidgin français -cpp=Créole ou pidgin portugais -cre=Cri -crh=tatar de Crimée -crp=Créole ou pidgin -csb=kachoube -cus=Langue couchitique -cze=Tchèque -dak=dakota -dan=Danois -dar=dargwa -day=Dayak -del=delaware -den=esclave -dgr=dogrib -din=dinka -doi=dogri -dra=Langue dravidienne -dsb=bas-sorabe -dua=douala -dum=moyen néerlandais -dut=Néerlandais -dyu=dioula -efi=éfik -egy=égyptien ancien -eka=ékadjouk -elx=élamite -eng=Anglais -enm=moyen anglais -epo=Espéranto -est=Estonien -ewo=éwondo -fan=fang -fao=Féroïen -fat=fanti -fij=Fidjien -fil=filipino -fin=Finnois -fiu=Langue finno-ougrienne -fon=fon -fre=Français -frm=moyen français -fro=ancien français -frr=frison du Nord -frs=frison oriental -fry=Frison occidental -ful=Peul -fur=frioulan -gaa=ga -gay=gayo -gba=gbaya -gem=Langue germanique -geo=Géorgien -ger=Allemand -gez=guèze -gil=gilbertin -gla=Gallois -gle=Irlandais -glg=Galicien -glv=Mannois -gmh=moyen haut-allemand -goh=ancien haut allemand -gon=gondi -gor=gorontalo -got=gotique -grb=grebo -grc=grec ancien -gre=Grec, moderne (1453 -) -gsw=suisse allemand -guj=Goudjarati -gwi=gwichʼin -hai=haida -hat=Haïtien -hau=Haoussa -haw=hawaïen -heb=Hébreu -hil=hiligaynon -hit=hittite -hmn=hmong -hrv=Croate -hsb=haut-sorabe -hun=Hongrois -hup=hupa -iba=iban -ice=Islandais -iii=Yi de Sichuan -ilo=ilocano -inc=Langue indo-aryenne -ind=Indonésien -ine=Langue indo-européenne -inh=ingouche -ira=Langue iranienne -iro=Langue iroquoienne -ita=Italien -jav=Javanais -jbo=lojban -jpn=Japonais -jpr=judéo-persan -jrb=judéo-arabe -kaa=karakalpak -kab=kabyle -kac=kachin -kal=Groenlandais -kam=kamba -kaw=kawi -kbd=kabarde -kha=khasi -khi=Langue khoïsan -khm=Khmer central -kho=khotanais -kir=Kirghize -kmb=kimboundou -kok=konkani -kon=Kikongo -kor=Coréen -kos=kosraéen -kpe=kpellé -krc=karatchaï balkar -krl=carélien -kro=Krou -kru=kouroukh -kua=Kwanyama -kum=koumyk -kur=Kurde -kut=kutenai -lad=ladino -lah=lahnda -lam=lamba -lao=Laotien -lav=Letton -lez=lezghien -lit=Lituanien -lol=mongo -loz=lozi -ltz=Luxembourgeois -lua=luba-kasaï (ciluba) -lui=luiseño -lun=lunda -luo=luo -lus=lushaï -mac=Macédonien -mad=madurais -mag=magahi -mah=Marshallais -mai=maïthili -mak=makassar -man=mandingue -map=Malayo-polynésien -mas=maasaï -may=Malais -mdf=mokcha -mdr=mandar -men=mendé -mga=moyen irlandais -mic=micmac -min=minangkabau -mis=Non codé -mkh=Langue mon-khmère -mlg=Malgache -mlt=Maltais -mnc=mandchou -mni=manipuri -mno=Langue manobo -moh=mohawk -mon=Mongol -mos=moré -mul=multilingue -mun=Langue mounda -mus=creek -mwl=mirandais -mwr=marwarî -myn=Langue maya -myv=erzya -nai=Langue amérindienne du Nord -nap=napolitain -nau=Nauruan -nbl=Ndebele, Sud -nde=Ndebele, nord -nds=bas-allemand -nep=Népalais -new=newari -nia=niha -nic=Niger-kordofanian -niu=niuéen -nno=Norvégien nynorsk -nob=Bokmal, Norvégien -nog=nogaï -non=vieux norrois -nor=Norvégien -nqo=n’ko -nso=sotho du Nord -nub=Langue nubienne -nwc=newarî classique -nym=nyamwezi -nyn=nyankolé -nyo=nyoro -nzi=nzema -oci=Occitan (après 1500) -osa=osage -oss=Ossète -ota=turc ottoman -oto=Langue otomangue -paa=Langue papoue -pag=pangasinan -pal=pahlavi -pam=pampangan -pap=papiamento -pau=palau -peo=persan ancien -per=Persan -phi=Langue philippine -phn=phénicien -pol=Polonais -pon=pohnpei -por=Portugais -pra=Langues prâkrit -pro=provençal ancien -pus=Pushto ; Pashto -raj=rajasthani -rap=rapanui -rar=rarotongien -roa=Langue romane -roh=Romanche -rom=romani -rum=Roumain -rup=aroumain -rus=Russe -sad=sandawe -sah=iakoute -sai=Langue amérindienne du Sud -sal=Langue salishenne -sam=araméen samaritain -san=Sanscrit -sas=sasak -sat=santali -scn=sicilien -sco=écossais -sel=selkoupe -sem=Langue sémitique -sga=ancien irlandais -sgn=Langue des signes -shn=shan -sid=sidamo -sio=Langue sioux -sit=Sino-tibétain -sla=Langue slave -slo=Slovaque -slv=Slovène -sma=same du Sud -sme=Sami du Nord -smi=Langue samie -smj=same de Lule -smn=same d’Inari -sms=same skolt -snk=soninké -sog=sogdien -sot=Sotho, sud -spa=Espagnol -srd=Sarde -srn=sranan tongo -srp=Serbe -srr=sérère -ssa=Langue nilo-saharienne -suk=soukouma -sun=Soundanais -sus=soussou -sux=sumérien -swa=Souahéli -swe=Suédois -syc=syriaque classique -syr=syriaque -tah=Tahitien -tai=Langue taï -tam=Tamoul -tel=Télougou -tem=timné -ter=tereno -tet=tétoum -tgk=Tadjik -tha=Thaï -tib=Tibétain -tig=tigré -tir=Tigrigna -tiv=tiv -tkl=tokelau -tlh=klingon -tli=tlingit -tmh=tamacheq -tog=tonga nyasa -ton=Tonga (Iles Tonga) -tpi=tok pisin -tsi=tsimshian -tuk=Turkmène -tum=tumbuka -tup=Langue tupi -tur=Turc -tut=Langue altaïque -tvl=tuvalu -tyv=touvain -udm=oudmourte -uga=ougaritique -uig=Ouïgour -ukr=Ukrainien -umb=umbundu -und=langue indéterminée -urd=Ourdou -uzb=Ouzbek -vai=vaï -vie=Vietnamien -vol=Volapuk -vot=vote -wak=Langues wakashennes -wal=walamo -war=waray -was=washo -wel=Gallois -wen=Langue sorabe -wln=Wallon -xal=kalmouk -yao=yao -yap=yapois -ypk=Langues yupik -zap=zapotèque -zbl=symboles Bliss -zen=zenaga -zul=Zoulou -zun=zuñi -zxx=sans contenu linguistique -zza=zazaki - -# script names -# key is ISO 15924 script code - -Arab=arabe -Armi=araméen impérial -Armn=arménien -Avst=avestique -Bali=balinais -Bamu=Bamoun -Batk=batak -Beng=bengali -Blis=symboles Bliss -Bopo=bopomofo -Brah=brâhmî -Brai=braille -Bugi=bouguis -Buhd=bouhide -Cakm=chakma -Cans=syllabaire autochtone canadien unifié -Cari=carien -Cham=cham -Cher=cherokee -Cirt=cirth -Copt=copte -Cprt=syllabaire chypriote -Cyrl=cyrillique -Cyrs=cyrillique (variante slavonne) -Deva=dévanagari -Dsrt=déséret -Dupl=Sténographie Duployé -Egyd=démotique égyptien -Egyh=hiératique égyptien -Egyp=hiéroglyphes égyptiens -Ethi=éthiopique -Geok=géorgien khoutsouri -Geor=géorgien -Glag=glagolitique -Goth=gotique -Grek=grec -Gujr=goudjarâtî -Guru=gourmoukhî -Hang=hangûl -Hani=sinogrammes -Hano=hanounóo -Hans=simplifié -Hant=traditionnel -Hebr=hébreu -Hira=hiragana -Hmng=pahawh hmong -Hrkt=katakana ou hiragana -Hung=ancien hongrois -Inds=indus -Ital=ancien italique -Java=javanais -Jpan=japonais -Kali=kayah li -Kana=katakana -Khar=kharochthî -Khmr=khmer -Knda=kannara -Kore=coréen -Kthi=kaithî -Lana=lanna -Laoo=lao -Latf=latin (variante brisée) -Latg=latin (variante gaélique) -Latn=latin -Lepc=lepcha -Limb=limbou -Lina=linéaire A -Linb=linéaire B -Lisu=Lisu -Lyci=lycien -Lydi=lydien -Mand=mandéen -Mani=manichéen -Maya=hiéroglyphes mayas -Mend=Mendé -Merc=Cursive méroïtique -Mero=méroïtique -Mlym=malayalam -Mong=mongol -Moon=moon -Mtei=meitei mayek -Mymr=birman -Narb=Arabe ancien du Nord -Nbat=Nabatéen -Nkgb=Nakhi Geba -Nkoo=n’ko -Ogam=ogam -Olck=ol tchiki -Orkh=orkhon -Orya=odia -Osma=osmanais -Palm=Palmyréen -Perm=ancien permien -Phag=phags pa -Phli=pehlevi des inscriptions -Phlp=pehlevi des psautiers -Phlv=pehlevi des livres -Phnx=phénicien -Plrd=phonétique de Pollard -Prti=parthe des inscriptions -Rjng=rejang -Roro=rongorongo -Runr=runique -Samr=samaritain -Sara=sarati -Sarb=Arabe ancien du Sud -Saur=saurashtra -Sgnw=écriture des signes -Shaw=shavien -Sind=Sindhi -Sinh=cingalais -Sund=sundanais -Sylo=sylotî nâgrî -Syrc=syriaque -Syre=syriaque estranghélo -Syrj=syriaque occidental -Syrn=syriaque oriental -Tagb=tagbanoua -Tale=taï-le -Talu=nouveau taï-lue -Taml=tamoul -Tavt=taï viêt -Telu=télougou -Teng=tengwar -Tfng=tifinagh -Tglg=tagal -Thaa=thâna -Thai=thaï -Tibt=tibétain -Ugar=ougaritique -Vaii=vaï -Visp=parole visible -Wara=Warang Citi -Xpeo=cunéiforme persépolitain -Xsux=cunéiforme suméro-akkadien -Yiii=yi -Zinh=hérité -Zmth=notation mathématique -Zsym=symboles -Zxxx=non écrit -Zyyy=commun -Zzzz=écriture inconnue - -# country names -# key is ISO 3166 country code - -AD=Andorre -AE=Émirats arabes unis -AG=Antigua-et-Barbuda -AL=Albanie -AM=Arménie -AN=Antilles Néerlandaises -AQ=Antarctique -AR=Argentine -AS=Samoa américaines -AT=Autriche -AU=Australie -AX=Îles Åland -AZ=Azerbaïdjan -BA=Bosnie-Herzégovine -BB=Barbade -BE=Belgique -BG=Bulgarie -BH=Bahreïn -BJ=Bénin -BM=Bermudes -BO=Bolivie -BR=Brésil -BT=Bhoutan -BV=Île Bouvet -BY=Biélorussie -CC=Îles Cocos -CD=Congo-Kinshasa -CF=République centrafricaine -CG=Congo-Brazzaville -CH=Suisse -CK=Îles Cook -CL=Chili -CM=Cameroun -CN=Chine -CO=Colombie -CS=Serbie et Monténégro -CV=Cap-Vert -CX=Île Christmas -CY=Chypre -CZ=Tchéquie -DE=Allemagne -DK=Danemark -DM=Dominique -DO=République dominicaine -DZ=Algérie -EC=Équateur -EE=Estonie -EG=Égypte -EH=Sahara occidental -ER=Érythrée -ES=Espagne -ET=Éthiopie -FI=Finlande -FJ=Fidji -FK=Îles Malouines -FM=Micronésie -FO=Îles Féroé -GB=Royaume-Uni -GD=Grenade -GE=Géorgie -GF=Guyane française -GL=Groenland -GM=Gambie -GN=Guinée -GQ=Guinée équatoriale -GR=Grèce -GS=Géorgie du Sud-et-les Îles Sandwich du Sud -GW=Guinée-Bissau -HK=R.A.S. chinoise de Hong Kong -HM=Îles Heard-et-MacDonald -HR=Croatie -HT=Haïti -HU=Hongrie -ID=Indonésie -IE=Irlande -IL=Israël -IN=Inde -IO=Territoire britannique de l’océan Indien -IQ=Irak -IS=Islande -IT=Italie -JM=Jamaïque -JO=Jordanie -JP=Japon -KG=Kirghizstan -KH=Cambodge -KM=Comores -KN=Saint-Christophe-et-Niévès -KP=Corée du Nord -KR=Corée du Sud -KW=Koweït -KY=Îles Caïmans -LB=Liban -LC=Sainte-Lucie -LT=Lituanie -LV=Lettonie -LY=Libye -MA=Maroc -MD=Moldavie -ME=Monténégro -MH=Îles Marshall -MK=Macédoine du Nord -MM=Myanmar (Birmanie) -MN=Mongolie -MO=R.A.S. chinoise de Macao -MP=Îles Mariannes du Nord -MR=Mauritanie -MT=Malte -MU=Maurice -MX=Mexique -MY=Malaisie -NA=Namibie -NC=Nouvelle-Calédonie -NF=Île Norfolk -NL=Pays-Bas -NO=Norvège -NP=Népal -NZ=Nouvelle-Zélande -PE=Pérou -PF=Polynésie française -PG=Papouasie-Nouvelle-Guinée -PL=Pologne -PM=Saint-Pierre-et-Miquelon -PN=Îles Pitcairn -PR=Porto Rico -PS=Territoires palestiniens -PW=Palaos -RE=La Réunion -RO=Roumanie -RS=Serbie -RU=Russie -SA=Arabie saoudite -SB=Îles Salomon -SD=Soudan -SE=Suède -SG=Singapour -SH=Sainte-Hélène -SI=Slovénie -SJ=Svalbard et Jan Mayen -SK=Slovaquie -SM=Saint-Marin -SN=Sénégal -SO=Somalie -ST=Sao Tomé-et-Principe -SV=Salvador -SY=Syrie -TC=Îles Turques-et-Caïques -TD=Tchad -TF=Terres australes françaises -TH=Thaïlande -TJ=Tadjikistan -TL=Timor oriental -TM=Turkménistan -TN=Tunisie -TR=Turquie -TT=Trinité-et-Tobago -TW=Taïwan -TZ=Tanzanie -UG=Ouganda -UM=Îles mineures éloignées des États-Unis -US=États-Unis -UZ=Ouzbékistan -VA=État de la Cité du Vatican -VC=Saint-Vincent-et-les Grenadines -VG=Îles Vierges britanniques -VI=Îles Vierges des États-Unis -VN=Viêt Nam -WF=Wallis-et-Futuna -YE=Yémen -ZA=Afrique du Sud -ZM=Zambie - -# territory names -# key is UN M.49 country and area code - -001=Monde -002=Afrique -003=Amérique du Nord -005=Amérique du Sud -009=Océanie -011=Afrique occidentale -013=Amérique centrale -014=Afrique orientale -015=Afrique septentrionale -017=Afrique centrale -018=Afrique australe -019=Amériques -021=Amérique septentrionale -029=Caraïbes -030=Asie de l’Est -034=Asie du Sud -035=Asie du Sud-Est -039=Europe du Sud -053=Australasie -054=Mélanésie -057=région micronésienne -061=Polynésie -142=Asie -143=Asie centrale -145=Asie de l’Ouest -151=Europe de l’Est -154=Europe du Nord -155=Europe de l’Ouest -419=Amérique latine diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties deleted file mode 100644 index 1f618289ecc..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties +++ /dev/null @@ -1,375 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ab=Abcáisis -ae=Aivéistis -af=Afracáinis -ar=Araibis -as=Asaimis -az=Asarbaiseáinis -ba=Baiscíris -be=Bealarúisis -bg=Bulgáiris -bn=Beangáilis -bo=Tibéidis -br=Briotáinis -bs=Boisnis -ca=Catalóinis -ce=Seisnis -co=Corsaicis -cr=Craís -cs=Seicis -cu=Slavais na hEaglaise -cv=Suvaisis -cy=Breatnais -da=Danmhairgis -de=Gearmáinis -el=Gréigis -en=Béarla -es=Spáinnis -et=Eastóinis -eu=Bascais -fa=Peirsis -fi=Fionlainnis -fj=Fidsis -fo=Faróis -fr=Fraincis -fy=Freaslainnis Iartharach -ga=Gaeilge -gd=Gaeilge na hAlban -gu=Gúisearáitis -gv=Manainnis -he=Eabhrais -hi=Hiondúis -hr=Cróitis -hu=Ungáiris -hy=Airméinis -id=Indinéisis -in=Indinéisis -is=Íoslainnis -it=Iodáilis -iu=Ionúitis -iw=Eabhrais -ja=Seapáinis -ji=Giúdais -jv=Iáivis -ka=Seoirsis -kk=Casaicis -kn=Cannadais -ko=Cóiréis -ks=Caismíris -kw=Coirnis -ky=Cirgisis -la=Laidin -lb=Lucsambuirgis -lo=Laoisis -lt=Liotuáinis -lv=Laitvis -mg=Malagáisis -mi=Maorais -mk=Macadóinis -ml=Mailéalaimis -mn=Mongóilis -mo=Moldáivis -mr=Maraitis -mt=Máltais -my=Burmais -na=Nárúis -nb=Bocmál -ne=Neipeailis -nl=Ollainnis -nn=Nua-Ioruais -no=Ioruais -nv=Navachóis -oc=Ocsatáinis -os=Oiséitis -pa=Puinseáibis -pl=Polainnis -ps=Paistis -pt=Portaingéilis -qu=Ceatsuais -ro=Rómáinis -ru=Rúisis -sa=Sanscrait -sc=Sairdínis -sd=Sindis -se=Sáimis an Tuaiscirt -sk=Slóvaicis -sl=Slóivéinis -sm=Samóis -so=Somáilis -sq=Albáinis -sr=Seirbis -sv=Sualainnis -sw=Svahaílis -ta=Tamailis -th=Téalainnis -tl=Tagálaigis -tr=Tuircis -tt=Tatairis -ty=Taihítis -uk=Úcráinis -ur=Urdúis -uz=Úisbéiceastáinis -vi=Vítneaimis -wa=Vallúnais -yi=Giúdais -zh=Sínis -zu=Súlúis -AD=Andóra -AE=Aontas na nÉimíríochtaí Arabacha -AF=an Afganastáin -AG=Antigua agus Barbúda -AL=an Albáin -AM=an Airméin -AN=Antillí na hÍsiltíre -AO=Angóla -AQ=Antartaice -AR=an Airgintín -AS=Samó Mheiriceá -AT=an Ostair -AU=an Astráil -AZ=an Asarbaiseáin -BA=an Bhoisnia agus an Heirseagaivéin -BB=Barbadós -BD=an Bhanglaidéis -BE=an Bheilg -BF=Buircíne Fasó -BG=an Bhulgáir -BH=Bairéin -BI=an Bhurúin -BJ=Beinin -BM=Beirmiúda -BN=Brúiné -BO=an Bholaiv -BR=an Bhrasaíl -BS=na Bahámaí -BT=an Bhútáin -BV=Oileán Bouvet -BW=an Bhotsuáin -BY=an Bhealarúis -BZ=an Bheilís -CA=Ceanada -CC=Oileáin Cocos (Keeling) -CD=Poblacht Dhaonlathach an Chongó -CF=Poblacht na hAfraice Láir -CG=Congó-Brazzaville -CH=an Eilvéis -CI=an Cósta Eabhair -CK=Oileáin Cook -CL=an tSile -CM=Camarún -CN=an tSín -CO=an Cholóim -CR=Cósta Ríce -CU=Cúba -CV=Rinn Verde -CX=Oileán na Nollag -CY=an Chipir -CZ=an tSeicia -DE=an Ghearmáin -DK=an Danmhairg -DM=Doiminice -DO=an Phoblacht Dhoiminiceach -DZ=an Ailgéir -EC=Eacuadór -EE=an Eastóin -EG=an Éigipt -EH=an Sahára Thiar -ES=an Spáinn -ET=an Aetóip -FI=an Fhionlainn -FJ=Fidsí -FK=Oileáin Fháclainne -FM=an Mhicrinéis -FO=Oileáin Fharó -FR=an Fhrainc -GA=an Ghabúin -GB=an Ríocht Aontaithe -GE=an tSeoirsia -GF=Guáin na Fraince -GH=Gána -GI=Giobráltar -GL=an Ghraonlainn -GM=an Ghaimbia -GN=an Ghuine -GP=Guadalúip -GQ=an Ghuine Mheánchiorclach -GR=an Ghréig -GS=an tSeoirsia Theas agus Oileáin Sandwich Theas -GT=Guatamala -GW=Guine Bissau -GY=an Ghuáin -HM=Oileán Heard agus Oileáin McDonald -HN=Hondúras -HR=an Chróit -HT=Háítí -HU=an Ungáir -ID=an Indinéis -IE=Éire -IL=Iosrael -IN=an India -IO=Críoch Aigéan Indiach na Breataine -IQ=an Iaráic -IR=an Iaráin -IS=an Íoslainn -IT=an Iodáil -JM=Iamáice -JO=an Iordáin -JP=an tSeapáin -KE=an Chéinia -KG=an Chirgeastáin -KH=an Chambóid -KI=Ciribeas -KM=Oileáin Chomóra -KN=San Críostóir-Nimheas -KP=an Chóiré Thuaidh -KR=an Chóiré Theas -KW=Cuáit -KY=Oileáin Cayman -KZ=an Chasacstáin -LB=an Liobáin -LI=Lichtinstéin -LK=Srí Lanca -LR=an Libéir -LS=Leosóta -LT=an Liotuáin -LU=Lucsamburg -LV=an Laitvia -LY=an Libia -MA=Maracó -MC=Monacó -MD=an Mholdóiv -MH=Oileáin Marshall -MK=an Mhacadóin Thuaidh -ML=Mailí -MM=Maenmar (Burma) -MN=an Mhongóil -MP=na hOileáin Mháirianacha Thuaidh -MR=an Mháratáin -MS=Montsarat -MT=Málta -MU=Oileán Mhuirís -MV=Oileáin Mhaildíve -MW=an Mhaláiv -MX=Meicsiceo -MY=an Mhalaeisia -MZ=Mósaimbíc -NA=an Namaib -NC=an Nua-Chaladóin -NE=an Nígir -NF=Oileán Norfolk -NG=an Nigéir -NI=Nicearagua -NL=an Ísiltír -NO=an Iorua -NP=Neipeal -NR=Nárú -NZ=an Nua-Shéalainn -PE=Peiriú -PF=Polainéis na Fraince -PG=Nua-Ghuine Phapua -PH=na hOileáin Fhilipíneacha -PK=an Phacastáin -PL=an Pholainn -PM=San Pierre agus Miquelon -PR=Pórtó Ríce -PS=na Críocha Palaistíneacha -PT=an Phortaingéil -PY=Paragua -QA=Catar -RE=La Réunion -RO=an Rómáin -RU=an Rúis -RW=Ruanda -SA=an Araib Shádach -SB=Oileáin Sholaimh -SC=na Séiséil -SD=an tSúdáin -SE=an tSualainn -SG=Singeapór -SH=San Héilin -SI=an tSlóivéin -SJ=Svalbard agus Jan Mayen -SK=an tSlóvaic -SL=Siarra Leon -SM=San Mairíne -SN=an tSeineagáil -SO=an tSomáil -SR=Suranam -ST=São Tomé agus Príncipe -SV=an tSalvadóir -SY=an tSiria -SZ=eSuaitíní -TC=Oileáin na dTurcach agus Caicos -TD=Sead -TF=Críocha Francacha Dheisceart an Domhain -TG=Tóga -TH=an Téalainn -TJ=an Táidsíceastáin -TK=Tócalá -TL=Tíomór Thoir -TM=an Tuircméanastáin -TN=an Túinéis -TR=an Tuirc -TT=Oileán na Tríonóide agus Tobága -TV=Túvalú -TW=an Téaváin -TZ=an Tansáin -UA=an Úcráin -UM=Oileáin Imeallacha S.A.M. -US=Stáit Aontaithe Mheiriceá -UY=Uragua -UZ=an Úisbéiceastáin -VA=Cathair na Vatacáine -VC=San Uinseann agus na Greanáidíní -VE=Veiniséala -VG=Oileáin Bhriotanacha na Maighdean -VI=Oileáin Mheiriceánacha na Maighdean -VN=Vítneam -VU=Vanuatú -WF=Vailís agus Futúna -WS=Samó -YE=Éimin -ZA=an Afraic Theas -ZM=an tSaimbia -ZW=an tSiombáib diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties deleted file mode 100644 index cacc48a31e6..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -iw=עברית - -# country names -# key is ISO 3166 country code - -IL=ישראל diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties deleted file mode 100644 index 675c89875f2..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -hi=हिन्दी -en=अंग्रेज़ी - -# country names -# key is ISO 3166 country code - -IN=भारत -US=संयुक्त राज्य diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties deleted file mode 100644 index 5c7064d75a4..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -hr=hrvatski - -# country names -# key is ISO 3166 country code - -HR=Hrvatska diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties deleted file mode 100644 index 7e6994672eb..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -hu=magyar - -# country names -# key is ISO 3166 country code - -HU=Magyarország diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_id.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_id.properties deleted file mode 100644 index 41574e7ee00..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_id.properties +++ /dev/null @@ -1,183 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ab=Abkhaz -am=Amharik -ar=Arab -as=Assam -av=Avar -be=Belarusia -bg=Bulgaria -bn=Bengali -bo=Tibet -bs=Bosnia -co=Korsika -cs=Cheska -da=Dansk -de=Jerman -el=Yunani -en=Inggris -es=Spanyol -fa=Persia -fi=Suomi -fj=Fiji -fo=Faroe -fr=Prancis -fy=Frisia Barat -ga=Irlandia -gd=Gaelik Skotlandia -he=Ibrani -hr=Kroasia -hu=Hungaria -hy=Armenia -id=Indonesia -in=Indonesia -iw=Ibrani -jv=Jawa -ko=Korea -ks=Kashmir -ku=Kurdi -lb=Luksemburg -li=Limburgia -lt=Lituavi -mg=Malagasi -mh=Marshall -my=Burma -nl=Belanda -os=Ossetia -pt=Portugis -rm=Reto-Roman -su=Sunda -sv=Swedia -zh=Tionghoa -AE=Uni Emirat Arab -AG=Antigua dan Barbuda -AN=Antilles Belanda -AQ=Antarktika -AS=Samoa Amerika -BA=Bosnia dan Herzegovina -BE=Belgia -BV=Pulau Bouvet -CA=Kanada -CC=Kepulauan Cocos (Keeling) -CD=Kongo - Kinshasa -CF=Republik Afrika Tengah -CG=Kongo - Brazzaville -CH=Swiss -CK=Kepulauan Cook -CL=Cile -CM=Kamerun -CN=Tiongkok -CO=Kolombia -CR=Kosta Rika -CU=Kuba -CV=Tanjung Verde -CX=Pulau Natal -CY=Siprus -CZ=Ceko -DE=Jerman -DJ=Jibuti -DM=Dominika -DO=Republik Dominika -EC=Ekuador -EG=Mesir -EH=Sahara Barat -ES=Spanyol -FI=Finlandia -FK=Kepulauan Falkland -FM=Mikronesia -FO=Kepulauan Faroe -FR=Prancis -GB=Inggris Raya -GF=Guyana Prancis -GQ=Guinea Ekuatorial -GR=Yunani -GS=Georgia Selatan & Kep. Sandwich Selatan -HK=Hong Kong DAK Tiongkok -HM=Pulau Heard dan Kepulauan McDonald -HR=Kroasia -HU=Hungaria -IE=Irlandia -IS=Islandia -IT=Italia -JM=Jamaika -JO=Yordania -JP=Jepang -KH=Kamboja -KM=Komoro -KN=Saint Kitts dan Nevis -KP=Korea Utara -KR=Korea Selatan -KY=Kepulauan Cayman -LC=Saint Lucia -MA=Maroko -MG=Madagaskar -MH=Kepulauan Marshall -MO=Makau DAK Tiongkok -MP=Kepulauan Mariana Utara -NC=Kaledonia Baru -NF=Kepulauan Norfolk -NO=Norwegia -NZ=Selandia Baru -PF=Polinesia Prancis -PG=Papua Nugini -PH=Filipina -PL=Polandia -PM=Saint Pierre dan Miquelon -PR=Puerto Riko -PS=Wilayah Palestina -RU=Rusia -SA=Arab Saudi -SB=Kepulauan Solomon -SG=Singapura -SJ=Kepulauan Svalbard dan Jan Mayen -ST=Sao Tome dan Principe -TT=Trinidad dan Tobago -UA=Ukraina -US=Amerika Serikat -VA=Vatikan -VC=Saint Vincent dan Grenadine -VG=Kepulauan Virgin Britania Raya -VI=Kepulauan Virgin Amerika Serikat -WF=Kepulauan Wallis dan Futuna -YE=Yaman -ZA=Afrika Selatan diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties deleted file mode 100644 index 7a54412ca5b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -is=íslenska - -# country names -# key is ISO 3166 country code - -IS=Ísland diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties deleted file mode 100644 index 0b95f60818b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties +++ /dev/null @@ -1,932 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=afar -ab=abcaso -ae=avestan -af=afrikaans -ak=akan -am=amarico -an=aragonese -ar=arabo -as=assamese -av=avaro -ay=aymara -az=azerbaigiano -ba=baschiro -be=bielorusso -bg=bulgaro -bh=bihari -bi=bislama -bm=bambara -bn=bengalese -bo=tibetano -br=bretone -bs=bosniaco -ca=catalano -ce=ceceno -ch=chamorro -co=corso -cr=cree -cs=ceco -cu=slavo ecclesiastico -cv=ciuvascio -cy=gallese -da=danese -de=tedesco -dv=divehi -dz=dzongkha -ee=ewe -el=greco -en=inglese -eo=esperanto -es=spagnolo -et=estone -eu=basco -fa=persiano -ff=fulah -fi=finlandese -fj=figiano -fo=faroese -fr=francese -fy=frisone occidentale -ga=irlandese -gd=gaelico scozzese -gl=galiziano -gn=guaraní -gu=gujarati -gv=mannese -ha=hausa -he=ebraico -hi=hindi -ho=hiri motu -hr=croato -ht=creolo haitiano -hu=ungherese -hy=armeno -hz=herero -ia=interlingua -id=indonesiano -ie=interlingue -ig=igbo -ii=sichuan yi -ik=inupiak -in=indonesiano -io=ido -is=islandese -it=italiano -iu=inuktitut -iw=ebraico -ja=giapponese -ji=yiddish -jv=giavanese -ka=georgiano -kg=kongo -ki=kikuyu -kj=kuanyama -kk=kazako -kl=groenlandese -km=khmer -kn=kannada -ko=coreano -kr=kanuri -ks=kashmiri -ku=curdo -kv=komi -kw=cornico -ky=kirghiso -la=latino -lb=lussemburghese -lg=ganda -li=limburghese -ln=lingala -lo=lao -lt=lituano -lu=luba-katanga -lv=lettone -mg=malgascio -mh=marshallese -mi=maori -mk=macedone -ml=malayalam -mn=mongolo -mo=moldavo -mr=marathi -ms=malese -mt=maltese -my=birmano -na=nauru -nb=norvegese bokmål -nd=ndebele del nord -ne=nepalese -ng=ndonga -nl=olandese -nn=norvegese nynorsk -no=norvegese -nr=ndebele del sud -nv=navajo -ny=nyanja -oc=occitano -oj=ojibwa -om=oromo -or=odia -os=ossetico -pa=punjabi -pi=pali -pl=polacco -ps=pashto -pt=portoghese -qu=quechua -rm=romancio -rn=rundi -ro=rumeno -ru=russo -rw=kinyarwanda -sa=sanscrito -sc=sardo -sd=sindhi -se=sami del nord -sg=sango -si=singalese -sk=slovacco -sl=sloveno -sm=samoano -sn=shona -so=somalo -sq=albanese -sr=serbo -ss=swati -st=sotho del sud -su=sundanese -sv=svedese -sw=swahili -ta=tamil -te=telugu -tg=tagico -th=thai -ti=tigrino -tk=turcomanno -tl=tagalog -tn=tswana -to=tongano -tr=turco -ts=tsonga -tt=tataro -tw=ci -ty=taitiano -ug=uiguro -uk=ucraino -ur=urdu -uz=uzbeco -ve=venda -vi=vietnamita -vo=volapük -wa=vallone -wo=wolof -xh=xhosa -yi=yiddish -yo=yoruba -za=zhuang -zh=cinese -zu=zulu - -# key is ISO 639.2 language code -abk=Abkhaso -ace=accinese -ach=acioli -ada=adangme -ady=adyghe -afa=Lingua afroasiatica -afh=afrihili -ain=ainu -akk=accado -alb=Albanese -ale=aleuto -alg=Lingue algonchine -alt=altai meridionale -amh=Amarico -ang=inglese antico -anp=angika -apa=Lingue apache -ara=Arabo -arc=aramaico -arm=Armeno -arn=mapudungun -arp=arapaho -art=Lingua artificiale -arw=aruaco -ast=asturiano -ath=Lingue Athapascan -aus=Australiano -ava=Avaro -ave=Avestano -awa=awadhi -aze=Azero -bai=Lingue bamileke -bak=Baschiro -bal=beluci -ban=balinese -baq=Basco -bas=basa -bat=Lingua baltica -bej=begia -bel=Bielorusso -bem=wemba -ben=Bengalese -ber=Berbero -bho=bhojpuri -bik=bicol -bin=bini -bla=siksika -bos=Bosniaco -bra=braj -bre=Bretone -bua=buriat -bug=bugi -bul=Bulgaro -bur=Birmano -byn=blin -cad=caddo -cai=Lingua indiana dell'America centrale -car=caribico -cat=Catalano -cau=Lingua caucasica -ceb=cebuano -cel=Lingua celtica -chb=chibcha -che=Ceceno -chg=ciagataico -chi=Cinese -chk=chuukese -chm=mari -chn=gergo chinook -cho=choctaw -chp=chipewyan -chr=cherokee -chu=Slavo ecclesiastico -chy=cheyenne -cmc=Lingue chamic -cop=copto -cor=Cornico -cos=Corso -cpe=Creolo e pidgin basato sull'inglese -cpf=Creolo e pidgin basato sul francese -cpp=Creolo e pidgin basato sul portoghese -crh=turco crimeo -crp=Creolo e pidgin -csb=kashubian -cus=Lingua cuscitica -cze=Ceco -dak=dakota -dan=Danese -dar=dargwa -del=delaware -den=slave -dgr=dogrib -din=dinca -doi=dogri -dra=Lingua dravidica -dsb=basso sorabo -dua=duala -dum=olandese medio -dut=Olandese -dyu=diula -efi=efik -egy=egiziano antico -eka=ekajuka -elx=elamitico -eng=Inglese -enm=inglese medio -est=Estone -ewo=ewondo -fan=fang -fat=fanti -fij=Figiano -fil=filippino -fin=Finlandese -fiu=Lingua ungrofinnica -fon=fon -fre=Francese -frm=francese medio -fro=francese antico -frr=frisone settentrionale -frs=frisone orientale -fry=Frisone occidentale -fur=friulano -gaa=ga -gay=gayo -gba=gbaya -gem=Lingua germanica -geo=Georgiano -ger=Tedesco -gez=geez -gil=gilbertese -gla=Gaelico -gle=Irlandese -glg=Galiziano -gmh=tedesco medio alto -goh=tedesco antico alto -gon=gondi -gor=gorontalo -got=gotico -grb=grebo -grc=greco antico -gre=Greco moderno (dal 1453) -grn=Guaranì -gsw=tedesco svizzero -gwi=gwichʼin -hai=haida -hat=Haitiano -haw=hawaiano -heb=Ebraico -hil=ilongo -hit=hittite -hmn=hmong -hrv=Croato -hsb=alto sorabo -hun=Ungherese -hup=hupa -iba=iban -ice=Islandese -ilo=ilocano -ina=Interlingua (Associazione internazionale per la lingua ausiliaria) -inc=Lingua indiana -ind=Indonesiano -ine=Lingua indoeuropea -inh=ingush -ira=Iraniano -iro=Lingue irochesi -ita=Italiano -jav=Giavanese -jbo=lojban -jpn=Giapponese -jpr=giudeo persiano -jrb=giudeo arabo -kaa=kara-kalpak -kab=cabilo -kac=kachin -kam=kamba -kaw=kawi -kaz=Kazako -kbd=cabardino -kha=khasi -khi=Lingua khoisan -khm=Khmer centrale -kho=khotanese -kir=Kirghiso -kmb=kimbundu -kok=konkani -kor=Coreano -kos=kosraean -kpe=kpelle -krc=karachay-Balkar -krl=careliano -kru=kurukh -kum=kumyk -kur=Curdo -kut=kutenai -lad=giudeo-spagnolo -lah=lahnda -lam=lamba -lat=Latino -lav=Lettone -lez=lesgo -lim=Limburgese -lit=Lituano -lol=lolo bantu -loz=lozi -ltz=Lussemburghese -lua=luba-lulua -lui=luiseno -lun=lunda -luo=luo -lus=lushai -mac=Macedone -mad=madurese -mag=magahi -mai=maithili -mak=makasar -man=mandingo -map=Austronesiano -mas=masai -may=Malese -mdf=moksha -mdr=mandar -men=mende -mga=irlandese medio -mic=micmac -min=menangkabau -mis=Lingue non codificate -mkh=Lingua mon-khmer -mlg=Malgascio -mnc=manchu -mni=manipuri -moh=mohawk -mon=Mongolo -mos=mossi -mul=multilingua -mun=Lingua munda -mus=creek -mwl=mirandese -mwr=marwari -myn=Lingue maya -myv=erzya -nai=Lingua indiana del Nord America -nap=napoletano -nau=Nauruano -nbl=Ndebele del sud -nde=Ndebele del nord -nds=basso tedesco -nep=Nepalese -new=newari -nia=nias -nic=Lingua niger-cordofan -niu=niue -nno=Norvegese nynorsk -nob=Norvegese bokmål -nog=nogai -non=norse antico -nor=Norvegese -nqo=n’ko -nso=sotho del nord -nub=Nubiano -nwc=newari classico -nym=nyamwezi -nyn=nyankole -nyo=nyoro -nzi=nzima -oci=Occitano (dopo il 1500) -osa=osage -oss=Ossetico -ota=turco ottomano -oto=Lingue otomi -paa=Lingua papuana -pag=pangasinan -pal=pahlavi -pam=pampanga -pan=Punjabi -pap=papiamento -pau=palau -peo=persiano antico -per=Persiano -phi=Lingua filippina -phn=fenicio -pol=Polacco -pon=ponape -por=Portoghese -pra=Pracrito -pro=provenzale antico -raj=rajasthani -rap=rapanui -rar=rarotonga -roa=Lingua romanza -roh=Romancio -rom=romani -rum=Romeno -run=Kirundi -rup=arumeno -rus=Russo -sad=sandawe -sah=sacha -sai=Lingua indiana del Sud America -sal=Lingue salish -sam=aramaico samaritano -san=Sanscrito -sas=sasak -sat=santali -scn=siciliano -sco=scozzese -sel=selkup -sem=Lingua semitica -sga=irlandese antico -sgn=Lingua dei segni -shn=shan -sid=sidamo -sin=Singalese -sio=Lingue sioux -sit=Lingua sino-tibetana -sla=Lingua slava -slo=Slovacco -slv=Sloveno -sma=sami del sud -sme=Sami del nord -smj=sami di Lule -smn=sami di Inari -smo=Samoano -sms=sami skolt -snk=soninke -sog=sogdiano -som=Somalo -sot=Sotho del sud -spa=Spagnolo -srd=Sardo -srn=sranan tongo -srp=Serbo -srr=serer -ssa=Lingua nilo-sahariana -suk=sukuma -sus=susu -sux=sumero -swe=Svedese -syc=siriaco classico -syr=siriaco -tah=Taitiano -tat=Tataro -tem=temne -ter=tereno -tet=tetum -tgk=Tagiko -tha=Tailandese -tib=Tibetano -tig=tigre -tiv=tiv -tkl=tokelau -tlh=klingon -tli=tlingit -tmh=tamashek -tog=nyasa del Tonga -ton=Tonga (Isole Tonga) -tpi=tok pisin -tsi=tsimshian -tuk=Turkmeno -tum=tumbuka -tup=Lingue tupi -tur=Turco -tut=Lingua altaica -tvl=tuvalu -tyv=tuvinian -udm=udmurt -uga=ugaritico -uig=Uiguro -ukr=Ucraino -umb=mbundu -und=lingua imprecisata -uzb=Uzbeko -vai=vai -vie=Vietnamita -vol=Volapuk -vot=voto -wak=Lingue wakash -wal=walamo -war=waray -was=washo -wel=Gallese -wen=Sorabo -wln=Vallone -xal=kalmyk -yao=yao (bantu) -yap=yapese -ypk=Lingue Yupik -zap=zapotec -zbl=blissymbol -zen=zenaga -zun=zuni -zxx=nessun contenuto linguistico -zza=zaza - -# script names -# key is ISO 15924 script code - -Arab=arabo -Armi=aramaico imperiale -Armn=armeno -Avst=avestico -Bali=balinese -Bamu=bamum -Batk=batak -Beng=bengalese -Blis=simboli bliss -Bopo=bopomofo -Brah=brahmi -Brai=braille -Bugi=buginese -Buhd=buhid -Cakm=chakma -Cans=simboli aborigeni canadesi unificati -Cari=carian -Cham=cham -Cher=cherokee -Cirt=cirth -Copt=copto -Cprt=cipriota -Cyrl=cirillico -Cyrs=cirillico antica chiesa slavonica -Deva=devanagari -Dsrt=deseret -Dupl=stenografia duployan -Egyd=egiziano demotico -Egyh=ieratico egiziano -Egyp=geroglifici egiziani -Ethi=etiope -Geok=kutsuri -Geor=georgiano -Glag=glagolitico -Goth=gotico -Gran=grantha -Grek=greco -Gujr=gujarati -Guru=gurmukhi -Hang=hangul -Hani=han -Hano=hanunoo -Hans=semplificato -Hant=tradizionale -Hebr=ebraico -Hira=hiragana -Hmng=pahawn hmong -Hrkt=katanaka o hiragana -Hung=antico ungherese -Inds=indu -Ital=italico antico -Java=javanese -Jpan=giapponese -Kali=kayah li -Kana=katakana -Khar=kharoshthi -Khmr=khmer -Knda=kannada -Kore=coreano -Kthi=kaithi -Lana=lanna -Laoo=lao -Latf=variante fraktur del latino -Latg=variante gaelica del latino -Latn=latino -Lepc=lepcha -Limb=limbu -Lina=lineare A -Linb=lineare B -Lisu=lisu -Loma=loma -Lyci=lyci -Lydi=lydi -Mand=mandaico -Mani=manicheo -Maya=geroglifici maya -Mend=mende -Merc=corsivo meroitico -Mero=meroitico -Mlym=malayalam -Mong=mongolo -Moon=moon -Mtei=meetei mayek -Mymr=birmano -Narb=arabo settentrionale antico -Nbat=nabateo -Nkgb=geba naxi -Nkoo=n’ko -Ogam=ogham -Olck=ol chiki -Orkh=orkhon -Orya=oriya -Osma=osmanya -Palm=palmireno -Perm=permico antico -Phag=phags-pa -Phli=pahlavi delle iscrizioni -Phlp=pahlavi psalter -Phlv=pahlavi book -Phnx=fenicio -Plrd=fonetica di pollard -Prti=partico delle iscrizioni -Rjng=rejang -Roro=rongorongo -Runr=runico -Samr=samaritano -Sara=sarati -Sarb=arabo meridionale antico -Saur=saurashtra -Sgnw=linguaggio dei segni -Shaw=shaviano -Sind=khudawadi -Sinh=singalese -Sund=sundanese -Sylo=syloti nagri -Syrc=siriano -Syre=siriaco estrangelo -Syrj=siriaco occidentale -Syrn=siriaco orientale -Tagb=tagbanwa -Tale=tai le -Talu=tai lue -Taml=tamil -Tavt=tai viet -Telu=telugu -Teng=tengwar -Tfng=tifinagh -Tglg=tagalog -Thaa=thaana -Thai=thailandese -Tibt=tibetano -Ugar=ugarita -Vaii=vaii -Visp=alfabeto visivo -Wara=varang kshiti -Xpeo=persiano antico -Xsux=sumero-accadiano cuneiforme -Yiii=yi -Zinh=ereditato -Zmth=notazione matematica -Zsym=simboli -Zxxx=non scritto -Zyyy=comune -Zzzz=scrittura sconosciuta - -# country names -# key is ISO 3166 country code - -AE=Emirati Arabi Uniti -AG=Antigua e Barbuda -AN=Antille Olandesi -AQ=Antartide -AS=Samoa americane -AX=Isole Åland -AZ=Azerbaigian -BA=Bosnia ed Erzegovina -BE=Belgio -BH=Bahrein -BR=Brasile -BV=Isola Bouvet -BY=Bielorussia -CC=Isole Cocos (Keeling) -CF=Repubblica Centrafricana -CG=Congo-Brazzaville -CH=Svizzera -CI=Costa d’Avorio -CK=Isole Cook -CL=Cile -CM=Camerun -CN=Cina -CS=Serbia e Montenegro -CV=Capo Verde -CX=Isola Christmas -CY=Cipro -CZ=Cechia -DE=Germania -DJ=Gibuti -DK=Danimarca -DO=Repubblica Dominicana -EG=Egitto -EH=Sahara occidentale -ES=Spagna -ET=Etiopia -FI=Finlandia -FJ=Figi -FK=Isole Falkland -FO=Isole Fær Øer -FR=Francia -GB=Regno Unito -GF=Guyana francese -GI=Gibilterra -GL=Groenlandia -GP=Guadalupa -GQ=Guinea Equatoriale -GR=Grecia -GS=Georgia del Sud e Sandwich australi -HK=RAS di Hong Kong -HM=Isole Heard e McDonald -HR=Croazia -HU=Ungheria -IE=Irlanda -IL=Israele -IO=Territorio britannico dell’Oceano Indiano -IS=Islanda -IT=Italia -JM=Giamaica -JO=Giordania -JP=Giappone -KG=Kirghizistan -KH=Cambogia -KM=Comore -KN=Saint Kitts e Nevis -KP=Corea del Nord -KR=Corea del Sud -KY=Isole Cayman -KZ=Kazakistan -LB=Libano -LC=Saint Lucia -LT=Lituania -LU=Lussemburgo -LV=Lettonia -LY=Libia -MA=Marocco -MD=Moldavia -MH=Isole Marshall -MK=Macedonia del Nord -MM=Myanmar (Birmania) -MO=RAS di Macao -MP=Isole Marianne settentrionali -MQ=Martinica -MV=Maldive -MX=Messico -MZ=Mozambico -NC=Nuova Caledonia -NF=Isola Norfolk -NL=Paesi Bassi -NO=Norvegia -NZ=Nuova Zelanda -PA=Panamá -PE=Perù -PF=Polinesia francese -PG=Papua Nuova Guinea -PH=Filippine -PL=Polonia -PM=Saint-Pierre e Miquelon -PN=Isole Pitcairn -PR=Portorico -PS=Territori palestinesi -PT=Portogallo -RE=Riunione -RW=Ruanda -SA=Arabia Saudita -SB=Isole Salomone -SE=Svezia -SH=Sant’Elena -SJ=Svalbard e Jan Mayen -SK=Slovacchia -ST=São Tomé e Príncipe -SY=Siria -SZ=Swaziland -TC=Isole Turks e Caicos -TD=Ciad -TF=Terre australi francesi -TH=Thailandia -TJ=Tagikistan -TL=Timor Est -TR=Turchia -TT=Trinidad e Tobago -UA=Ucraina -UM=Altre isole americane del Pacifico -US=Stati Uniti -VA=Città del Vaticano -VC=Saint Vincent e Grenadine -VG=Isole Vergini Britanniche -VI=Isole Vergini Americane -WF=Wallis e Futuna -ZA=Sudafrica - -# territory names -# key is UN M.49 country and area code - -001=Mondo -003=Nord America -005=America del Sud -011=Africa occidentale -013=America Centrale -014=Africa orientale -015=Nordafrica -017=Africa centrale -018=Africa del Sud -019=Americhe -021=America del Nord -029=Caraibi -030=Asia orientale -034=Asia del Sud -035=Sud-est asiatico -039=Europa meridionale -057=Regione micronesiana -061=Polinesia -143=Asia centrale -145=Asia occidentale -150=Europa -151=Europa orientale -154=Europa settentrionale -155=Europa occidentale -419=America Latina diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties deleted file mode 100644 index b1db50f1233..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties +++ /dev/null @@ -1,1145 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=アファル語 -ab=アブハズ語 -ae=アヴェスタ語 -af=アフリカーンス語 -ak=アカン語 -am=アムハラ語 -an=アラゴン語 -ar=アラビア語 -as=アッサム語 -av=アヴァル語 -ay=アイマラ語 -az=アゼルバイジャン語 -ba=バシキール語 -be=ベラルーシ語 -bg=ブルガリア語 -bh=ビハール語 -bi=ビスラマ語 -bm=バンバラ語 -bn=ベンガル語 -bo=チベット語 -br=ブルトン語 -bs=ボスニア語 -ca=カタロニア語 -ce=チェチェン語 -ch=チャモロ語 -co=コルシカ語 -cr=クリー語 -cs=チェコ語 -cu=教会スラブ語 -cv=チュヴァシ語 -cy=ウェールズ語 -da=デンマーク語 -de=ドイツ語 -dv=ディベヒ語 -dz=ゾンカ語 -ee=エウェ語 -el=ギリシャ語 -en=英語 -eo=エスペラント語 -es=スペイン語 -et=エストニア語 -eu=バスク語 -fa=ペルシア語 -ff=フラ語 -fi=フィンランド語 -fj=フィジー語 -fo=フェロー語 -fr=フランス語 -fy=西フリジア語 -ga=アイルランド語 -gd=スコットランド・ゲール語 -gl=ガリシア語 -gn=グアラニー語 -gu=グジャラート語 -gv=マン島語 -ha=ハウサ語 -he=ヘブライ語 -hi=ヒンディー語 -ho=ヒリモツ語 -hr=クロアチア語 -ht=ハイチ・クレオール語 -hu=ハンガリー語 -hy=アルメニア語 -hz=ヘレロ語 -ia=インターリングア -id=インドネシア語 -ie=インターリング -ig=イボ語 -ii=四川イ語 -ik=イヌピアック語 -in=インドネシア語 -io=イド語 -is=アイスランド語 -it=イタリア語 -iu=イヌクティトット語 -iw=ヘブライ語 -ja=日本語 -ji=イディッシュ語 -jv=ジャワ語 -ka=ジョージア語 -kg=コンゴ語 -ki=キクユ語 -kj=クワニャマ語 -kk=カザフ語 -kl=グリーンランド語 -km=クメール語 -kn=カンナダ語 -ko=韓国語 -kr=カヌリ語 -ks=カシミール語 -ku=クルド語 -kv=コミ語 -kw=コーンウォール語 -ky=キルギス語 -la=ラテン語 -lb=ルクセンブルク語 -lg=ガンダ語 -li=リンブルフ語 -ln=リンガラ語 -lo=ラオ語 -lt=リトアニア語 -lu=ルバ・カタンガ語 -lv=ラトビア語 -mg=マダガスカル語 -mh=マーシャル語 -mi=マオリ語 -mk=マケドニア語 -ml=マラヤーラム語 -mn=モンゴル語 -mo=モルダビア語 -mr=マラーティー語 -ms=マレー語 -mt=マルタ語 -my=ミャンマー語 -na=ナウル語 -nb=ノルウェー語(ブークモール) -nd=北ンデベレ語 -ne=ネパール語 -ng=ンドンガ語 -nl=オランダ語 -nn=ノルウェー語(ニーノシュク) -no=ノルウェー語 -nr=南ンデベレ語 -nv=ナバホ語 -ny=ニャンジャ語 -oc=オック語 -oj=オジブウェー語 -om=オロモ語 -or=オディア語 -os=オセット語 -pa=パンジャブ語 -pi=パーリ語 -pl=ポーランド語 -ps=パシュトゥー語 -pt=ポルトガル語 -qu=ケチュア語 -rm=ロマンシュ語 -rn=ルンディ語 -ro=ルーマニア語 -ru=ロシア語 -rw=キニアルワンダ語 -sa=サンスクリット語 -sc=サルデーニャ語 -sd=シンド語 -se=北サーミ語 -sg=サンゴ語 -si=シンハラ語 -sk=スロバキア語 -sl=スロベニア語 -sm=サモア語 -sn=ショナ語 -so=ソマリ語 -sq=アルバニア語 -sr=セルビア語 -ss=スワジ語 -st=南部ソト語 -su=スンダ語 -sv=スウェーデン語 -sw=スワヒリ語 -ta=タミル語 -te=テルグ語 -tg=タジク語 -th=タイ語 -ti=ティグリニア語 -tk=トルクメン語 -tl=タガログ語 -tn=ツワナ語 -to=トンガ語 -tr=トルコ語 -ts=ツォンガ語 -tt=タタール語 -tw=トウィ語 -ty=タヒチ語 -ug=ウイグル語 -uk=ウクライナ語 -ur=ウルドゥー語 -uz=ウズベク語 -ve=ベンダ語 -vi=ベトナム語 -vo=ヴォラピュク語 -wa=ワロン語 -wo=ウォロフ語 -xh=コサ語 -yi=イディッシュ語 -yo=ヨルバ語 -za=チワン語 -zh=中国語 -zu=ズールー語 - -# key is ISO 639.2 language code -aar=アファル語 -abk=アブハーズ語 -ace=アチェ語 -ach=アチョリ語 -ada=アダングメ語 -ady=アディゲ語 -afa=アフガニー (1927-2002) -afh=アフリヒリ語 -afr=アフリカーンス語 -ain=アイヌ語 -aka=アカン語 -akk=アッカド語 -alb=アルバニア語 -ale=アレウト語 -alg=アルゴンキアン語族 -alt=南アルタイ語 -amh=アムハラ語 -ang=古英語 -anp=アンギカ語 -apa=アパッチ語族 -ara=アルゼンチン アゥストラール -arc=アラム語 -arg=アラゴン語 -arm=アルメニア語 -arn=マプチェ語 -arp=アラパホー語 -art=人工諸語 -arw=アラワク語 -asm=アッサム語 -ast=アストゥリアス語 -ath=アサパスカン語族 -aus=オーストラリア語族 -ava=アヴァル語 -ave=アヴェスタ語 -awa=アワディー語 -aym=アイマラ語 -aze=アゼルバイジャン語 -bad=ボスニア ディナール -bai=バミレケ語族 -bak=バシキール語 -bal=バルーチー語 -bam=ボスニア マルク (BAM) -ban=バリ語 -baq=バスク語 -bas=バサ語 -bat=バルト諸語 -bej=ベジャ語 -bel=ベルギー フラン (BEL) -bem=ベンバ語 -ben=ベンガル語 -ber=ベルベル諸語 -bho=ボージュプリー語 -bih=ビハール語 -bik=ビコル語 -bin=ビニ語 -bis=ビスラマ語 -bla=シクシカ語 -bnt=バントゥ諸語 -bos=ボスニア語 -bra=ブラジ語 -bre=ブラジル クルゼイロ (1990-1993) -btk=バタク語 -bua=ブリヤート語 -bug=ブギ語 -bul=ブルガリア語 -bur=ビルマ語 -byn=ビリン語 -cad=カドー語 -cai=中米インディアン諸語 -car=カリブ語 -cat=カタロニア語 -cau=コーカサス諸語 -ceb=セブアノ語 -cel=ケルト諸語 -cha=チャモロ語 -chb=チブチャ語 -che=チェチェン語 -chg=チャガタイ語 -chi=中国語 -chk=チューク語 -chm=マリ語 -chn=チヌーク混成語 -cho=チョクトー語 -chp=チペワイアン語 -chr=チェロキー語 -chu=教会スラブ語 -chv=チュヴァシュ語 -chy=シャイアン語 -cmc=チャム語族 -cop=コプト語 -cor=コーンウォール語 -cos=コルシカ語 -cpe=英語が基盤の混成語・混合語 -cpf=フランス語が基盤の混成語・混合語 -cpp=ポルトガル語が基盤の混成語・混合語 -cre=クリー語 -crh=クリミア・タタール語 -crp=その他の混成語・混合語 -csb=カシューブ語 -cus=クシュ諸語 -cze=チェコ語 -dak=ダコタ語 -dan=デンマーク語 -dar=ダルグワ語 -day=ダヤク語 -del=デラウェア語 -den=スレイビー語 -dgr=ドグリブ語 -din=ディンカ語 -div=ディベヒ語 -doi=ドーグリー語 -dra=ドラヴィダ諸語 -dsb=低地ソルブ語 -dua=ドゥアラ語 -dum=中世オランダ語 -dut=オランダ語 -dyu=ジュラ語 -dzo=ゾンカ語 -efi=エフィク語 -egy=古代エジプト語 -eka=エカジュク語 -elx=エラム語 -eng=英語 -enm=中英語 -epo=エスペラント語 -est=エストニア語 -ewe=エウェ語 -ewo=エウォンド語 -fan=ファング語 -fao=フェロー語 -fat=ファンティー語 -fij=フィジー語 -fil=フィリピノ語 -fin=フィンランド語 -fiu=フィン・ウゴル諸語 -fon=フォン語 -fre=フランス語 -frm=中期フランス語 -fro=古フランス語 -frr=北フリジア語 -frs=東フリジア語 -fry=西フリジア語 -ful=フラ語 -fur=フリウリ語 -gaa=ガ語 -gay=ガヨ語 -gba=バヤ語 -gem=ゲルマン諸語 -geo=グルジア語 -ger=ドイツ語 -gez=ゲエズ語 -gil=キリバス語 -gla=ゲール語 -gle=アイルランド語 -glg=ガリシア語 -glv=マン島語 -gmh=中高ドイツ語 -goh=古高ドイツ語 -gon=ゴーンディー語 -gor=ゴロンタロ語 -got=ゴート語 -grb=グレボ語 -grc=古代ギリシャ語 -gre=現代ギリシャ語(1453-) -grn=グアラニー語 -gsw=スイスドイツ語 -guj=グジャラト語 -gwi=グウィッチン語 -hai=ハイダ語 -hat=ハイチ語 -hau=ハウサ語 -haw=ハワイ語 -heb=ヘブライ語 -her=ヘレロ語 -hil=ヒリガイノン語 -him=ヒマチャル語 -hin=ヒンディー語 -hit=ヒッタイト語 -hmn=フモン語 -hmo=ヒリモトゥ語 -hrv=クロアチア語 -hsb=高地ソルブ語 -hun=ハンガリー語 -hup=フパ語 -iba=イバン語 -ibo=イボ語 -ice=アイスランド語 -ido=イド語 -iii=四川イ(彝)語 -ijo=イジョー語 -iku=イヌクウティトット語 -ile=インターリング -ilo=イロカノ語 -ina=インターリングア語(国際補助語協会) -inc=インド諸語 -ind=インドネシア語 -ine=印欧諸語 -inh=イングーシ語 -ipk=イヌピアック語 -ira=イラン語 -iro=イロコイ語族 -ita=イタリア語 -jav=ジャワ語 -jbo=ロジバン語 -jpn=日本語 -jpr=ユダヤ・ペルシア語 -jrb=ユダヤ・アラビア語 -kaa=カラカルパク語 -kab=カビル語 -kac=カチン語 -kal=カラアリス語 -kam=カンバ語 -kan=カンナダ語 -kar=カレン語 -kas=カシミール語 -kau=カヌリ語 -kaw=カウィ語 -kaz=カザフ語 -kbd=カバルド語 -kha=カシ語 -khi=コイサン諸語 -khm=中央クメール語 -kho=コータン語 -kik=キクユ語 -kin=キニヤルワンダ語 -kir=キルギス語 -kmb=キンブンド語 -kok=コンカニ語 -kom=コミ語 -kon=コンゴ語 -kor=韓国語 -kos=コスラエ語 -kpe=クペレ語 -krc=カラチャイ・バルカル語 -krl=カレリア語 -kro=クルー語 -kru=クルク語 -kua=クアニャマ語 -kum=クムク語 -kur=クルド語 -kut=クテナイ語 -lad=ラディノ語 -lah=ラフンダー語 -lam=ランバ語 -lao=ラオ語 -lat=ラテン語 -lav=ラトビア語 -lez=レズギ語 -lim=リンブルフ語 -lin=リンガラ語 -lit=リトアニア語 -lol=モンゴ語 -loz=ロジ語 -ltz=ルクセンブルグ語 -lua=ルバ・ルルア語 -lub=ルバ・カタンガ語 -lug=ガンダ語 -lui=ルイセーニョ語 -lun=ルンダ語 -luo=ルオ語 -lus=ミゾ語 -mac=マケドニア語 -mad=マドゥラ語 -mag=マガヒー語 -mah=マーシャル語 -mai=マイティリー語 -mak=マカッサル語 -mal=マラヤーラム語 -man=マンディンゴ語 -mao=マオリ語 -map=オーストロネシア諸語 -mar=マラティー語 -mas=マサイ語 -may=マレー語 -mdf=モクシャ語 -mdr=マンダル語 -men=メンデ語 -mga=中期アイルランド語 -mic=ミクマク語 -min=ミナンカバウ語 -mis=その他の言語 -mkh=モン・クメール諸語 -mlg=マダガスカル語 -mlt=マルタ語 -mnc=満州語 -mni=マニプリ語 -mno=マノボ語族 -moh=モーホーク語 -mon=モンゴル語 -mos=モシ語 -mul=複数言語 -mun=ムンダ語族 -mus=クリーク語 -mwl=ミランダ語 -mwr=マールワーリー語 -myn=マヤ語族 -myv=エルジャ語 -nah=ナワトル語 -nai=北米インディアン諸語 -nap=ナポリ語 -nau=ナウル語 -nav=ナバホ語 -nbl=南ンデベレ語 -nde=北ンデベレ語 -ndo=ンドンガ語 -nds=低地ドイツ語 -nep=ネパール語 -new=ネワール語 -nia=ニアス語 -nic=ニカラグア コルドバ -niu=ニウーエイ語 -nno=ノルウェー語(ニーノシク) -nob=ノルウェー語(ブークモール) -nog=ノガイ語 -non=古ノルド語 -nor=ノルウェー語 -nqo=ンコ語 -nso=北部ソト語 -nub=ヌビア語族 -nwc=古典ネワール語 -nya=チチェワ語 -nym=ニャムウェジ語 -nyn=ニャンコレ語 -nyo=ニョロ語 -nzi=ンゼマ語 -oci=オック語(1500以後) -oji=オジブワ語 -ori=オリヤー語 -orm=オロモ語 -osa=オセージ語 -oss=オセット語 -ota=オスマントルコ語 -oto=オトミ語族 -paa=パプア諸語 -pag=パンガシナン語 -pal=パフラヴィー語 -pam=パンパンガ語 -pan=パンジャブ語 -pap=パピアメント語 -pau=パラオ語 -peo=古代ペルシア語 -per=ペルシア語 -phi=フィリピン諸語 -phn=フェニキア語 -pli=パーリ語 -pol=ポーランド語 -pon=ポンペイ語 -por=ポルトガル語 -pra=プラークリット語族 -pro=古期プロバンス語 -pus=プシュトゥー語、パシュトゥー語 -que=ケチュア語 -raj=ラージャスターン語 -rap=ラパヌイ語 -rar=ラロトンガ語 -roa=ロマンス諸語 -roh=ロマンシュ語 -rom=ロマーニー語 -rum=ルーマニア語 -run=ルンディ語 -rup=アルーマニア語 -rus=ロシア語 -sad=サンダウェ語 -sag=サンゴ語 -sah=サハ語 -sai=南米インディアン諸語 -sal=セイリッシュ語族 -sam=サマリア・アラム語 -san=サンスクリット語 -sas=ササク語 -sat=サンターリー語 -scn=シチリア語 -sco=スコットランド語 -sel=セリクプ語 -sem=セム諸語 -sga=古アイルランド語 -sgn=手まね言語 -shn=シャン語 -sid=シダモ語 -sin=シンハラ語 -sio=スー語族 -sit=スロベニア トラール -sla=スラブ諸語 -slo=スロバキア語 -slv=スロベニア語 -sma=南サーミ語 -sme=北サーミ語 -smi=サーミ諸語 -smj=ルレ・サーミ語 -smn=イナリ・サーミ語 -smo=サモア語 -sms=スコルト・サーミ語 -sna=ショナ語 -snd=シンド語 -snk=ソニンケ語 -sog=ソグド語 -som=ソマリ語 -son=ソンガイ語 -sot=南部ソト語 -spa=スペイン語 -srd=スリナム ドル -srn=スリナム語 -srp=セルビア語 -srr=セレル語 -ssa=ナイル・サハラ諸語 -ssw=シスワティ語 -suk=スクマ語 -sun=スンダ語 -sus=スス語 -sux=シュメール語 -swa=スワヒリ語 -swe=スウェーデン語 -syc=古典シリア語 -syr=シリア語 -tah=タヒチ語 -tai=タイ諸語 -tam=タミル語 -tat=タタール語 -tel=テルグ語 -tem=テムネ語 -ter=テレーノ語 -tet=テトゥン語 -tgk=タジク語 -tgl=タガログ語 -tha=タイ語 -tib=チベット語 -tig=ティグレ語 -tir=ティグリニャ語 -tiv=ティブ語 -tkl=トケラウ語 -tlh=クリンゴン語 -tli=トリンギット語 -tmh=タマシェク語 -tog=トンガ語(ニアサ) -ton=トンガ語(トンガ諸島) -tpi=トク・ピシン語 -tsi=チムシュ語 -tsn=ツワナ語 -tso=ツォンガ語 -tuk=トルクメン語 -tum=トゥンブカ語 -tup=トゥピ語族 -tur=トルコ語 -tut=アルタイ諸語 -tvl=ツバル語 -twi=トウィ語 -tyv=トゥヴァ語 -udm=ウドムルト語 -uga=ウガリト語 -uig=ウイグル語 -ukr=ウクライナ語 -umb=ムブンドゥ語 -und=言語不明 -urd=ウルドゥー語 -uzb=ウズベク語 -vai=ヴァイ語 -ven=ベンダ語 -vie=ベトナム語 -vol=ヴォラピューク語 -vot=ヴォート語 -wak=ワカシ語族 -wal=ウォライタ語 -war=ワライ語 -was=ワショ語 -wel=ウェールズ語 -wen=ソルビア語族 -wln=ワロン語 -wol=ウォロフ語 -xal=カルムイク語 -xho=コーサ語 -yao=ヤオ語 -yap=ヤップ語 -yid=イディッシュ語 -yor=ヨルバ語 -ypk=ユピック語族 -zap=サポテカ語 -zbl=ブリスシンボル -zen=ゼナガ語 -zha=チュワン語 -znd=ザンデ語 -zul=ズールー語 -zun=ズニ語 -zxx=言語的内容なし -zza=ザザ語 - -# script names -# key is ISO 15924 script code - -Arab=アラビア文字 -Armi=帝国アラム文字 -Armn=アルメニア文字 -Avst=アヴェスター文字 -Bali=バリ文字 -Bamu=バムン文字 -Bass=バサ文字 -Batk=バタク文字 -Beng=ベンガル文字 -Blis=ブリスシンボル -Bopo=注音字母 -Brah=ブラーフミー文字 -Brai=ブライユ点字 -Bugi=ブギス文字 -Buhd=ブヒッド文字 -Cakm=チャクマ文字 -Cans=統合カナダ先住民音節文字 -Cari=カリア文字 -Cham=チャム文字 -Cher=チェロキー文字 -Cirt=キアス文字 -Copt=コプト文字 -Cprt=キプロス文字 -Cyrl=キリル文字 -Cyrs=古代教会スラブ語キリル文字 -Deva=デーバナーガリー文字 -Dsrt=デセレット文字 -Dupl=デュプロワエ式速記 -Egyd=エジプト民衆文字 -Egyh=エジプト神官文字 -Egyp=エジプト聖刻文字 -Elba=エルバサン文字 -Ethi=エチオピア文字 -Geok=ジョージア文字(フツリ) -Geor=ジョージア文字 -Glag=グラゴル文字 -Goth=ゴート文字 -Gran=グランタ文字 -Grek=ギリシャ文字 -Gujr=グジャラート文字 -Guru=グルムキー文字 -Hang=ハングル -Hani=漢字 -Hano=ハヌノオ文字 -Hans=簡体字 -Hant=繁体字 -Hebr=ヘブライ文字 -Hira=ひらがな -Hmng=パハウ・フモン文字 -Hrkt=仮名 -Hung=古代ハンガリー文字 -Inds=インダス文字 -Ital=古イタリア文字 -Java=ジャワ文字 -Jpan=日本語の文字 -Kali=カヤー文字 -Kana=カタカナ -Khar=カローシュティー文字 -Khmr=クメール文字 -Knda=カンナダ文字 -Kore=韓国語の文字 -Kpel=クペレ文字 -Kthi=カイティ文字 -Lana=ラーンナー文字 -Laoo=ラオ文字 -Latf=ラテン文字(ドイツ文字) -Latg=ラテン文字 (ゲール文字) -Latn=ラテン文字 -Lepc=レプチャ文字 -Limb=リンブ文字 -Lina=線文字A -Linb=線文字B -Lisu=フレイザー文字 -Loma=ロマ文字 -Lyci=リキア文字 -Lydi=リディア文字 -Mand=マンダ文字 -Mani=マニ文字 -Maya=マヤ象形文字 -Mend=メンデ文字 -Merc=メロエ文字草書体 -Mero=メロエ文字 -Mlym=マラヤーラム文字 -Mong=モンゴル文字 -Moon=ムーン文字 -Mtei=メイテイ文字 -Mymr=ミャンマー文字 -Narb=古代北アラビア文字 -Nbat=ナバテア文字 -Nkgb=ナシ族ゲバ文字 -Nkoo=ンコ文字 -Ogam=オガム文字 -Olck=オルチキ文字 -Orkh=オルホン文字 -Orya=オディア文字 -Osma=オスマニア文字 -Palm=パルミラ文字 -Perm=古ぺルム文字 -Phag=パスパ文字 -Phli=碑文パフラヴィー文字 -Phlp=詩編用パフラヴィー文字 -Phlv=書物用パフラヴィー文字 -Phnx=フェニキア文字 -Plrd=ポラード音声記号 -Prti=碑文パルティア文字 -Rjng=ルジャン文字 -Roro=ロンゴロンゴ文字 -Runr=ルーン文字 -Samr=サマリア文字 -Sara=サラティ文字 -Sarb=古代南アラビア文字 -Saur=サウラーシュトラ文字 -Sgnw=手話文字 -Shaw=ショー文字 -Sind=クダワディ文字 -Sinh=シンハラ文字 -Sund=スンダ文字 -Sylo=シロティ・ナグリ文字 -Syrc=シリア文字 -Syre=シリア文字(エストランゲロ文字) -Syrj=シリア文字(西方シリア文字) -Syrn=シリア文字(東方シリア文字) -Tagb=タグバンワ文字 -Tale=タイ・レ文字 -Talu=新タイ・ルー文字 -Taml=タミル文字 -Tavt=タイ・ヴェト文字 -Telu=テルグ文字 -Teng=テングワール文字 -Tfng=ティフナグ文字 -Tglg=タガログ文字 -Thaa=ターナ文字 -Thai=タイ文字 -Tibt=チベット文字 -Ugar=ウガリット文字 -Vaii=ヴァイ文字 -Visp=視話法 -Wara=バラン・クシティ文字 -Xpeo=古代ペルシア文字 -Xsux=シュメール＝アッカド語楔形文字 -Yiii=イ文字 -Zinh=基底文字の種別を継承する結合文字 -Zmth=数学記号 -Zsym=記号文字 -Zxxx=非表記 -Zyyy=共通文字 -Zzzz=不明な文字 - -# country names -# key is ISO 3166 country code - -AD=アンドラ -AE=アラブ首長国連邦 -AF=アフガニスタン -AG=アンティグア・バーブーダ -AI=アンギラ -AL=アルバニア -AM=アルメニア -AN=オランダ領アンティル諸島 -AO=アンゴラ -AQ=南極 -AR=アルゼンチン -AS=米領サモア -AT=オーストリア -AU=オーストラリア -AW=アルバ -AX=オーランド諸島 -AZ=アゼルバイジャン -BA=ボスニア・ヘルツェゴビナ -BB=バルバドス -BD=バングラデシュ -BE=ベルギー -BF=ブルキナファソ -BG=ブルガリア -BH=バーレーン -BI=ブルンジ -BJ=ベナン -BM=バミューダ -BN=ブルネイ -BO=ボリビア -BR=ブラジル -BS=バハマ -BT=ブータン -BV=ブーベ島 -BW=ボツワナ -BY=ベラルーシ -BZ=ベリーズ -CA=カナダ -CC=ココス(キーリング)諸島 -CD=コンゴ民主共和国(キンシャサ) -CF=中央アフリカ共和国 -CG=コンゴ共和国(ブラザビル) -CH=スイス -CI=コートジボワール -CK=クック諸島 -CL=チリ -CM=カメルーン -CN=中国 -CO=コロンビア -CR=コスタリカ -CS=セルビア・モンテネグロ -CU=キューバ -CV=カーボベルデ -CX=クリスマス島 -CY=キプロス -CZ=チェコ -DE=ドイツ -DJ=ジブチ -DK=デンマーク -DM=ドミニカ国 -DO=ドミニカ共和国 -DZ=アルジェリア -EC=エクアドル -EE=エストニア -EG=エジプト -EH=西サハラ -ER=エリトリア -ES=スペイン -ET=エチオピア -FI=フィンランド -FJ=フィジー -FK=フォークランド諸島 -FM=ミクロネシア連邦 -FO=フェロー諸島 -FR=フランス -GA=ガボン -GB=イギリス -GD=グレナダ -GE=ジョージア -GF=仏領ギアナ -GH=ガーナ -GI=ジブラルタル -GL=グリーンランド -GM=ガンビア -GN=ギニア -GP=グアドループ -GQ=赤道ギニア -GR=ギリシャ -GS=サウスジョージア・サウスサンドウィッチ諸島 -GT=グアテマラ -GU=グアム -GW=ギニアビサウ -GY=ガイアナ -HK=中華人民共和国香港特別行政区 -HM=ハード島・マクドナルド諸島 -HN=ホンジュラス -HR=クロアチア -HT=ハイチ -HU=ハンガリー -ID=インドネシア -IE=アイルランド -IL=イスラエル -IN=インド -IO=英領インド洋地域 -IQ=イラク -IR=イラン -IS=アイスランド -IT=イタリア -JM=ジャマイカ -JO=ヨルダン -JP=日本 -KE=ケニア -KG=キルギス -KH=カンボジア -KI=キリバス -KM=コモロ -KN=セントクリストファー・ネーヴィス -KP=北朝鮮 -KR=韓国 -KW=クウェート -KY=ケイマン諸島 -KZ=カザフスタン -LA=ラオス -LB=レバノン -LC=セントルシア -LI=リヒテンシュタイン -LK=スリランカ -LR=リベリア -LS=レソト -LT=リトアニア -LU=ルクセンブルク -LV=ラトビア -LY=リビア -MA=モロッコ -MC=モナコ -MD=モルドバ -ME=モンテネグロ -MG=マダガスカル -MH=マーシャル諸島 -MK=北マケドニア -ML=マリ -MM=ミャンマー (ビルマ) -MN=モンゴル -MO=中華人民共和国マカオ特別行政区 -MP=北マリアナ諸島 -MQ=マルティニーク -MR=モーリタニア -MS=モントセラト -MT=マルタ -MU=モーリシャス -MV=モルディブ -MW=マラウイ -MX=メキシコ -MY=マレーシア -MZ=モザンビーク -NA=ナミビア -NC=ニューカレドニア -NE=ニジェール -NF=ノーフォーク島 -NG=ナイジェリア -NI=ニカラグア -NL=オランダ -NO=ノルウェー -NP=ネパール -NR=ナウル -NU=ニウエ -NZ=ニュージーランド -OM=オマーン -PA=パナマ -PE=ペルー -PF=仏領ポリネシア -PG=パプアニューギニア -PH=フィリピン -PK=パキスタン -PL=ポーランド -PM=サンピエール島・ミクロン島 -PN=ピトケアン諸島 -PR=プエルトリコ -PS=パレスチナ自治区 -PT=ポルトガル -PW=パラオ -PY=パラグアイ -QA=カタール -RE=レユニオン -RO=ルーマニア -RS=セルビア -RU=ロシア -RW=ルワンダ -SA=サウジアラビア -SB=ソロモン諸島 -SC=セーシェル -SD=スーダン -SE=スウェーデン -SG=シンガポール -SH=セントヘレナ -SI=スロベニア -SJ=スバールバル諸島・ヤンマイエン島 -SK=スロバキア -SL=シエラレオネ -SM=サンマリノ -SN=セネガル -SO=ソマリア -SR=スリナム -ST=サントメ・プリンシペ -SV=エルサルバドル -SY=シリア -SZ=エスワティニ -TC=タークス・カイコス諸島 -TD=チャド -TF=仏領極南諸島 -TG=トーゴ -TH=タイ -TJ=タジキスタン -TK=トケラウ -TL=東ティモール -TM=トルクメニスタン -TN=チュニジア -TO=トンガ -TR=トルコ -TT=トリニダード・トバゴ -TV=ツバル -TW=台湾 -TZ=タンザニア -UA=ウクライナ -UG=ウガンダ -UM=合衆国領有小離島 -US=アメリカ合衆国 -UY=ウルグアイ -UZ=ウズベキスタン -VA=バチカン市国 -VC=セントビンセント及びグレナディーン諸島 -VE=ベネズエラ -VG=英領ヴァージン諸島 -VI=米領ヴァージン諸島 -VN=ベトナム -VU=バヌアツ -WF=ウォリス・フツナ -WS=サモア -YE=イエメン -YT=マヨット -ZA=南アフリカ -ZM=ザンビア -ZW=ジンバブエ - -# territory names -# key is UN M.49 country and area code - -001=世界 -002=アフリカ -003=北アメリカ大陸 -005=南アメリカ -009=オセアニア -011=西アフリカ -013=中央アメリカ -014=東アフリカ -015=北アフリカ -017=中部アフリカ -018=南部アフリカ -019=アメリカ大陸 -021=北アメリカ -029=カリブ -030=東アジア -034=南アジア -035=東南アジア -039=南ヨーロッパ -053=オーストララシア -054=メラネシア -057=ミクロネシア -061=ポリネシア -142=アジア -143=中央アジア -145=西アジア -150=ヨーロッパ -151=東ヨーロッパ -154=北ヨーロッパ -155=西ヨーロッパ -419=ラテンアメリカ diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties deleted file mode 100644 index b68cd8f8785..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties +++ /dev/null @@ -1,1145 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=아파르어 -ab=압카즈어 -ae=아베스타어 -af=아프리칸스어 -ak=아칸어 -am=암하라어 -an=아라곤어 -ar=아랍어 -as=아삼어 -av=아바릭어 -ay=아이마라어 -az=아제르바이잔어 -ba=바슈키르어 -be=벨라루스어 -bg=불가리아어 -bh=비하르어 -bi=비슬라마어 -bm=밤바라어 -bn=벵골어 -bo=티베트어 -br=브르타뉴어 -bs=보스니아어 -ca=카탈로니아어 -ce=체첸어 -ch=차모로어 -co=코르시카어 -cr=크리어 -cs=체코어 -cu=교회 슬라브어 -cv=추바시어 -cy=웨일스어 -da=덴마크어 -de=독일어 -dv=디베히어 -dz=종카어 -ee=에웨어 -el=그리스어 -en=영어 -eo=에스페란토어 -es=스페인어 -et=에스토니아어 -eu=바스크어 -fa=페르시아어 -ff=풀라어 -fi=핀란드어 -fj=피지어 -fo=페로어 -fr=프랑스어 -fy=서부 프리지아어 -ga=아일랜드어 -gd=스코틀랜드 게일어 -gl=갈리시아어 -gn=과라니어 -gu=구자라트어 -gv=맹크스어 -ha=하우사어 -he=히브리어 -hi=힌디어 -ho=히리 모투어 -hr=크로아티아어 -ht=아이티어 -hu=헝가리어 -hy=아르메니아어 -hz=헤레로어 -ia=인터링구아 -id=인도네시아어 -ie=인테르링구에 -ig=이그보어 -ii=쓰촨 이어 -ik=이누피아크어 -in=인도네시아어 -io=이도어 -is=아이슬란드어 -it=이탈리아어 -iu=이눅티투트어 -iw=히브리어 -ja=일본어 -ji=이디시어 -jv=자바어 -ka=조지아어 -kg=콩고어 -ki=키쿠유어 -kj=쿠안야마어 -kk=카자흐어 -kl=그린란드어 -km=크메르어 -kn=칸나다어 -ko=한국어 -kr=칸누리어 -ks=카슈미르어 -ku=쿠르드어 -kv=코미어 -kw=콘월어 -ky=키르기스어 -la=라틴어 -lb=룩셈부르크어 -lg=간다어 -li=림버거어 -ln=링갈라어 -lo=라오어 -lt=리투아니아어 -lu=루바-카탄가어 -lv=라트비아어 -mg=말라가시어 -mh=마셜어 -mi=마오리어 -mk=마케도니아어 -ml=말라얄람어 -mn=몽골어 -mo=몰다비아어 -mr=마라티어 -ms=말레이어 -mt=몰타어 -my=버마어 -na=나우루어 -nb=노르웨이어(보크말) -nd=북부 은데벨레어 -ne=네팔어 -ng=느동가어 -nl=네덜란드어 -nn=노르웨이어(니노르스크) -no=노르웨이어 -nr=남부 은데벨레어 -nv=나바호어 -ny=냔자어 -oc=오크어 -oj=오지브와어 -om=오로모어 -or=오리야어 -os=오세트어 -pa=펀잡어 -pi=팔리어 -pl=폴란드어 -ps=파슈토어 -pt=포르투갈어 -qu=케추아어 -rm=로만시어 -rn=룬디어 -ro=루마니아어 -ru=러시아어 -rw=르완다어 -sa=산스크리트어 -sc=사르디니아어 -sd=신디어 -se=북부 사미어 -sg=산고어 -si=싱할라어 -sk=슬로바키아어 -sl=슬로베니아어 -sm=사모아어 -sn=쇼나어 -so=소말리아어 -sq=알바니아어 -sr=세르비아어 -ss=시스와티어 -st=남부 소토어 -su=순다어 -sv=스웨덴어 -sw=스와힐리어 -ta=타밀어 -te=텔루구어 -tg=타지크어 -th=태국어 -ti=티그리냐어 -tk=투르크멘어 -tl=타갈로그어 -tn=츠와나어 -to=통가어 -tr=터키어 -ts=총가어 -tt=타타르어 -tw=트위어 -ty=타히티어 -ug=위구르어 -uk=우크라이나어 -ur=우르두어 -uz=우즈베크어 -ve=벤다어 -vi=베트남어 -vo=볼라퓌크어 -wa=왈론어 -wo=월로프어 -xh=코사어 -yi=이디시어 -yo=요루바어 -za=주앙어 -zh=중국어 -zu=줄루어 - -# key is ISO 639.2 language code -aar=아파르어 -abk=아브하즈어 -ace=아체어 -ach=아콜리어 -ada=아당메어 -ady=아디게어 -afa=아프가니(1927-2002) -afh=아프리힐리어 -afr=남아공 공용어 -ain=아이누어 -aka=아칸어 -akk=아카드어 -alb=알바니아어 -ale=알류트어 -alg=알공킨어족 -alt=남부 알타이어 -amh=암하라어 -ang=고대 영어 -anp=앙가어 -apa=아파치어 -ara=아랍어 -arc=아람어 -arg=아라곤어 -arm=아르메니아어 -arn=마푸둥군어 -arp=아라파호어 -art=기계어(기타) -arw=아라와크어 -asm=아샘어 -ast=아스투리아어 -ath=아타파스카어군 -aus=오스트레일리아어족 -ava=아바르어 -ave=아베스타어 -awa=아와히어 -aym=아이마라어 -aze=아제르바이잔어 -bad=보스니아-헤르체고비나 디나르 -bai=바밀레케어족 -bak=바슈키르어 -bal=발루치어 -bam=밤바라어 -ban=발리어 -baq=바스크어 -bas=바사어 -bat=발트어(기타) -bej=베자어 -bel=벨라루스어 -bem=벰바어 -ben=벵골어 -ber=베르베르어 -bho=호즈푸리어 -bih=비하르어 -bik=비콜어 -bin=비니어 -bis=비슬라마어 -bla=식시카어 -bnt=반투어 -bos=보스니아어 -bra=브라지어 -bre=브라질 크루제이루 (1990-1993) -btk=바타크어 -bua=부리아타 -bug=부기어 -bul=불가리아어 -bur=버마어 -byn=브린어 -cad=카도어 -cai=중앙 아메리카 인디안어(기타) -car=카리브어 -cat=카탈로니아어 -cau=카프카스어(기타) -ceb=세부아노어 -cel=켈트어(기타) -cha=차모로어 -chb=치브차어 -che=체첸어 -chg=차가타이어 -chi=중국어 -chk=추크어 -chm=마리어 -chn=치누크 자곤 -cho=촉토어 -chp=치페우얀 -chr=체로키어 -chu=교회 슬라브어 -chv=추바쉬어 -chy=샤이엔어 -cmc=참어군 -cop=콥트어 -cor=콘월어 -cos=코르시카어 -cpe=크리올어 및 피진어(영어를 기반으로 한 기타) -cpf=크리올어 및 피진어(프랑스어를 기반으로 한 기타) -cpp=크리올어 및 피진어(포르투칼어를 기반으로 한 기타) -cre=크리어 -crh=크리민 터키어; 크리민 타타르어 -crp=크리올어 및 피진어 (기타) -csb=카슈비아어 -cus=쿠시어족 -cze=체코어 -dak=다코타어 -dan=덴마크어 -dar=다르그와어 -day=다야크어 -del=델라웨어어 -den=슬라브어 -dgr=도그리브어 -din=딩카어 -div=디베히어 -doi=도그리어 -dra=드라비다어 (기타) -dsb=저지 소르비아어 -dua=두알라어 -dum=중세 네덜란드어 -dut=네덜란드어 -dyu=드율라어 -dzo=부탄어 -efi=이픽어 -egy=고대 이집트어 -eka=이카죽어 -elx=엘람어 -eng=영어 -enm=중세 영어 -epo=에스페란토어 -est=에스토니아어 -ewe=에웨어 -ewo=이원도어 -fan=팡그어 -fao=페로스어 -fat=판티어 -fij=피지어 -fil=필리핀어 -fin=핀란드어 -fiu=피노우그리아어(기타) -fon=폰어 -fre=프랑스어 -frm=중세 프랑스어 -fro=고대 프랑스어 -frr=북부 프리지아어 -frs=동부 프리슬란드어 -fry=서부 프리슬란드어 -ful=풀라니어 -fur=프리울리어 -gaa=가어 -gay=가요어 -gba=그바야어 -gem=독일어(기타) -geo=그루지야어 -ger=독일어 -gez=게이즈어 -gil=키리바시어 -gla=게일어 -gle=아일랜드어 -glg=갈리시아어 -glv=맹크스어 -gmh=중세 고지 독일어 -goh=고대 고지 독일어 -gon=곤디어 -gor=고론탈로어 -got=고트어 -grb=게르보어 -grc=고대 그리스어 -gre=그리스어, 근세(1453년부터) -grn=구아라니어 -gsw=독일어(스위스) -guj=구자라트어 -gwi=그위친어 -hai=하이다어 -hat=아이티어 -hau=하우자어 -haw=하와이어 -heb=히브리 문자 -her=헤레로어 -hil=헤리가뇬어 -him=히마차리어 -hin=힌디어 -hit=하타이트어 -hmn=히몸어 -hmo=히리모투어 -hrv=크로아티아어 -hsb=고지 소르비아어 -hun=헝가리어 -hup=후파어 -iba=이반어 -ibo=이그보어 -ice=아이슬란드어 -ido=이도어 -iii=쓰촨 이어 -ijo=이조어 -iku=이눅티투트어 -ile=인터링게어 -ilo=이로코어 -ina=인터링거(국제 보조 언어 협회) -inc=인도어(기타) -ind=인도네시아어 -ine=인도유럽어(기타) -inh=인귀시어 -ipk=이누피아크어 -ira=이란어 [ira] -iro=이러쿼이어 -ita=이탈리아어 -jav=자바어 -jbo=로반어 -jpn=일본어 -jpr=유대-페르시아어 -jrb=유대-아라비아어 -kaa=카라칼파크어 -kab=커바일어 -kac=카친어 -kal=칼랄리수트 -kam=캄바어 -kan=칸나다 문자 -kar=카렌어 -kas=카슈미르어 -kau=카누리어 -kaw=카위어 -kaz=카자흐어 -kbd=카바르디어 -kha=카시어 -khi=코이산어 -khm=중앙 크메르 문자 -kho=호탄어 -kik=키쿠유어 -kin=반투어(루완다) -kir=키르기스어 -kmb=킴분두어 -kok=코카니어 -kom=코미어 -kon=콩고어 -kor=한국어 -kos=코스라이엔어 -kpe=크펠레어 -krc=카라챠이-발카르어 -krl=카렐리야어 -kro=크루어 -kru=쿠르크어 -kua=쿠안야마어 -kum=쿠믹어 -kur=크르드어 -kut=쿠테네어 -lad=라디노어 -lah=라한다어 -lam=람바어 -lao=라오어 -lat=라틴어 -lav=라트비아어 -lez=레즈기안어 -lim=림버그어 -lin=링갈라어 -lit=리투아니아어 -lol=몽고어 -loz=로지어 -ltz=룩셈부르크어 -lua=루바-룰루아어 -lub=루바어(카탕가) -lug=간다어 -lui=루이세노어 -lun=룬다어 -luo=루오어 -lus=루샤이어 -mac=마케도니아어 -mad=마두라어 -mag=마가히어 -mah=말살레스어 -mai=마이틸리어 -mak=마카사어 -mal=말라얄람어 -man=만딩고어 -mao=마오리어 -map=남도어 -mar=마라티어 -mas=마사이어 -may=말레이어 -mdf=모크샤어 -mdr=만다르어 -men=멘데어 -mga=중세 아일랜드어 -mic=미크맥어 -min=미낭카바우어 -mis=기타 언어 -mkh=몬크메르어 (기타) -mlg=마다가스카르어 -mlt=몰타어 -mnc=만주어 -mni=마니푸리어 -mno=마노보어 -moh=모호크어 -mon=몽골어 -mos=모시어 -mul=다중 언어 -mun=문다어 -mus=크리크어 -mwl=미란데어 -mwr=마르와리어 -myn=마야어 -myv=엘즈야어 -nah=나우아틀어 -nai=북아메리카 인디언어 (기타) -nap=나폴리어 -nau=나우루어 -nav=나바호어 -nbl=데베레어, 남부 -nde=데베레어, 북부 -ndo=은동가어 -nds=저지 독일어 -nep=네팔어 -new=네와르어 -nia=니아스어 -nic=니카라과 코르도바 -niu=니웨언어 -nno=노르웨이어(니노르스크) -nob=노르웨이어(북몰) -nog=노가이어 -non=고대 노르웨이어 -nor=노르웨이어 -nqo=응코어 -nso=북부 소토어 -nub=누비안어 -nwc=고전 네와르어 -nya=치체와어 -nym=니암웨지어 -nyn=니안콜어 -nyo=뉴로어 -nzi=느지마어 -oci=옥시트어(1500년 이후) -oji=오지브와어 -ori=오리야어 -orm=오로모어 -osa=오세이지어 -oss=오세티안어 -ota=오스만 터키어 -oto=오토미안어 -paa=파푸아어(기타) -pag=판가시난어 -pal=팔레비어 -pam=팜팡가어 -pan=펀잡어 -pap=파피아먼토어 -pau=팔라우어 -peo=고대 페르시아어 -per=페르시아어 -phi=필리핀어(기타) -phn=페니키아어 -pli=팔리어 -pol=폴란드어 -pon=폼페이어 -por=포르투칼어 -pra=프라크리트어 -pro=고대 프로방스어 -pus=파슈토(파슈토어) -que=케추아어 -raj=라자스탄어 -rap=라파뉴이 -rar=라로통가어 -roa=로망스어(기타) -roh=로망슈어 -rom=집시어 -rum=루마니아어 -run=룬디어 -rup=아로마니아어 -rus=러시아어 -sad=산다웨어 -sag=산고어 -sah=야쿠트어 -sai=남아메리카 인디언어 (기타) -sal=샐리시어어 -sam=사마리아 아랍어 -san=산스크리트어 -sas=사사크어 -sat=산탈리어 -scn=시칠리아어 -sco=스코틀랜드어 -sel=셀쿠프어 -sem=셈어(기타) -sga=고대 아일랜드어 -sgn=수화 -shn=샨어 -sid=시다모어 -sin=스리랑카어 -sio=수족어 -sit=슬로베니아 톨라르 -sla=슬라브어 -slo=슬로바키아어 -slv=슬로베니아어 -sma=남부 사미어 -sme=북부 사미어 -smi=사미어 (기타) -smj=룰레 사미어 -smn=이나리 사미어 -smo=사모아어 -sms=스콜트 사미어 -sna=쇼나어 -snd=신디어 -snk=소닌케어 -sog=소그디엔어 -som=소말리아어 -son=송가이족어 -sot=소토어, 남부 -spa=스페인어 -srd=사르디니아어 -srn=스라난 통가어 -srp=세르비아어 -srr=세레르어 -ssa=니로-사하람어 (기타) -ssw=시스와티어 -suk=수쿠마어 -sun=순단어 -sus=수수어 -sux=수메르어 -swa=스와힐리어 -swe=스웨덴어 -syc=고전 시리아어 -syr=시리아어 -tah=타히티안어 -tai=태국어(기타) -tam=타밀어 -tat=타타르어 -tel=텔루구어 -tem=팀니어 -ter=테레노어 -tet=테툼어 -tgk=타지키스탄어 -tgl=타갈로그어 -tha=태국어 -tib=티베트어 -tig=티그레어 -tir=티그리냐어 -tiv=티브어 -tkl=토켈라우제도어 -tlh=클링온어 -tli=틀링깃족어 -tmh=타마섹어 -tog=니아사 통가어 -ton=통가어(통가 섬) -tpi=토크 피신어 -tsi=트심시안어 -tsn=세츠와나어 -tso=통가어 -tuk=투르크멘어 -tum=툼부카어 -tup=투피어 -tur=터키어 -tut=알타이제어 (기타) -tvl=투발루어 -twi=트위어 -tyv=투비니안어 -udm=우드말트어 -uga=유가리틱어 -uig=위구르어 -ukr=우크라이나어 -umb=움분두어 -und=알 수 없는 언어 -urd=우르두어 -uzb=우즈베크어 -vai=바이어 -ven=벤다어 -vie=베트남어 -vol=볼라퓌크어 -vot=보틱어 -wak=와카샨어 -wal=월라이타어 -war=와라이어 -was=와쇼어 -wel=웨일스어 -wen=소르브어 -wln=왈룬어 -wol=올로프어 -xal=칼미크어 -xho=반투어(남아프리카) -yao=야오족어 -yap=얍페세어 -yid=이디시어 -yor=요루바어 -ypk=야픽어 -zap=사포테크어 -zbl=블리스 심볼 -zen=제나가어 -zha=주앙어 -znd=아잔데족어 -zul=줄루어 -zun=주니어 -zxx=언어 관련 내용 없음 -zza=자자어 - -# script names -# key is ISO 15924 script code - -Arab=아랍 문자 -Armi=아랍제국 문자 -Armn=아르메니아 문자 -Avst=아베스타 문자 -Bali=발리 문자 -Bamu=바뭄 문자 -Bass=바사바흐 문자 -Batk=바타크 문자 -Beng=벵골 문자 -Blis=블리스기호 문자 -Bopo=주음부호 -Brah=브라미 -Brai=브라유 점자 -Bugi=부기 문자 -Buhd=부히드 문자 -Cakm=차크마 문자 -Cans=통합 캐나다 토착어 -Cari=카리 문자 -Cham=칸 고어 -Cher=체로키 문자 -Cirt=키르쓰 -Copt=콥트 문자 -Cprt=키프로스 문자 -Cyrl=키릴 문자 -Cyrs=고대교회슬라브어 키릴문자 -Deva=데바나가리 문자 -Dsrt=디저렛 문자 -Dupl=듀플로이안 문자 -Egyd=고대 이집트 민중문자 -Egyh=고대 이집트 신관문자 -Egyp=고대 이집트 신성문자 -Elba=엘바산 문자 -Ethi=에티오피아 문자 -Geok=그루지야 쿠츠리 문자 -Geor=조지아 문자 -Glag=글라골 문자 -Goth=고트 문자 -Gran=그란타 문자 -Grek=그리스 문자 -Gujr=구자라트 문자 -Guru=구르무키 문자 -Hang=한글 -Hani=한자 -Hano=하누누 문자 -Hans=간체 -Hant=번체 -Hebr=히브리 문자 -Hira=히라가나 -Hmng=파하우 몽 문자 -Hrkt=가나 -Hung=고대 헝가리 문자 -Inds=인더스 문자 -Ital=고대 이탈리아 문자 -Java=자바 문자 -Jpan=일본 문자 -Kali=카야 리 문자 -Kana=가타카나 -Khar=카로슈티 문자 -Khmr=크메르 문자 -Knda=칸나다 문자 -Kore=한국 문자 -Kpel=크펠레 문자 -Kthi=카이시 문자 -Lana=란나 문자 -Laoo=라오 문자 -Latf=독일식 로마자 -Latg=아일랜드식 로마자 -Latn=로마자 -Lepc=렙차 문자 -Limb=림부 문자 -Lina=선형 문자(A) -Linb=선형 문자(B) -Lisu=프레이저 문자 -Loma=로마 문자 -Lyci=리키아 문자 -Lydi=리디아 문자 -Mand=만다이아 문자 -Mani=마니교 문자 -Maya=마야 상형 문자 -Mend=멘데 문자 -Merc=메로에 필기체 -Mero=메로에 문자 -Mlym=말라얄람 문자 -Mong=몽골 문자 -Moon=문 문자 -Mtei=메이테이 마옉 문자 -Mymr=미얀마 문자 -Narb=옛 북부 아라비아 문자 -Nbat=나바테아 문자 -Nkgb=나시 게바 문자 -Nkoo=응코 문자 -Ogam=오검 문자 -Olck=올 치키 문자 -Orkh=오르혼어 -Orya=오리야 문자 -Osma=오스마니아 문자 -Palm=팔미라 문자 -Perm=고대 페름 문자 -Phag=파스파 문자 -Phli=명문 팔라비 문자 -Phlp=솔터 팔라비 문자 -Phlv=북 팔라비 문자 -Phnx=페니키아 문자 -Plrd=폴라드 표음 문자 -Prti=명문 파라티아 문자 -Rjng=레장 문자 -Roro=롱고롱고 -Runr=룬 문자 -Samr=사마리아 문자 -Sara=사라티 -Sarb=옛 남부 아라비아 문자 -Saur=사우라슈트라 문자 -Sgnw=수화 문자 -Shaw=샤비안 문자 -Sind=쿠다와디 문자 -Sinh=신할라 문자 -Sund=순다 문자 -Sylo=실헤티 나가리 -Syrc=시리아 문자 -Syre=에스트랑겔로식 시리아 문자 -Syrj=서부 시리아 문자 -Syrn=동부 시리아 문자 -Tagb=타그반와 문자 -Tale=타이 레 문자 -Talu=신 타이 루에 -Taml=타밀 문자 -Tavt=태국 베트남 문자 -Telu=텔루구 문자 -Teng=텡과르 문자 -Tfng=티피나그 문자 -Tglg=타갈로그 문자 -Thaa=타나 문자 -Thai=타이 문자 -Tibt=티베트 문자 -Ugar=우가리트 문자 -Vaii=바이 문자 -Visp=시화법 -Wara=바랑 크시티 문자 -Xpeo=고대 페르시아 문자 -Xsux=수메르-아카드어 설형문자 -Yiii=이 문자 -Zinh=구전 문자 -Zmth=수학 기호 -Zsym=기호 -Zxxx=구전 -Zyyy=일반 문자 -Zzzz=알 수 없는 문자 - -# country names -# key is ISO 3166 country code - -AD=안도라 -AE=아랍에미리트 -AF=아프가니스탄 -AG=앤티가 바부다 -AI=앵귈라 -AL=알바니아 -AM=아르메니아 -AN=네덜란드령 안틸레스 -AO=앙골라 -AQ=남극 대륙 -AR=아르헨티나 -AS=아메리칸 사모아 -AT=오스트리아 -AU=오스트레일리아 -AW=아루바 -AX=올란드 제도 -AZ=아제르바이잔 -BA=보스니아 헤르체고비나 -BB=바베이도스 -BD=방글라데시 -BE=벨기에 -BF=부르키나파소 -BG=불가리아 -BH=바레인 -BI=부룬디 -BJ=베냉 -BM=버뮤다 -BN=브루나이 -BO=볼리비아 -BR=브라질 -BS=바하마 -BT=부탄 -BV=부베섬 -BW=보츠와나 -BY=벨라루스 -BZ=벨리즈 -CA=캐나다 -CC=코코스 제도 -CD=콩고-킨샤사 -CF=중앙 아프리카 공화국 -CG=콩고-브라자빌 -CH=스위스 -CI=코트디부아르 -CK=쿡 제도 -CL=칠레 -CM=카메룬 -CN=중국 -CO=콜롬비아 -CR=코스타리카 -CS=세르비아 몬테네그로(유고슬라비아) -CU=쿠바 -CV=카보베르데 -CX=크리스마스섬 -CY=키프로스 -CZ=체코 -DE=독일 -DJ=지부티 -DK=덴마크 -DM=도미니카 -DO=도미니카 공화국 -DZ=알제리 -EC=에콰도르 -EE=에스토니아 -EG=이집트 -EH=서사하라 -ER=에리트리아 -ES=스페인 -ET=에티오피아 -FI=핀란드 -FJ=피지 -FK=포클랜드 제도 -FM=미크로네시아 -FO=페로 제도 -FR=프랑스 -GA=가봉 -GB=영국 -GD=그레나다 -GE=조지아 -GF=프랑스령 기아나 -GH=가나 -GI=지브롤터 -GL=그린란드 -GM=감비아 -GN=기니 -GP=과들루프 -GQ=적도 기니 -GR=그리스 -GS=사우스조지아 사우스샌드위치 제도 -GT=과테말라 -GU=괌 -GW=기니비사우 -GY=가이아나 -HK=홍콩(중국 특별행정구) -HM=허드 맥도널드 제도 -HN=온두라스 -HR=크로아티아 -HT=아이티 -HU=헝가리 -ID=인도네시아 -IE=아일랜드 -IL=이스라엘 -IN=인도 -IO=영국령 인도양 식민지 -IQ=이라크 -IR=이란 -IS=아이슬란드 -IT=이탈리아 -JM=자메이카 -JO=요르단 -JP=일본 -KE=케냐 -KG=키르기스스탄 -KH=캄보디아 -KI=키리바시 -KM=코모로 -KN=세인트키츠 네비스 -KP=북한 -KR=대한민국 -KW=쿠웨이트 -KY=케이맨 제도 -KZ=카자흐스탄 -LA=라오스 -LB=레바논 -LC=세인트루시아 -LI=리히텐슈타인 -LK=스리랑카 -LR=라이베리아 -LS=레소토 -LT=리투아니아 -LU=룩셈부르크 -LV=라트비아 -LY=리비아 -MA=모로코 -MC=모나코 -MD=몰도바 -ME=몬테네그로 -MG=마다가스카르 -MH=마셜 제도 -MK=북마케도니아 -ML=말리 -MM=미얀마 -MN=몽골 -MO=마카오(중국 특별행정구) -MP=북마리아나제도 -MQ=마르티니크 -MR=모리타니 -MS=몬트세라트 -MT=몰타 -MU=모리셔스 -MV=몰디브 -MW=말라위 -MX=멕시코 -MY=말레이시아 -MZ=모잠비크 -NA=나미비아 -NC=뉴칼레도니아 -NE=니제르 -NF=노퍽섬 -NG=나이지리아 -NI=니카라과 -NL=네덜란드 -NO=노르웨이 -NP=네팔 -NR=나우루 -NU=니우에 -NZ=뉴질랜드 -OM=오만 -PA=파나마 -PE=페루 -PF=프랑스령 폴리네시아 -PG=파푸아뉴기니 -PH=필리핀 -PK=파키스탄 -PL=폴란드 -PM=생피에르 미클롱 -PN=핏케언 제도 -PR=푸에르토리코 -PS=팔레스타인 지구 -PT=포르투갈 -PW=팔라우 -PY=파라과이 -QA=카타르 -RE=레위니옹 -RO=루마니아 -RS=세르비아 -RU=러시아 -RW=르완다 -SA=사우디아라비아 -SB=솔로몬 제도 -SC=세이셸 -SD=수단 -SE=스웨덴 -SG=싱가포르 -SH=세인트헬레나 -SI=슬로베니아 -SJ=스발바르제도-얀마웬섬 -SK=슬로바키아 -SL=시에라리온 -SM=산마리노 -SN=세네갈 -SO=소말리아 -SR=수리남 -ST=상투메 프린시페 -SV=엘살바도르 -SY=시리아 -SZ=에스와티니 -TC=터크스 케이커스 제도 -TD=차드 -TF=프랑스 남부 지방 -TG=토고 -TH=태국 -TJ=타지키스탄 -TK=토켈라우 -TL=동티모르 -TM=투르크메니스탄 -TN=튀니지 -TO=통가 -TR=터키 -TT=트리니다드 토바고 -TV=투발루 -TW=대만 -TZ=탄자니아 -UA=우크라이나 -UG=우간다 -UM=미국령 해외 제도 -US=미국 -UY=우루과이 -UZ=우즈베키스탄 -VA=바티칸 시국 -VC=세인트빈센트그레나딘 -VE=베네수엘라 -VG=영국령 버진아일랜드 -VI=미국령 버진아일랜드 -VN=베트남 -VU=바누아투 -WF=왈리스-푸투나 제도 -WS=사모아 -YE=예멘 -YT=마요트 -ZA=남아프리카 -ZM=잠비아 -ZW=짐바브웨 - -# territory names -# key is UN M.49 country and area code - -001=세계 -002=아프리카 -003=북아메리카 -005=남아메리카 -009=오세아니아 -011=서부 아프리카 -013=중앙 아메리카 -014=동부 아프리카 -015=북부 아프리카 -017=중부 아프리카 -018=남부 아프리카 -019=아메리카 대륙 -021=북부 아메리카 -029=카리브 제도 -030=동아시아 -034=남아시아 -035=동남아시아 -039=남유럽 -053=오스트랄라시아 -054=멜라네시아 -057=미크로네시아 지역 -061=폴리네시아 -142=아시아 -143=중앙 아시아 -145=서아시아 -150=유럽 -151=동유럽 -154=북유럽 -155=서유럽 -419=라틴 아메리카 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties deleted file mode 100644 index e24c8831499..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -lt=lietuvių - -# country names -# key is ISO 3166 country code - -LT=Lietuva diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties deleted file mode 100644 index 07426bc61a0..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -lv=latviešu - -# country names -# key is ISO 3166 country code - -LV=Latvija diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties deleted file mode 100644 index e80d35dc68b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -mk=македонски - -# country names -# key is ISO 3166 country code - -MK=Северна Македонија diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties deleted file mode 100644 index e2e6a96c56a..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ms=Melayu -AE=Emiriah Arab Bersatu -AG=Antigua dan Barbuda -BA=Bosnia dan Herzegovina -CA=Kanada -CC=Kepulauan Cocos (Keeling) -CF=Republik Afrika Tengah -CI=Cote d’Ivoire -DE=Jerman -DO=Republik Dominica -EG=Mesir -EH=Sahara Barat -ES=Sepanyol -FR=Perancis -GS=Kepulauan Georgia Selatan & Sandwich Selatan -GW=Guinea Bissau -HM=Kepulauan Heard & McDonald -IT=Itali -JP=Jepun -KH=Kemboja -KN=Saint Kitts dan Nevis -KP=Korea Utara -KR=Korea Selatan -LB=Lubnan -MA=Maghribi -MG=Madagaskar -MH=Kepulauan Marshall -MO=Macau SAR China -NL=Belanda -PH=Filipina -PM=Saint Pierre dan Miquelon -PS=Wilayah Palestin -RE=Reunion -SA=Arab Saudi -SB=Kepulauan Solomon -SG=Singapura -SJ=Svalbard dan Jan Mayen -SR=Surinam -ST=Sao Tome dan Principe -TC=Kepulauan Turks dan Caicos -TR=Turki -TT=Trinidad dan Tobago -US=Amerika Syarikat -VC=Saint Vincent dan Grenadines -WF=Wallis dan Futuna -YE=Yaman -ZA=Afrika Selatan diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties deleted file mode 100644 index 97b4bc59890..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties +++ /dev/null @@ -1,297 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ab=Abkażjan -af=Afrikans -am=Amhariku -ar=Għarbi -av=Avarik -az=Ażerbajġani -be=Belarussu -bg=Bulgaru -bh=Biħari -bo=Tibetjan -bs=Bożnijaku -ca=Katalan -co=Korsiku -cs=Ċek -cu=Slaviku tal-Knisja -da=Daniż -de=Ġermaniż -el=Grieg -en=Ingliż -es=Spanjol -et=Estonjan -eu=Bask -fa=Persjan -fi=Finlandiż -fj=Fiġjan -fr=Franċiż -fy=Frisian tal-Punent -ga=Irlandiż -gd=Galliku Skoċċiż -gl=Galiċjan -he=Ebrajk -hr=Kroat -hu=Ungeriż -hy=Armen -id=Indoneżjan -ik=Inupjak -in=Indoneżjan -is=Iżlandiż -it=Taljan -iw=Ebrajk -ja=Ġappuniż -jv=Ġavaniż -ka=Ġorġjan -ki=Kikuju -kk=Każak -kl=Kalallisut -ku=Kurd -kw=Korniku -ky=Kirgiż -lb=Lussemburgiż -ln=Lingaljan -lt=Litwan -lv=Latvjan -mh=Marshalljaniż -mk=Maċedonjan -mn=Mongoljan -mo=Moldavjan -mt=Malti -my=Burmiż -na=Naurujan -nb=Bokmal Norveġiż -nd=Ndebeli tat-Tramuntana -ne=Nepaliż -nl=Olandiż -nn=Ninorsk Norveġiż -no=Norveġiż -nr=Ndebele tan-Nofsinhar -oc=Oċċitan -oj=Oġibwa -os=Ossettiku -pl=Pollakk -pt=Portugiż -rm=Romanz -ro=Rumen -ru=Russu -rw=Kinjarwanda -sc=Sardinjan -se=Sami tat-Tramuntana -sk=Slovakk -sl=Sloven -sq=Albaniż -sr=Serb -st=Soto tan-Nofsinhar -su=Sundaniż -sv=Żvediż -tg=Taġik -th=Tajlandiż -tk=Turkmeni -tr=Tork -ty=Taħitjan -uk=Ukren -vi=Vjetnamiż -vo=Volapuk -zh=Ċiniż -AE=l-Emirati Għarab Magħquda -AF=l-Afganistan -AL=l-Albanija -AM=l-Armenja -AN=Antilles Olandiżi -AQ=l-Antartika -AR=l-Arġentina -AS=is-Samoa Amerikana -AT=l-Awstrija -AU=l-Awstralja -AZ=l-Ażerbajġan -BA=il-Bożnija-Ħerzegovina -BD=il-Bangladesh -BE=il-Belġju -BG=il-Bulgarija -BH=il-Bahrain -BN=il-Brunei -BO=il-Bolivja -BR=Il-Brażil -BS=il-Bahamas -BT=il-Bhutan -BY=il-Belarussja -BZ=il-Belize -CA=il-Kanada -CC=Gżejjer Cocos (Keeling) -CD=ir-Repubblika Demokratika tal-Kongo -CF=ir-Repubblika Ċentru-Afrikana -CG=il-Kongo - Brazzaville -CH=l-Iżvizzera -CI=il-Kosta tal-Avorju -CL=iċ-Ċili -CM=il-Kamerun -CN=iċ-Ċina -CO=il-Kolombja -CR=il-Costa Rica -CS=Serbja u Montenegro -CU=Kuba -CY=Ċipru -CZ=ir-Repubblika Ċeka -DE=il-Ġermanja -DJ=il-Djibouti -DK=id-Danimarka -DO=ir-Repubblika Dominicana -DZ=l-Alġerija -EC=l-Ekwador -EE=l-Estonja -EG=l-Eġittu -EH=is-Saħara tal-Punent -ER=l-Eritrea -ES=Spanja -ET=l-Etjopja -FI=il-Finlandja -FJ=Fiġi -FM=il-Mikroneżja -FO=il-Gżejjer Faeroe -FR=Franza -GB=ir-Renju Unit -GE=il-Georgia -GF=il-Guyana Franċiża -GH=il-Ghana -GM=il-Gambja -GN=il-Guinea -GQ=il-Guinea Ekwatorjali -GR=il-Greċja -GS=il-Georgia tan-Nofsinhar u l-Gżejjer Sandwich tan-Nofsinhar -GT=il-Gwatemala -GW=il-Guinea-Bissau -GY=il-Guyana -HK=ir-Reġjun Amministrattiv Speċjali ta’ Hong Kong tar-Repubblika tal-Poplu taċ-Ċina -HM=il-Gżejjer Heard u l-Gżejjer McDonald -HN=il-Honduras -HR=il-Kroazja -HT=il-Haiti -HU=l-Ungerija -ID=l-Indoneżja -IE=l-Irlanda -IL=Iżrael -IN=l-Indja -IS=l-Iżlanda -IT=l-Italja -JM=il-Ġamajka -JO=il-Ġordan -JP=il-Ġappun -KE=il-Kenja -KG=il-Kirgiżistan -KH=il-Kambodja -KN=Saint Kitts u Nevis -KP=il-Korea ta’ Fuq -KR=il-Korea t’Isfel -KW=il-Kuwajt -KZ=il-Każakistan -LB=il-Libanu -LC=Saint Lucia -LR=il-Liberja -LS=il-Lesoto -LT=il-Litwanja -LU=il-Lussemburgu -LV=il-Latvja -LY=il-Libja -MA=il-Marokk -MD=il-Moldova -MH=Gżejjer Marshall -MK=il-Maċedonja ta’ Fuq -MM=il-Myanmar/Burma -MN=il-Mongolja -MO=ir-Reġjun Amministrattiv Speċjali tal-Macao tar-Repubblika tal-Poplu taċ-Ċina -MP=Ġżejjer Mariana tat-Tramuntana -MR=il-Mauritania -MX=il-Messiku -MY=il-Malasja -MZ=il-Mozambique -NA=in-Namibja -NE=in-Niġer -NG=in-Niġerja -NI=in-Nikaragwa -NL=in-Netherlands -NO=in-Norveġja -PF=Polineżja Franċiża -PH=il-Filippini -PL=il-Polonja -PM=Saint Pierre u Miquelon -PS=it-Territorji Palestinjani -PT=il-Portugall -PY=il-Paragwaj -RO=ir-Rumanija -RU=ir-Russja -SA=l-Arabja Sawdija -SE=l-Iżvezja -SI=is-Slovenja -SJ=Svalbard u Jan Mayen -SK=is-Slovakkja -SO=is-Somalja -SR=is-Suriname -ST=São Tomé u Príncipe -SY=is-Sirja -SZ=l-Eswatini -TC=il-Gżejjer Turks u Caicos -TD=iċ-Chad -TF=It-Territorji Franċiżi tan-Nofsinhar -TH=it-Tajlandja -TJ=it-Taġikistan -TK=it-Tokelau -TL=Timor Leste -TN=it-Tuneżija -TR=it-Turkija -TT=Trinidad u Tobago -TW=it-Tajwan -TZ=it-Tanzanija -UA=l-Ukrajna -US=l-Istati Uniti -UY=l-Urugwaj -UZ=l-Użbekistan -VA=l-Istat tal-Belt tal-Vatikan -VC=Saint Vincent u l-Grenadini -VE=il-Venezwela -VN=il-Vjetnam -WF=Wallis u Futuna -YE=il-Jemen -ZA=l-Afrika t’Isfel -ZM=iż-Żambja -ZW=iż-Żimbabwe diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties deleted file mode 100644 index 0ed815b8913..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - -# language names -# key is ISO 639 language code - -ab=Abchazisch -ae=Avestisch -am=Amhaars -an=Aragonees -ar=Arabisch -as=Assamees -av=Avarisch -az=Azerbeidzjaans -ba=Basjkiers -be=Belarussisch -bg=Bulgaars -bn=Bengaals -bo=Tibetaans -br=Bretons -bs=Bosnisch -ca=Catalaans -ce=Tsjetsjeens -co=Corsicaans -cs=Tsjechisch -cu=Kerkslavisch -cv=Tsjoevasjisch -da=Deens -de=Duits -el=Grieks -en=Engels -es=Spaans -et=Estisch -eu=Baskisch -fa=Perzisch -fi=Fins -fj=Fijisch -fo=Faeröers -fr=Frans -fy=Fries -ga=Iers -gd=Schots-Gaelisch -gl=Galicisch -gn=Guaraní -he=Hebreeuws -hr=Kroatisch -ht=Haïtiaans Creools -hu=Hongaars -hy=Armeens -id=Indonesisch -ii=Yi -is=IJslands -it=Italiaans -ja=Japans -jv=Javaans -ka=Georgisch -ki=Gikuyu -kk=Kazachs -kl=Groenlands -ko=Koreaans -ks=Kasjmiri -ku=Koerdisch -ky=Kirgizisch -la=Latijn -lb=Luxemburgs -lg=Luganda -li=Limburgs -lo=Laotiaans -lt=Litouws -lv=Lets -mg=Malagassisch -mh=Marshallees -mk=Macedonisch -mn=Mongools -mo=Moldavisch -ms=Maleis -mt=Maltees -my=Birmaans -na=Nauruaans -nb=Noors - Bokmål -nd=Noord-Ndebele -ne=Nepalees -nl=Nederlands -nn=Noors - Nynorsk -no=Noors -nr=Zuid-Ndbele -oc=Occitaans -om=Afaan Oromo -os=Ossetisch -pl=Pools -ps=Pasjtoe -pt=Portugees -rm=Reto-Romaans -rn=Kirundi -ro=Roemeens -ru=Russisch -sa=Sanskriet -sc=Sardijns -se=Noord-Samisch -si=Singalees -sk=Slowaaks -sl=Sloveens -sm=Samoaans -so=Somalisch -sq=Albanees -sr=Servisch -ss=Swazi -st=Zuid-Sotho -su=Soendanees -sv=Zweeds -tg=Tadzjieks -tk=Turkmeens -to=Tongaans -tr=Turks -tt=Tataars -ty=Tahitiaans -ug=Oeigoers -uk=Oekraïens -uz=Oezbeeks -vi=Vietnamees -wa=Waals -yi=Jiddisch -zh=Chinees -zu=Zoeloe - -# country names -# key is ISO 3166 country code - -AE=Verenigde Arabische Emiraten -AG=Antigua en Barbuda -AL=Albanië -AM=Armenië -AN=Nederlandse Antillen -AR=Argentinië -AS=Amerikaans-Samoa -AT=Oostenrijk -AU=Australië -AX=Åland -AZ=Azerbeidzjan -BA=Bosnië en Herzegovina -BE=België -BG=Bulgarije -BH=Bahrein -BR=Brazilië -BS=Bahama’s -BV=Bouveteiland -CC=Cocoseilanden -CD=Congo-Kinshasa -CF=Centraal-Afrikaanse Republiek -CG=Congo-Brazzaville -CH=Zwitserland -CI=Ivoorkust -CK=Cookeilanden -CL=Chili -CM=Kameroen -CS=Servië en Montenegro -CV=Kaapverdië -CX=Christmaseiland -CZ=Tsjechië -DE=Duitsland -DK=Denemarken -DO=Dominicaanse Republiek -DZ=Algerije -EE=Estland -EG=Egypte -EH=Westelijke Sahara -ES=Spanje -ET=Ethiopië -FK=Falklandeilanden -FO=Faeröer -FR=Frankrijk -GB=Verenigd Koninkrijk -GE=Georgië -GF=Frans-Guyana -GL=Groenland -GN=Guinee -GQ=Equatoriaal-Guinea -GR=Griekenland -GS=Zuid-Georgia en Zuidelijke Sandwicheilanden -GW=Guinee-Bissau -HK=Hongkong SAR van China -HM=Heard en McDonaldeilanden -HR=Kroatië -HT=Haïti -HU=Hongarije -ID=Indonesië -IE=Ierland -IL=Israël -IO=Brits Indische Oceaanterritorium -IQ=Irak -IS=IJsland -IT=Italië -JO=Jordanië -KE=Kenia -KG=Kirgizië -KH=Cambodja -KM=Comoren -KN=Saint Kitts en Nevis -KP=Noord-Korea -KR=Zuid-Korea -KW=Koeweit -KY=Kaaimaneilanden -KZ=Kazachstan -LB=Libanon -LC=Saint Lucia -LT=Litouwen -LU=Luxemburg -LV=Letland -LY=Libië -MA=Marokko -MD=Moldavië -MG=Madagaskar -MH=Marshalleilanden -MK=Noord-Macedonië -MM=Myanmar (Birma) -MN=Mongolië -MO=Macau SAR van China -MP=Noordelijke Marianen -MR=Mauritanië -MV=Maldiven -MY=Maleisië -NA=Namibië -NC=Nieuw-Caledonië -NF=Norfolk -NL=Nederland -NO=Noorwegen -NZ=Nieuw-Zeeland -PF=Frans-Polynesië -PG=Papoea-Nieuw-Guinea -PH=Filipijnen -PL=Polen -PM=Saint-Pierre en Miquelon -PN=Pitcairneilanden -PS=Palestijnse gebieden -RO=Roemenië -RS=Servië -RU=Rusland -SA=Saoedi-Arabië -SB=Salomonseilanden -SC=Seychellen -SD=Soedan -SE=Zweden -SH=Sint-Helena -SI=Slovenië -SJ=Spitsbergen en Jan Mayen -SK=Slowakije -SO=Somalië -ST=Sao Tomé en Principe -SY=Syrië -TC=Turks- en Caicoseilanden -TD=Tsjaad -TF=Franse Gebieden in de zuidelijke Indische Oceaan -TJ=Tadzjikistan -TL=Oost-Timor -TN=Tunesië -TR=Turkije -TT=Trinidad en Tobago -UA=Oekraïne -UG=Oeganda -UM=Kleine afgelegen eilanden van de Verenigde Staten -US=Verenigde Staten -UZ=Oezbekistan -VA=Vaticaanstad -VC=Saint Vincent en de Grenadines -VG=Britse Maagdeneilanden -VI=Amerikaanse Maagdeneilanden -WF=Wallis en Futuna -YE=Jemen -ZA=Zuid-Afrika diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties deleted file mode 100644 index b4365f5ef27..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -nb=norsk bokmål -nn=norsk nynorsk -no=norsk - -# country names -# key is ISO 3166 country code - -NO=Norge - - -# variant names -# key is %%variant -# rarely localized - -%%B=bokmål -%%NY=nynorsk diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties deleted file mode 100644 index 1a706e9cdc5..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -nb=norsk bokmål -nn=norsk nynorsk -no=norsk - -# country names -# key is ISO 3166 country code - -NO=Noreg - - -# variant names -# key is %%variant -# rarely localized - -%%B=bokmål -%%NY=nynorsk diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties deleted file mode 100644 index d7ff0669b80..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ab=abchaski -aa=afar -af=afrikaans -sq=albański -am=amharski -ar=arabski -hy=ormiański -as=asamski -ay=ajmara -az=azerbejdżański -ba=baszkirski -eu=baskijski -bn=bengalski -dz=dzongkha -bh=biharski -bi=bislama -br=bretoński -bg=bułgarski -my=birmański -be=białoruski -km=khmerski -ca=kataloński -zh=chiński -co=korsykański -hr=chorwacki -cs=czeski -da=duński -nl=niderlandzki -en=angielski -eo=esperanto -et=estoński -fo=farerski -fj=fidżijski -fi=fiński -fr=francuski -fy=zachodniofryzyjski -gl=galicyjski -ka=gruziński -de=niemiecki -el=grecki -kl=grenlandzki -gn=guarani -gu=gudżarati -ha=hausa -he=hebrajski -iw=hebrajski -hi=hindi -hu=węgierski -is=islandzki -id=indonezyjski -in=indonezyjski -ia=interlingua -ie=interlingue -iu=inuktitut -ik=inupiak -ga=irlandzki -it=włoski -ja=japoński -jw=jawajski -kn=kannada -ks=kaszmirski -kk=kazachski -rw=kinya-ruanda -ky=kirgiski -rn=rundi -ko=koreański -ku=kurdyjski -lo=laotański -la=łaciński -lv=łotewski -ln=lingala -lt=litewski -mk=macedoński -mg=malgaski -ms=malajski -ml=malajalam -mt=maltański -mi=maoryjski -mr=marathi -mo=mołdawski -mn=mongolski -na=nauruański -ne=nepalski -no=norweski -oc=oksytański -or=orija -om=oromo -ps=paszto -fa=perski -pl=polski -pt=portugalski -pa=pendżabski -qu=keczua -rm=retoromański -ro=rumuński -ru=rosyjski -sm=samoański -sg=sango -sa=sanskryt -gd=szkocki gaelicki -sr=serbski -st=sotho południowy -tn=setswana -sn=shona -sd=sindhi -si=syngaleski -ss=suazi -sk=słowacki -sl=słoweński -so=somalijski -es=hiszpański -su=sundajski -sw=suahili -sv=szwedzki -tl=tagalski -tg=tadżycki -ta=tamilski -tt=tatarski -te=telugu -th=tajski -bo=tybetański -ti=tigrinia -to=tonga -ts=tsonga -tr=turecki -tk=turkmeński -tw=twi -ug=ujgurski -uk=ukraiński -ur=urdu -uz=uzbecki -vi=wietnamski -vo=wolapik -cy=walijski -wo=wolof -xh=khosa -ji=jidysz -yi=jidysz -yo=joruba -za=czuang -zu=zulu - -# country names -# key is ISO 3166 country code - -AF=Afganistan -DZ=Algieria -AD=Andora -AR=Argentyna -AZ=Azerbejdżan -BS=Bahamy -BH=Bahrajn -BD=Bangladesz -BY=Białoruś -BE=Belgia -BM=Bermudy -BO=Boliwia -BA=Bośnia i Hercegowina -BR=Brazylia -BG=Bułgaria -KH=Kambodża -CM=Kamerun -CA=Kanada -CV=Republika Zielonego Przylądka -CF=Republika Środkowoafrykańska -TD=Czad -CN=Chiny -CO=Kolumbia -KM=Komory -CG=Kongo -CR=Kostaryka -HR=Chorwacja -CU=Kuba -CY=Cypr -CZ=Czechy -DK=Dania -DJ=Dżibuti -DM=Dominika -DO=Dominikana -TP=Wschodni Timor -EC=Ekwador -EG=Egipt -SV=Salwador -GQ=Gwinea Równikowa -ER=Erytrea -ET=Etiopia -FJ=Fidżi -FI=Finlandia -FR=Francja -GF=Gujana Francuska -PF=Polinezja Francuska -TF=Francuskie Terytoria Południowe i Antarktyczne -GE=Gruzja -DE=Niemcy -GR=Grecja -GP=Gwadelupa -GT=Gwatemala -GN=Gwinea -GW=Gwinea Bissau -GY=Gujana -HK=SRA Hongkong (Chiny) -HU=Węgry -IS=Islandia -IN=Indie -ID=Indonezja -IQ=Irak -IE=Irlandia -IL=Izrael -IT=Włochy -JM=Jamajka -JP=Japonia -JO=Jordania -KZ=Kazachstan -KE=Kenia -KP=Korea Północna -KR=Korea Południowa -KW=Kuwejt -KG=Kirgistan -LV=Łotwa -LB=Liban -LY=Libia -LT=Litwa -LU=Luksemburg -MK=Macedonia Północna -MG=Madagaskar -MY=Malezja -MQ=Martynika -MR=Mauretania -YT=Majotta -MX=Meksyk -FM=Mikronezja -MD=Mołdawia -MC=Monako -MA=Maroko -MZ=Mozambik -MM=Mjanma (Birma) -NL=Holandia -AN=Antyle Holenderskie -NC=Nowa Kaledonia -NZ=Nowa Zelandia -NI=Nikaragua -NO=Norwegia -PG=Papua-Nowa Gwinea -PY=Paragwaj -PH=Filipiny -PL=Polska -PT=Portugalia -PR=Portoryko -QA=Katar -RO=Rumunia -RU=Rosja -SA=Arabia Saudyjska -SP=Serbia -SC=Seszele -SG=Singapur -SK=Słowacja -SI=Słowenia -ZA=Republika Południowej Afryki -ES=Hiszpania -SR=Surinam -SE=Szwecja -CH=Szwajcaria -TW=Tajwan -TJ=Tadżykistan -TH=Tajlandia -TT=Trynidad i Tobago -TN=Tunezja -TR=Turcja -UA=Ukraina -AE=Zjednoczone Emiraty Arabskie -GB=Wielka Brytania -US=Stany Zjednoczone -UY=Urugwaj -VA=Watykan -VE=Wenezuela -VN=Wietnam -VG=Brytyjskie Wyspy Dziewicze -VI=Wyspy Dziewicze Stanów Zjednoczonych -EH=Sahara Zachodnia -YE=Jemen -ZR=Zair diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties deleted file mode 100644 index db303c49bbc..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties +++ /dev/null @@ -1,403 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -aa=afar -ab=abcázio -ae=avéstico -af=africâner -am=amárico -an=aragonês -ar=árabe -as=assamês -av=avárico -ay=aimará -az=azerbaijano -ba=bashkir -be=bielorrusso -bg=búlgaro -bh=biari -bi=bislamá -bm=bambara -bn=bengali -bo=tibetano -br=bretão -bs=bósnio -ca=catalão -ce=checheno -ch=chamorro -co=corso -cr=cree -cs=tcheco -cu=eslavo eclesiástico -cv=tchuvache -cy=galês -da=dinamarquês -de=alemão -dv=divehi -dz=dzonga -ee=ewe -el=grego -en=inglês -eo=esperanto -es=espanhol -et=estoniano -eu=basco -fa=persa -ff=fula -fi=finlandês -fj=fijiano -fo=feroês -fr=francês -fy=frísio ocidental -ga=irlandês -gd=gaélico escocês -gl=galego -gn=guarani -gu=guzerate -gv=manx -ha=hauçá -he=hebraico -hi=híndi -ho=hiri motu -hr=croata -ht=haitiano -hu=húngaro -hy=armênio -hz=herero -ia=interlíngua -id=indonésio -ie=interlingue -ig=igbo -ii=sichuan yi -in=indonésio -io=ido -is=islandês -it=italiano -iu=inuktitut -iw=hebraico -ja=japonês -ji=iídiche -ka=georgiano -kg=congolês -ki=quicuio -kj=cuanhama -kk=cazaque -kl=groenlandês -km=khmer -kn=canarim -ko=coreano -kr=canúri -ks=caxemira -ku=curdo -kv=komi -kw=córnico -ky=quirguiz -la=latim -lb=luxemburguês -lg=luganda -li=limburguês -ln=lingala -lo=laosiano -lt=lituano -lu=luba-catanga -lv=letão -mg=malgaxe -mh=marshalês -mi=maori -mk=macedônio -ml=malaiala -mn=mongol -mo=moldávio -mr=marati -ms=malaio -mt=maltês -my=birmanês -na=nauruano -nb=bokmål norueguês -nd=ndebele do norte -ne=nepalês -ng=dongo -nl=holandês -nn=nynorsk norueguês -no=norueguês -nr=ndebele do sul -nv=navajo -ny=nianja -oc=occitânico -oj=ojibwa -om=oromo -or=oriá -os=osseto -pa=panjabi -pi=páli -pl=polonês -ps=pashto -pt=português -qu=quíchua -rm=romanche -rn=rundi -ro=romeno -ru=russo -rw=quiniaruanda -sa=sânscrito -sc=sardo -sd=sindi -se=sami setentrional -sg=sango -si=cingalês -sk=eslovaco -sl=esloveno -so=somali -sq=albanês -sr=sérvio -ss=suázi -st=soto do sul -su=sundanês -sv=sueco -sw=suaíli -ta=tâmil -te=télugo -tg=tadjique -th=tailandês -ti=tigrínia -tk=turcomeno -tn=tswana -to=tonganês -tr=turco -ts=tsonga -tt=tártaro -tw=twi -ty=taitiano -ug=uigur -uk=ucraniano -ur=urdu -uz=uzbeque -ve=venda -vi=vietnamita -vo=volapuque -wa=valão -wo=uolofe -xh=xhosa -yi=iídiche -yo=iorubá -za=zhuang -zh=chinês -zu=zulu -AE=Emirados Árabes Unidos -AF=Afeganistão -AG=Antígua e Barbuda -AL=Albânia -AM=Armênia -AN=Antilhas Holandesas -AQ=Antártida -AS=Samoa Americana -AT=Áustria -AU=Austrália -AZ=Azerbaijão -BA=Bósnia e Herzegovina -BE=Bélgica -BF=Burquina Faso -BG=Bulgária -BH=Barein -BM=Bermudas -BO=Bolívia -BR=Brasil -BT=Butão -BV=Ilha Bouvet -BW=Botsuana -CA=Canadá -CC=Ilhas Cocos (Keeling) -CF=República Centro-Africana -CH=Suíça -CI=Costa do Marfim -CK=Ilhas Cook -CM=Camarões -CO=Colômbia -CS=Sérvia e Montenegro -CV=Cabo Verde -CX=Ilha Christmas -CY=Chipre -CZ=Tchéquia -DE=Alemanha -DJ=Djibuti -DK=Dinamarca -DO=República Dominicana -DZ=Argélia -EC=Equador -EE=Estônia -EG=Egito -EH=Saara Ocidental -ER=Eritreia -ES=Espanha -ET=Etiópia -FI=Finlândia -FK=Ilhas Malvinas -FM=Micronésia -FO=Ilhas Faroé -FR=França -GA=Gabão -GB=Reino Unido -GD=Granada -GE=Geórgia -GF=Guiana Francesa -GH=Gana -GL=Groenlândia -GM=Gâmbia -GN=Guiné -GP=Guadalupe -GQ=Guiné Equatorial -GR=Grécia -GS=Ilhas Geórgia do Sul e Sandwich do Sul -GW=Guiné-Bissau -GY=Guiana -HK=Hong Kong, RAE da China -HM=Ilhas Heard e McDonald -HR=Croácia -HU=Hungria -ID=Indonésia -IE=Irlanda -IN=Índia -IO=Território Britânico do Oceano Índico -IQ=Iraque -IR=Irã -IS=Islândia -IT=Itália -JO=Jordânia -JP=Japão -KE=Quênia -KG=Quirguistão -KH=Camboja -KI=Quiribati -KM=Comores -KN=São Cristóvão e Névis -KP=Coreia do Norte -KR=Coreia do Sul -KY=Ilhas Cayman -KZ=Cazaquistão -LB=Líbano -LC=Santa Lúcia -LR=Libéria -LS=Lesoto -LT=Lituânia -LU=Luxemburgo -LV=Letônia -LY=Líbia -MA=Marrocos -MC=Mônaco -MD=Moldávia -MH=Ilhas Marshall -MK=Macedônia do Norte -MM=Mianmar (Birmânia) -MN=Mongólia -MO=Macau, RAE da China -MP=Ilhas Marianas do Norte -MQ=Martinica -MR=Mauritânia -MU=Maurício -MV=Maldivas -MX=México -MY=Malásia -MZ=Moçambique -NA=Namíbia -NC=Nova Caledônia -NE=Níger -NF=Ilha Norfolk -NG=Nigéria -NI=Nicarágua -NL=Países Baixos -NO=Noruega -NZ=Nova Zelândia -OM=Omã -PA=Panamá -PF=Polinésia Francesa -PG=Papua-Nova Guiné -PH=Filipinas -PK=Paquistão -PL=Polônia -PM=São Pedro e Miquelão -PR=Porto Rico -PS=Territórios palestinos -PY=Paraguai -QA=Catar -RE=Reunião -RO=Romênia -RU=Rússia -RW=Ruanda -SA=Arábia Saudita -SB=Ilhas Salomão -SD=Sudão -SE=Suécia -SG=Singapura -SH=Santa Helena -SI=Eslovênia -SJ=Svalbard e Jan Mayen -SK=Eslováquia -SL=Serra Leoa -SO=Somália -ST=São Tomé e Príncipe -SY=Síria -SZ=Essuatíni -TC=Ilhas Turcas e Caicos -TD=Chade -TF=Territórios Franceses do Sul -TH=Tailândia -TJ=Tadjiquistão -TM=Turcomenistão -TN=Tunísia -TR=Turquia -TT=Trinidad e Tobago -TZ=Tanzânia -UA=Ucrânia -UM=Ilhas Menores Distantes dos EUA -US=Estados Unidos -UY=Uruguai -UZ=Uzbequistão -VA=Cidade do Vaticano -VC=São Vicente e Granadinas -VG=Ilhas Virgens Britânicas -VI=Ilhas Virgens Americanas -VN=Vietnã -WF=Wallis e Futuna -YE=Iêmen -ZA=África do Sul -ZM=Zâmbia -ZW=Zimbábue diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties deleted file mode 100644 index fa283f49ede..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -ik=inupiaque -jv=javanês -AX=Ilhas Aland diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties deleted file mode 100644 index 6d8bb56b0fa..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -cs=checo -et=estónio -pl=polaco -AM=Arménia -BJ=Benim -BY=Bielorrússia -CX=Ilha do Natal -CZ=Chéquia -EE=Estónia -EH=Sara Ocidental -FK=Ilhas Falkland -GL=Gronelândia -KE=Quénia -KN=São Cristóvão e Neves -KY=Ilhas Caimão -LV=Letónia -MC=Mónaco -MG=Madagáscar -MK=Macedónia do Norte -MU=Maurícia -NC=Nova Caledónia -PL=Polónia -PS=Territórios palestinianos -RO=Roménia -SC=Seicheles -SI=Eslovénia -SM=São Marinho -TF=Territórios Austrais Franceses -TJ=Tajiquistão -TM=Turquemenistão -UM=Ilhas Menores Afastadas dos EUA -UZ=Usbequistão -VI=Ilhas Virgens dos EUA -VN=Vietname -YE=Iémen diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties deleted file mode 100644 index 05e5acb696e..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ro=română - -# country names -# key is ISO 3166 country code - -RO=România diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties deleted file mode 100644 index 922d9c8896c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties +++ /dev/null @@ -1,382 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ab=абхазский -aa=афарский -af=африкаанс -sq=албанский -am=амхарский -ar=арабский -hy=армянский -as=ассамский -ay=аймара -az=азербайджанский -ba=башкирский -eu=баскский -bn=бенгальский -dz=дзонг-кэ -bh=бихари -bi=бислама -br=бретонский -bg=болгарский -my=бирманский -be=белорусский -km=кхмерский -ca=каталанский -zh=китайский -co=корсиканский -hr=хорватский -cs=чешский -da=датский -nl=нидерландский -en=английский -eo=эсперанто -et=эстонский -fo=фарерский -fj=фиджи -fi=финский -fr=французский -fy=западнофризский -gl=галисийский -ka=грузинский -de=немецкий -el=греческий -kl=гренландский -gn=гуарани -gu=гуджарати -ha=хауса -he=иврит -iw=иврит -hi=хинди -hu=венгерский -is=исландский -id=индонезийский -in=индонезийский -ia=интерлингва -ie=интерлингве -iu=инуктитут -ik=инупиак -ga=ирландский -it=итальянский -ja=японский -jw=яванский -kn=каннада -ks=кашмири -kk=казахский -rw=киньяруанда -ky=киргизский -rn=рунди -ko=корейский -ku=курдский -lo=лаосский -la=латинский -lv=латышский -ln=лингала -lt=литовский -mk=македонский -mg=малагасийский -ms=малайский -ml=малаялам -mt=мальтийский -mi=маори -mr=маратхи -mo=молдаванский -mn=монгольский -na=науру -ne=непальский -no=норвежский -oc=окситанский -or=ория -om=оромо -ps=пушту -fa=персидский -pl=польский -pt=португальский -pa=панджаби -qu=кечуа -rm=романшский -ro=румынский -ru=русский -sm=самоанский -sg=санго -sa=санскрит -gd=гэльский -sr=сербский -st=южный сото -tn=тсвана -sn=шона -sd=синдхи -si=сингальский -ss=свази -sk=словацкий -sl=словенский -so=сомали -es=испанский -su=сунданский -sw=суахили -sv=шведский -tl=тагалог -tg=таджикский -ta=тамильский -tt=татарский -te=телугу -th=тайский -bo=тибетский -ti=тигринья -to=тонганский -ts=тсонга -tr=турецкий -tk=туркменский -tw=тви -ug=уйгурский -uk=украинский -ur=урду -uz=узбекский -vi=вьетнамский -vo=волапюк -cy=валлийский -wo=волоф -xh=коса -ji=идиш -yi=идиш -yo=йоруба -za=чжуань -zu=зулу - -# country names -# key is ISO 3166 country code - -AF=Афганистан -AL=Албания -DZ=Алжир -AD=Андорра -AO=Ангола -AI=Ангилья -AR=Аргентина -AM=Армения -AW=Аруба -AU=Австралия -AT=Австрия -AZ=Азербайджан -BS=Багамы -BH=Бахрейн -BD=Бангладеш -BB=Барбадос -BY=Беларусь -BE=Бельгия -BZ=Белиз -BJ=Бенин -BM=Бермудские о-ва -BT=Бутан -BO=Боливия -BA=Босния и Герцеговина -BW=Ботсвана -BR=Бразилия -BN=Бруней-Даруссалам -BG=Болгария -BF=Буркина-Фасо -BI=Бурунди -KH=Камбоджа -CM=Камерун -CA=Канада -CV=Кабо-Верде -CF=Центрально-Африканская Республика -TD=Чад -CL=Чили -CN=Китай -CO=Колумбия -KM=Коморы -CG=Конго - Браззавиль -CR=Коста-Рика -CI=Кот-д’Ивуар -HR=Хорватия -CU=Куба -CY=Кипр -CZ=Чехия -DK=Дания -DJ=Джибути -DM=Доминика -DO=Доминиканская Республика -TP=Восточный Тимор -EC=Эквадор -EG=Египет -SV=Сальвадор -GQ=Экваториальная Гвинея -ER=Эритрея -EE=Эстония -ET=Эфиопия -FJ=Фиджи -FI=Финляндия -FR=Франция -GF=Французская Гвиана -PF=Французская Полинезия -TF=Французские Южные территории -GA=Габон -GM=Гамбия -GE=Грузия -DE=Германия -GH=Гана -GR=Греция -GP=Гваделупа -GT=Гватемала -GN=Гвинея -GW=Гвинея-Бисау -GY=Гайана -HT=Гаити -HN=Гондурас -HK=Гонконг (САР) -HU=Венгрия -IS=Исландия -IN=Индия -ID=Индонезия -IR=Иран -IQ=Ирак -IE=Ирландия -IL=Израиль -IT=Италия -JM=Ямайка -JP=Япония -JO=Иордания -KZ=Казахстан -KE=Кения -KI=Кирибати -KP=КНДР -KR=Республика Корея -KW=Кувейт -KG=Киргизия -LA=Лаос -LV=Латвия -LB=Ливан -LS=Лесото -LR=Либерия -LY=Ливия -LI=Лихтенштейн -LT=Литва -LU=Люксембург -MK=Северная Македония -MG=Мадагаскар -MY=Малайзия -ML=Мали -MT=Мальта -MQ=Мартиника -MR=Мавритания -MU=Маврикий -YT=Майотта -MX=Мексика -FM=Федеративные Штаты Микронезии -MD=Молдова -MC=Монако -MN=Монголия -MS=Монтсеррат -MA=Марокко -MZ=Мозамбик -MM=Мьянма (Бирма) -NA=Намибия -NP=Непал -NL=Нидерланды -AN=Нидерландские Антильские острова -NC=Новая Каледония -NZ=Новая Зеландия -NI=Никарагуа -NE=Нигер -NG=Нигерия -NU=Ниуэ -NO=Норвегия -OM=Оман -PK=Пакистан -PA=Панама -PG=Папуа — Новая Гвинея -PY=Парагвай -PE=Перу -PH=Филиппины -PL=Польша -PT=Португалия -PR=Пуэрто-Рико -QA=Катар -RO=Румыния -RU=Россия -RW=Руанда -SA=Саудовская Аравия -SN=Сенегал -SP=Сербия -SC=Сейшельские Острова -SL=Сьерра-Леоне -SG=Сингапур -SK=Словакия -SI=Словения -SO=Сомали -ZA=Южно-Африканская Республика -ES=Испания -LK=Шри-Ланка -SD=Судан -SR=Суринам -SZ=Эсватини -SE=Швеция -CH=Швейцария -SY=Сирия -TW=Тайвань -TJ=Таджикистан -TZ=Танзания -TH=Таиланд -TG=Того -TK=Токелау -TO=Тонга -TT=Тринидад и Тобаго -TN=Тунис -TR=Турция -TM=Туркменистан -UG=Уганда -UA=Украина -AE=ОАЭ -GB=Великобритания -US=Соединенные Штаты -UY=Уругвай -UZ=Узбекистан -VU=Вануату -VA=Ватикан -VE=Венесуэла -VN=Вьетнам -VG=Виргинские о-ва (Великобритания) -VI=Виргинские о-ва (США) -EH=Западная Сахара -YE=Йемен -ZR=Заир -ZM=Замбия -ZW=Зимбабве diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties deleted file mode 100644 index 7f2eef04b7b..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -sk=slovenčina - -# country names -# key is ISO 3166 country code - -SK=Slovensko diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties deleted file mode 100644 index 3c73d2f800d..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -sl=slovenščina - -# country names -# key is ISO 3166 country code - -SI=Slovenija diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties deleted file mode 100644 index 2201cc0ce8f..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -sq=shqip - -# country names -# key is ISO 3166 country code - -AL=Shqipëri diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties deleted file mode 100644 index a6367399f36..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties +++ /dev/null @@ -1,339 +0,0 @@ -# -# Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - -af=африканс -ar=арапски -be=белоруски -bg=бугарски -br=бретонски -ca=каталонски -co=корзикански -cs=чешки -da=дански -de=немачки -el=грчки -en=енглески -eo=есперанто -es=шпански -et=естонски -eu=баскијски -fa=персијски -fi=фински -fr=француски -ga=ирски -he=хебрејски -hi=хинди -hr=хрватски -hu=мађарски -hy=јерменски -id=индонежански -in=индонежански -is=исландски -it=италијански -iw=хебрејски -ja=јапански -ji=јидиш -ka=грузијски -km=кмерски -ko=корејски -ku=курдски -ky=киргиски -la=латински -lt=литвански -lv=летонски -mk=македонски -mn=монголски -mo=Молдавски -my=бурмански -nl=холандски -no=норвешки -pl=пољски -pt=португалски -rm=романш -ro=румунски -ru=руски -sa=санскрит -sk=словачки -sl=словеначки -sq=албански -sr=српски -sv=шведски -sw=свахили -tr=турски -uk=украјински -vi=вијетнамски -yi=јидиш -zh=кинески -AD=Андора -AE=Уједињени Арапски Емирати -AF=Авганистан -AL=Албанија -AM=Јерменија -AN=Холандски Антили -AO=Ангола -AR=Аргентина -AT=Аустрија -AU=Аустралија -AW=Аруба -AX=Оландска Острва -AZ=Азербејџан -BA=Босна и Херцеговина -BB=Барбадос -BD=Бангладеш -BE=Белгија -BF=Буркина Фасо -BG=Бугарска -BH=Бахреин -BI=Бурунди -BJ=Бенин -BM=Бермуда -BN=Брунеј -BO=Боливија -BR=Бразил -BS=Бахами -BT=Бутан -BV=Острво Буве -BW=Боцвана -BY=Белорусија -BZ=Белизе -CA=Канада -CC=Кокосова (Килингова) Острва -CD=Конго - Киншаса -CF=Централноафричка Република -CG=Конго - Бразавил -CH=Швајцарска -CI=Обала Слоноваче (Кот д’Ивоар) -CL=Чиле -CM=Камерун -CN=Кина -CO=Колумбија -CR=Костарика -CS=Србија и Црна Гора -CU=Куба -CV=Зеленортска Острва -CX=Божићно Острво -CY=Кипар -CZ=Чешка -DE=Немачка -DJ=Џибути -DK=Данска -DM=Доминика -DO=Доминиканска Република -DZ=Алжир -EC=Еквадор -EE=Естонија -EG=Египат -EH=Западна Сахара -ER=Еритреја -ES=Шпанија -ET=Етиопија -FI=Финска -FJ=Фиџи -FK=Фокландска Острва -FM=Микронезија -FO=Фарска Острва -FR=Француска -GA=Габон -GB=Уједињено Краљевство -GD=Гренада -GE=Грузија -GF=Француска Гвајана -GH=Гана -GI=Гибралтар -GL=Гренланд -GM=Гамбија -GN=Гвинеја -GP=Гваделуп -GQ=Екваторијална Гвинеја -GR=Грчка -GS=Јужна Џорџија и Јужна Сендвичка Острва -GT=Гватемала -GU=Гуам -GW=Гвинеја-Бисао -GY=Гвајана -HK=САР Хонгконг (Кина) -HM=Острво Херд и Мекдоналдова острва -HN=Хондурас -HR=Хрватска -HT=Хаити -HU=Мађарска -ID=Индонезија -IE=Ирска -IL=Израел -IN=Индија -IQ=Ирак -IR=Иран -IS=Исланд -IT=Италија -JM=Јамајка -JO=Јордан -JP=Јапан -KE=Кенија -KG=Киргистан -KH=Камбоџа -KI=Кирибати -KM=Коморска Острва -KN=Сент Китс и Невис -KP=Северна Кореја -KR=Јужна Кореја -KW=Кувајт -KY=Кајманска Острва -KZ=Казахстан -LA=Лаос -LB=Либан -LC=Света Луција -LI=Лихтенштајн -LK=Шри Ланка -LR=Либерија -LS=Лесото -LT=Литванија -LU=Луксембург -LV=Летонија -LY=Либија -MA=Мароко -MC=Монако -MD=Молдавија -MG=Мадагаскар -MH=Маршалска Острва -MK=Северна Македонија -ML=Мали -MM=Мијанмар (Бурма) -MN=Монголија -MO=САР Макао (Кина) -MP=Северна Маријанска Острва -MQ=Мартиник -MR=Мауританија -MS=Монсерат -MT=Малта -MU=Маурицијус -MV=Малдиви -MW=Малави -MX=Мексико -MY=Малезија -MZ=Мозамбик -NA=Намибија -NC=Нова Каледонија -NE=Нигер -NF=Острво Норфок -NG=Нигерија -NI=Никарагва -NL=Холандија -NO=Норвешка -NP=Непал -NR=Науру -NU=Ниуе -NZ=Нови Зеланд -OM=Оман -PA=Панама -PE=Перу -PF=Француска Полинезија -PG=Папуа Нова Гвинеја -PH=Филипини -PK=Пакистан -PL=Пољска -PM=Сен Пјер и Микелон -PN=Питкерн -PR=Порторико -PS=Палестинске територије -PT=Португалија -PW=Палау -PY=Парагвај -QA=Катар -RE=Реинион -RO=Румунија -RU=Русија -RW=Руанда -SA=Саудијска Арабија -SB=Соломонска Острва -SC=Сејшели -SD=Судан -SE=Шведска -SG=Сингапур -SH=Света Јелена -SI=Словенија -SJ=Свалбард и Јан Мајен -SK=Словачка -SL=Сијера Леоне -SM=Сан Марино -SN=Сенегал -SO=Сомалија -SR=Суринам -ST=Сао Томе и Принципе -SV=Салвадор -SY=Сирија -SZ=Свазиленд -TC=Острва Туркс и Каикос -TD=Чад -TF=Француске Јужне Територије -TG=Того -TH=Тајланд -TJ=Таџикистан -TK=Токелау -TL=Тимор-Лесте (Источни Тимор) -TM=Туркменистан -TN=Тунис -TO=Тонга -TR=Турска -TT=Тринидад и Тобаго -TV=Тувалу -TW=Тајван -TZ=Танзанија -UA=Украјина -UG=Уганда -UM=Удаљена острва САД -US=Сједињене Државе -UY=Уругвај -UZ=Узбекистан -VA=Ватикан -VC=Сент Винсент и Гренадини -VE=Венецуела -VG=Британска Девичанска Острва -VI=Америчка Девичанска Острва -VN=Вијетнам -VU=Вануату -WF=Валис и Футуна -WS=Самоа -YE=Јемен -YT=Мајот -ZA=Јужноафричка Република -ZM=Замбија -ZW=Зимбабве diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties deleted file mode 100644 index 9f5ff1b34af..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties +++ /dev/null @@ -1,471 +0,0 @@ -# -# Copyright (c) 2005, 2022, 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-2011 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. - -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# -aa=afarski -ab=abhaski -ae=avestanski -af=afrikans -am=amharski -an=aragonski -ar=arapski -as=asamski -av=avarski -ay=ajmara -az=azerbejdžanski -ba=baškirski -be=beloruski -bg=bugarski -bh=Biharski -bn=bengalski -bo=tibetanski -br=bretonski -bs=bosanski -ca=katalonski -ce=čečenski -ch=čamoro -co=korzikanski -cr=kri -cs=češki -cu=crkvenoslovenski -cv=čuvaški -cy=velški -da=danski -de=nemački -dv=maldivski -dz=džonga -ee=eve -el=grčki -en=engleski -eo=esperanto -es=španski -et=estonski -eu=baskijski -fa=persijski -fi=finski -fj=fidžijski -fo=farski -fr=francuski -fy=zapadni frizijski -ga=irski -gd=škotski gelski -gl=galicijski -gn=gvarani -gu=gudžarati -gv=manks -he=hebrejski -hi=hindi -hr=hrvatski -ht=haićanski -hu=mađarski -hy=jermenski -ia=interlingva -id=indonežanski -ie=interlingve -ii=sečuanski ji -ik=inupik -in=indonežanski -is=islandski -it=italijanski -iw=hebrejski -ja=japanski -ji=jidiš -jv=javanski -ka=gruzijski -ki=kikuju -kj=kvanjama -kk=kazaški -kl=grenlandski -km=kmerski -kn=kanada -ko=korejski -ks=kašmirski -ku=kurdski -kw=kornvolski -ky=kirgiski -la=latinski -lb=luksemburški -li=limburški -lo=laoski -lt=litvanski -lu=luba-katanga -lv=letonski -mg=malgaški -mh=maršalski -mi=maorski -mk=makedonski -ml=malajalam -mn=mongolski -mo=Moldavski -mr=marati -ms=malajski -mt=malteški -my=burmanski -nb=norveški bukmol -nd=severni ndebele -ne=nepalski -nl=holandski -nn=norveški ninorsk -no=norveški -nr=južni ndebele -nv=navaho -ny=njandža -oc=oksitanski -oj=odžibve -or=odija -os=osetinski -pa=pendžapski -pl=poljski -ps=paštunski -pt=portugalski -qu=kečua -rm=romanš -ro=rumunski -ru=ruski -rw=kinjaruanda -sa=sanskrit -sc=sardinski -sd=sindi -se=severni sami -si=sinhaleški -sk=slovački -sl=slovenački -sm=samoanski -sn=šona -so=somalski -sq=albanski -sr=srpski -ss=svazi -st=sesoto -su=sundanski -sv=švedski -sw=svahili -ta=tamilski -tg=tadžički -th=tajski -ti=tigrinja -tk=turkmenski -tl=tagalog -tn=cvana -tr=turski -tt=tatarski -tw=tvi -ty=tahićanski -ug=ujgurski -uk=ukrajinski -uz=uzbečki -vi=vijetnamski -wa=valonski -wo=volof -xh=kosa -yi=jidiš -yo=joruba -za=džuanški -zh=kineski -AD=Andora -AE=Ujedinjeni Arapski Emirati -AF=Avganistan -AG=Antigva i Barbuda -AI=Angvila -AL=Albanija -AM=Jermenija -AN=Holandski Antili -AO=Angola -AQ=Antarktik -AR=Argentina -AS=Američka Samoa -AT=Austrija -AU=Australija -AW=Aruba -AX=Olandska Ostrva -AZ=Azerbejdžan -BA=Bosna i Hercegovina -BB=Barbados -BD=Bangladeš -BE=Belgija -BF=Burkina Faso -BG=Bugarska -BH=Bahrein -BI=Burundi -BJ=Benin -BL=Sveti Bartolomej -BM=Bermuda -BN=Brunej -BO=Bolivija -BR=Brazil -BS=Bahami -BT=Butan -BV=Ostrvo Buve -BW=Bocvana -BY=Belorusija -BZ=Belize -CA=Kanada -CC=Kokosova (Kilingova) Ostrva -CD=Kongo - Kinšasa -CF=Centralnoafrička Republika -CG=Kongo - Brazavil -CH=Švajcarska -CI=Obala Slonovače (Kot d’Ivoar) -CK=Kukova Ostrva -CL=Čile -CM=Kamerun -CN=Kina -CO=Kolumbija -CR=Kostarika -CU=Kuba -CV=Zelenortska Ostrva -CX=Božićno Ostrvo -CY=Kipar -CZ=Češka -DE=Nemačka -DJ=Džibuti -DK=Danska -DM=Dominika -DO=Dominikanska Republika -DZ=Alžir -EC=Ekvador -EE=Estonija -EG=Egipat -EH=Zapadna Sahara -ER=Eritreja -ES=Španija -ET=Etiopija -FI=Finska -FJ=Fidži -FK=Foklandska Ostrva -FM=Mikronezija -FO=Farska Ostrva -FR=Francuska -GA=Gabon -GB=Ujedinjeno Kraljevstvo -GD=Grenada -GE=Gruzija -GF=Francuska Gvajana -GG=Gernzi -GH=Gana -GI=Gibraltar -GL=Grenland -GM=Gambija -GN=Gvineja -GP=Gvadelup -GQ=Ekvatorijalna Gvineja -GR=Grčka -GS=Južna Džordžija i Južna Sendvička Ostrva -GT=Gvatemala -GU=Guam -GW=Gvineja-Bisao -GY=Gvajana -HK=SAR Hongkong (Kina) -HM=Ostrvo Herd i Mekdonaldova ostrva -HN=Honduras -HR=Hrvatska -HT=Haiti -HU=Mađarska -ID=Indonezija -IE=Irska -IL=Izrael -IM=Ostrvo Man -IN=Indija -IO=Britanska teritorija Indijskog okeana -IQ=Irak -IR=Iran -IS=Island -IT=Italija -JE=Džerzi -JM=Jamajka -JO=Jordan -JP=Japan -KE=Kenija -KG=Kirgistan -KH=Kambodža -KI=Kiribati -KM=Komorska Ostrva -KN=Sent Kits i Nevis -KP=Severna Koreja -KR=Južna Koreja -KW=Kuvajt -KY=Kajmanska Ostrva -KZ=Kazahstan -LA=Laos -LB=Liban -LC=Sveta Lucija -LI=Lihtenštajn -LK=Šri Lanka -LR=Liberija -LS=Lesoto -LT=Litvanija -LU=Luksemburg -LV=Letonija -LY=Libija -MA=Maroko -MC=Monako -MD=Moldavija -ME=Crna Gora -MF=Sveti Martin (Francuska) -MG=Madagaskar -MH=Maršalska Ostrva -MK=Severna Makedonija -ML=Mali -MM=Mijanmar (Burma) -MN=Mongolija -MO=SAR Makao (Kina) -MP=Severna Marijanska Ostrva -MQ=Martinik -MR=Mauritanija -MS=Monserat -MT=Malta -MU=Mauricijus -MV=Maldivi -MW=Malavi -MX=Meksiko -MY=Malezija -MZ=Mozambik -NA=Namibija -NC=Nova Kaledonija -NE=Niger -NF=Ostrvo Norfok -NG=Nigerija -NI=Nikaragva -NL=Holandija -NO=Norveška -NP=Nepal -NR=Nauru -NU=Niue -NZ=Novi Zeland -OM=Oman -PA=Panama -PE=Peru -PF=Francuska Polinezija -PG=Papua Nova Gvineja -PH=Filipini -PK=Pakistan -PL=Poljska -PM=Sen Pjer i Mikelon -PN=Pitkern -PR=Portoriko -PS=Palestinske teritorije -PT=Portugalija -PW=Palau -PY=Paragvaj -QA=Katar -RE=Reinion -RO=Rumunija -RS=Srbija -RU=Rusija -RW=Ruanda -SA=Saudijska Arabija -SB=Solomonska Ostrva -SC=Sejšeli -SD=Sudan -SE=Švedska -SG=Singapur -SH=Sveta Jelena -SI=Slovenija -SJ=Svalbard i Jan Majen -SK=Slovačka -SL=Sijera Leone -SM=San Marino -SN=Senegal -SO=Somalija -SR=Surinam -ST=Sao Tome i Principe -SV=Salvador -SY=Sirija -SZ=Svazilend -TC=Ostrva Turks i Kaikos -TD=Čad -TF=Francuske Južne Teritorije -TG=Togo -TH=Tajland -TJ=Tadžikistan -TK=Tokelau -TL=Timor-Leste (Istočni Timor) -TM=Turkmenistan -TN=Tunis -TO=Tonga -TR=Turska -TT=Trinidad i Tobago -TV=Tuvalu -TW=Tajvan -TZ=Tanzanija -UA=Ukrajina -UG=Uganda -UM=Udaljena ostrva SAD -US=Sjedinjene Države -UY=Urugvaj -UZ=Uzbekistan -VA=Vatikan -VC=Sent Vinsent i Grenadini -VE=Venecuela -VG=Britanska Devičanska Ostrva -VI=Američka Devičanska Ostrva -VN=Vijetnam -VU=Vanuatu -WF=Valis i Futuna -WS=Samoa -YE=Jemen -YT=Majot -ZA=Južnoafrička Republika -ZM=Zambija -ZW=Zimbabve diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties deleted file mode 100644 index da7fddb2925..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties +++ /dev/null @@ -1,957 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=afar -ab=abchaziska -ae=avestiska -af=afrikaans -ak=akan -am=amhariska -an=aragonesiska -ar=arabiska -as=assamesiska -av=avariska -ay=aymara -az=azerbajdzjanska -ba=basjkiriska -be=vitryska -bg=bulgariska -bh=bihari -bi=bislama -bm=bambara -bn=bengali -bo=tibetanska -br=bretonska -bs=bosniska -ca=katalanska -ce=tjetjenska -ch=chamorro -co=korsikanska -cr=cree -cs=tjeckiska -cu=kyrkslaviska -cv=tjuvasjiska -cy=walesiska -da=danska -de=tyska -dv=divehi -dz=dzongkha -ee=ewe -el=grekiska -en=engelska -eo=esperanto -es=spanska -et=estniska -eu=baskiska -fa=persiska -ff=fulani -fi=finska -fj=fijianska -fo=färöiska -fr=franska -fy=västfrisiska -ga=iriska -gd=skotsk gäliska -gl=galiciska -gn=guaraní -gu=gujarati -gv=manx -ha=hausa -he=hebreiska -hi=hindi -ho=hirimotu -hr=kroatiska -ht=haitiska -hu=ungerska -hy=armeniska -hz=herero -ia=interlingua -id=indonesiska -ie=interlingue -ig=igbo -ii=szezuan i -ik=inupiak -in=indonesiska -io=ido -is=isländska -it=italienska -iu=inuktitut -iw=hebreiska -ja=japanska -ji=jiddisch -jv=javanesiska -ka=georgiska -kg=kikongo -ki=kikuyu -kj=kuanyama -kk=kazakiska -kl=grönländska -km=kambodjanska -kn=kannada -ko=koreanska -kr=kanuri -ks=kashmiriska -ku=kurdiska -kv=kome -kw=korniska -ky=kirgiziska -la=latin -lb=luxemburgiska -lg=luganda -li=limburgiska -ln=lingala -lo=laotiska -lt=litauiska -lu=luba-katanga -lv=lettiska -mg=malagassiska -mh=marshalliska -mi=maori -mk=makedonska -ml=malayalam -mn=mongoliska -mo=moldaviska -mr=marathi -ms=malajiska -mt=maltesiska -my=burmesiska -na=nauruanska -nb=norskt bokmål -nd=nordndebele -ne=nepalesiska -ng=ndonga -nl=nederländska -nn=nynorska -no=norska -nr=sydndebele -nv=navaho -ny=nyanja -oc=occitanska -oj=odjibwa -om=oromo -or=oriya -os=ossetiska -pa=punjabi -pi=pali -pl=polska -ps=afghanska -pt=portugisiska -qu=quechua -rm=rätoromanska -rn=rundi -ro=rumänska -ru=ryska -rw=kinjarwanda -sa=sanskrit -sc=sardinska -sd=sindhi -se=nordsamiska -sg=sango -si=singalesiska -sk=slovakiska -sl=slovenska -sm=samoanska -sn=shona -so=somaliska -sq=albanska -sr=serbiska -ss=swati -st=sydsotho -su=sundanesiska -sv=svenska -sw=swahili -ta=tamil -te=telugu -tg=tadzjikiska -th=thailändska -ti=tigrinja -tk=turkmeniska -tl=tagalog -tn=tswana -to=tonganska -tr=turkiska -ts=tsonga -tt=tatariska -tw=twi -ty=tahitiska -ug=uiguriska -uk=ukrainska -ur=urdu -uz=uzbekiska -ve=venda -vi=vietnamesiska -vo=volapük -wa=vallonska -wo=wolof -xh=xhosa -yi=jiddisch -yo=yoruba -za=zhuang -zh=kinesiska -zu=zulu - -# key is ISO 639.2 language code -abk=Abchasiska -ace=acehnesiska -ach=acholi -ada=adangme -ady=adygeiska -afa=Afroasiatiskt språk -afh=afrihili -ain=ainu -akk=akkadiska -alb=Albanska -ale=aleutiska -alg=Algonkinska -alt=sydaltaiska -amh=Amhariska -ang=fornengelska -anp=angika -ara=Arabiska -arc=arameiska -arg=Aragonsk spanska -arm=Armeniska -arn=mapudungun -arp=arapaho -art=Artificiellt -arw=arawakiska -asm=Assamesiska -ast=asturiska -ath=Athabaskiska -aus=Australiska -ava=Avariskt språk -ave=Avestiska -awa=awadhi -aze=Azerbajdzjanska -bak=Basjkiriska -bal=baluchiska -ban=balinesiska -baq=Baskiska -bas=basa -bat=Baltiskt språk -bej=beja -bel=Vitryska -bem=bemba -ber=Berberspråk -bho=bhojpuri -bik=bikol -bin=bini -bla=siksika -bnt=Bantuspråk -bos=Bosniska -bra=braj -bre=Bretonska -bua=burjätiska -bug=buginesiska -bul=Bulgariska -bur=Burmesiska -byn=blin -cad=caddo -cai=Centralamerikanskt indianspråk -car=karibiska -cat=Katalanska -cau=Kaukasiskt språk -ceb=cebuano -cel=Keltiskt språk -chb=chibcha -che=Tjetjenska -chg=chagatai -chi=Kinesiska -chk=chuukesiska -chm=mariska -chn=chinook -cho=choctaw -chp=chipewyan -chr=cherokesiska -chu=Kyrkoslaviska -chv=Tjuvasjiska -chy=cheyenne -cop=koptiska -cor=Korniska -cos=Korsikanska -cpe=Kreol-/Pidginspråk, engelskbaserade -cpf=Kreol-/Pidginspråk, franskbaserade -cpp=Kreol-/Pidginspråk, portugisiskbaserade -crh=krimtatariska -crp=Kreol-/Pidginspråk -csb=kasjubiska -cus=Kusjitiskt språk -cze=Tjeckiska -dak=dakota -dan=Danska -dar=darginska -del=delaware -den=slavej -dgr=dogrib -din=dinka -doi=dogri -dra=Dravidiskt språk -dsb=lågsorbiska -dua=duala -dum=medelnederländska -dut=Nederländska -dyu=dyula -dzo=Bhutanesiska (Dzongkha) -efi=efik -egy=fornegyptiska -eka=ekajuk -elx=elamitiska -eng=Engelska -enm=medelengelska -est=Estniska -ewo=ewondo -fan=fang -fao=Färöiska -fat=fanti -fij=Fidjianska -fil=filippinska -fin=Finska -fiu=Finsk-ugriskt språk -fon=fonspråket -fre=Franska -frm=medelfranska -fro=fornfranska -frr=nordfrisiska -frs=östfrisiska -fry=Västfrisiska -ful=Fulani -fur=friulianska -gaa=gã -gay=gayo -gba=gbaya -gem=Germanska -geo=Georgiska -ger=Tyska -gez=etiopiska -gil=gilbertiska -gla=Gaeliska -gle=Iriska -glg=Galiciska -gmh=medelhögtyska -goh=fornhögtyska -gon=gondi -gor=gorontalo -got=gotiska -grb=grebo -grc=forngrekiska -gre=Nygrekiska (1453-) -gsw=schweizertyska -gwi=gwichin -hai=haida -hat=Haitiska -hau=Haussa -haw=hawaiiska -heb=Hebreiska -hil=hiligaynon -him=Pahari (Himachali) -hit=hettitiska -hmn=hmongspråk -hmo=Hirimotu -hrv=Kroatiska -hsb=högsorbiska -hun=Ungerska -hup=hupa -iba=ibanska -ibo=Ibo (Igbo) -ice=Isländska -ilo=iloko -inc=Indo-ariskt språk -ind=Indonesiska -ine=Indoeuropeiskt språk -inh=ingusjiska -ira=Iranska -iro=Irokesiska språk -ita=Italienska -jav=Javanesiska -jbo=lojban -jpn=Japanska -jpr=judisk persiska -jrb=judisk arabiska -kaa=karakalpakiska -kab=kabyliska -kac=kachin -kam=kamba -kaw=kawi -kaz=Kazakiska -kbd=kabardinska -kha=khasi -khi=Khoisanspråk -khm=Central-Khmer -kho=khotanesiska -kin=Rwanda -kir=Kirgisiska -kmb=kimbundu -kok=konkani -kon=Kikongo -kor=Koreanska -kos=kosreanska -kpe=kpelle -krc=karachay-balkar -krl=karelska -kro=Kru-språk -kru=kurukh -kua=Ovambo -kum=kumykiska -kur=Kurdiska -kut=kutenaj -lad=ladino -lah=lahnda -lam=lamba -lao=Laotiska -lav=Lettiska -lez=lezghien -lim=Limburgisch -lit=Litauiska -lol=mongo -loz=lozi -ltz=Luxemburgiska -lua=luba-lulua -lug=Luganda -lui=luiseño -lun=lunda -luo=luo -lus=lushai -mac=Makedonska -mad=maduresiska -mag=magahi -mah=Marshallesiska -mai=maithili -mak=makasar -man=mande -map=Austronesiskt språk -mas=massajiska -may=Malajiska -mdf=moksja -mdr=mandar -men=mende -mga=medeliriska -mic=mi’kmaq -min=minangkabau -mis=Okodat -mkh=Mon-khmerspråk -mlg=Malagassiska -mlt=Maltesiska -mnc=manchuriska -mni=manipuri -moh=mohawk -mon=Mongoliska -mos=mossi -mul=flera språk -mus=muskogee -mwl=mirandesiska -mwr=marwari -myn=Maya-språk -myv=erjya -nai=Nordamerikanskt indianspråk -nap=napolitanska -nbl=Ndebele (syd) -nde=Ndebele (nord) -nds=lågtyska -new=newariska -nia=nias -nic=Niger-/Kongospråk -niu=niueanska -nno=Norska (Nynorska) -nob=Bokmål, norska -nog=nogai -non=fornnordiska -nor=Norska -nqo=n-kå -nso=nordsotho -nub=Nubiska -nwc=klassisk newariska -nym=nyamwezi -nyn=nyankole -nyo=nyoro -nzi=nzima -oci=Occitanska (efter 1500) -oji=Odjibwa (Chippewa) -osa=osage -oss=Ossetiska -ota=ottomanska -oto=Otomi -paa=Papuanskt språk -pag=pangasinan -pal=medelpersiska -pam=pampanga -pap=papiamento -pau=palau -peo=fornpersiska -per=Persiska -phi=Filippinska -phn=feniciska -pol=Polska -pon=pohnpeiska -por=Portugisiska -pro=fornprovensalska -pus=Pashto -raj=rajasthani -rap=rapanui -rar=rarotonganska -roa=Romanska -roh=Rätoromanska -rom=romani -rum=Rumänska -rup=arumänska -rus=Ryska -sad=sandawe -sah=jakutiska -sai=Sydamerikanskt indianspråk -sal=Saliska -sam=samaritanska -sas=sasak -sat=santali -scn=sicilianska -sco=skotska -sel=selkup -sem=Semitiskt språk -sga=forniriska -sgn=Teckenspråk -shn=shan -sid=sidamo -sin=Singalesiska -sio=Sioux-språk -sit=Sino-tibetanskt språk -sla=Slaviskt språk -slo=Slovakiska -slv=Slovenska -sma=sydsamiska -sme=Nordsamiska -smi=Samiska -smj=lulesamiska -smn=enaresamiska -smo=Samoanska -sms=skoltsamiska -snk=soninke -sog=sogdiska -som=Somaliska -sot=Sotho, syd- -spa=Spanska -srd=Sardiska -srn=sranan tongo -srp=Serbiska -srr=serer -ssa=Nilo-sahariskt språk -ssw=Swazi -suk=sukuma -sun=Sundanesiska -sus=susu -sux=sumeriska -swe=Svenska -syc=klassisk syriska -syr=syriska -tah=Tahitiska -tai=Thaispråk -tat=Tatariska -tel=Telugo -tem=temne -ter=tereno -tet=tetum -tgk=Tadzjikiska -tha=Thailändska -tib=Tibetanska -tig=tigré -tir=Tigrinja -tiv=tivi -tkl=tokelauiska -tlh=klingonska -tli=tlingit -tmh=tamashek -tog=nyasatonganska -ton=Tonga (Tongaöarna) -tpi=tok pisin -tsi=tsimshian -tuk=Turkmeniska -tum=tumbuka -tur=Turkiska -tut=Altaiskt språk -tvl=tuvaluanska -tyv=tuviniska -udm=udmurtiska -uga=ugaritiska -uig=Uiguriska -ukr=Ukrainska -umb=umbundu -und=obestämt språk -uzb=Uzbekiska -vai=vaj -vie=Vietnamesiska -vot=votiska -wak=Wakusjiska -wal=walamo -war=waray -was=washo -wel=Kymriska -wen=Sorbiska -wln=Vallonska -xal=kalmuckiska -yao=kiyao -yap=japetiska -yid=Jiddisch -zap=zapotek -zbl=blissymboler -zen=zenaga -zun=zuni -zxx=inget språkligt innehåll -zza=zazaiska - -# script names -# key is ISO 15924 script code - -Arab=arabiska -Armi=imperisk arameiska -Armn=armeniska -Avst=avestiska -Bali=balinesiska -Bamu=bamunska -Bass=bassaiska vah -Batk=batak -Beng=bengaliska -Blis=blissymboler -Bopo=bopomofo -Brah=brami -Brai=punktskrift -Bugi=buginesiska -Buhd=buhid -Cakm=chakma -Cans=kanadensiska stavelsetecken -Cari=kariska -Cham=cham -Cher=cherokee -Cirt=cirt -Copt=koptiska -Cprt=cypriotiska -Cyrl=kyrilliska -Cyrs=fornkyrkoslavisk kyrilliska -Deva=devanagari -Dsrt=deseret -Dupl=Duployéstenografiska -Egyd=demotiska -Egyh=hieratiska -Egyp=egyptiska hieroglyfer -Elba=elbasiska -Ethi=etiopiska -Geok=kutsuri -Geor=georgiska -Glag=glagolitiska -Goth=gotiska -Gran=gammaltamilska -Grek=grekiska -Gujr=gujarati -Guru=gurmukhiska -Hang=hangul -Hani=han -Hano=hanunó’o -Hans=förenklad -Hant=traditionell -Hebr=hebreiska -Hira=hiragana -Hmng=pahaw mong -Hrkt=katakana/hiragana -Hung=fornungerska -Inds=indus -Ital=fornitaliska -Java=javanska -Jpan=japanska -Kali=kaya li -Kana=katakana -Khar=kharoshti -Khmr=khmeriska -Knda=kanaresiska -Kore=koreanska -Kpel=kpellé -Kthi=kaithiska -Lana=lanna -Laoo=laotiska -Latf=frakturlatin -Latg=gaeliskt latin -Latn=latinska -Lepc=rong -Limb=limbu -Lina=linjär A -Linb=linjär B -Loma=loma -Lyci=lykiska -Lydi=lydiska -Mand=mandaéiska -Mani=manikeanska -Maya=mayahieroglyfer -Mend=mende -Merc=kursiv-meroitiska -Mero=meroitiska -Mlym=malayalam -Mong=mongoliska -Moon=moon -Mtei=meitei-mayek -Mymr=burmesiska -Narb=fornnordarabiska -Nbat=nabateiska -Nkgb=naxi geba -Nkoo=n-kå -Ogam=ogham -Olck=ol-chiki -Orkh=orkon -Orya=oriya -Osma=osmanja -Palm=palmyreniska -Perm=fornpermiska -Phag=phags-pa -Phli=tidig pahlavi -Phlp=psaltaren-pahlavi -Phlv=bokpahlavi -Phnx=feniciska -Plrd=pollardtecken -Prti=tidig parthianska -Rjng=rejang -Roro=rongo-rongo -Runr=runor -Samr=samaritiska -Sara=sarati -Sarb=fornsydarabiska -Saur=saurashtra -Sgnw=teckningsskrift -Shaw=shawiska -Sind=sindhiska -Sinh=singalesiska -Sund=sundanesiska -Sylo=syloti nagri -Syrc=syriska -Syre=estrangelosyriska -Syrj=västsyriska -Syrn=östsyriska -Tagb=tagbanwa -Tale=tai le -Talu=tai lue -Taml=tamilska -Tavt=tai viet -Telu=telugu -Teng=tengwar -Tfng=tifinaghiska -Tglg=tagalog -Thaa=taana -Thai=thailändska -Tibt=tibetanska -Ugar=ugaritiska -Vaii=vaj -Visp=synligt tal -Wara=varang kshiti -Xpeo=fornpersiska -Xsux=sumero-akkadisk kilskrift -Yiii=yi -Zinh=ärvda -Zmth=matematisk notation -Zsym=symboler -Zxxx=oskrivet språk -Zyyy=gemensamma -Zzzz=okänt skriftsystem - -# country names -# key is ISO 3166 country code - -AE=Förenade Arabemiraten -AG=Antigua och Barbuda -AL=Albanien -AM=Armenien -AN=Nederländska Antillerna -AQ=Antarktis -AS=Amerikanska Samoa -AT=Österrike -AU=Australien -AX=Åland -AZ=Azerbajdzjan -BA=Bosnien och Hercegovina -BE=Belgien -BG=Bulgarien -BR=Brasilien -BV=Bouvetön -BY=Vitryssland -CA=Kanada -CC=Kokosöarna -CD=Kongo-Kinshasa -CF=Centralafrikanska republiken -CG=Kongo-Brazzaville -CH=Schweiz -CK=Cooköarna -CM=Kamerun -CN=Kina -CS=Serbien och Montenegro -CU=Kuba -CV=Kap Verde -CX=Julön -CY=Cypern -CZ=Tjeckien -DE=Tyskland -DK=Danmark -DO=Dominikanska republiken -DZ=Algeriet -EE=Estland -EG=Egypten -EH=Västsahara -ES=Spanien -ET=Etiopien -FK=Falklandsöarna -FM=Mikronesien -FO=Färöarna -FR=Frankrike -GB=Storbritannien -GE=Georgien -GF=Franska Guyana -GL=Grönland -GQ=Ekvatorialguinea -GR=Grekland -GS=Sydgeorgien och Sydsandwichöarna -HK=Hongkong SAR -HM=Heardön och McDonaldöarna -HR=Kroatien -HU=Ungern -ID=Indonesien -IE=Irland -IN=Indien -IO=Brittiska territoriet i Indiska oceanen -IQ=Irak -IS=Island -IT=Italien -JO=Jordanien -KG=Kirgizistan -KH=Kambodja -KM=Komorerna -KN=S:t Kitts och Nevis -KP=Nordkorea -KR=Sydkorea -KY=Caymanöarna -KZ=Kazakstan -LB=Libanon -LC=S:t Lucia -LT=Litauen -LU=Luxemburg -LV=Lettland -LY=Libyen -MA=Marocko -MD=Moldavien -MG=Madagaskar -MH=Marshallöarna -MK=Nordmakedonien -MN=Mongoliet -MO=Macao SAR -MP=Nordmarianerna -MR=Mauretanien -MV=Maldiverna -MX=Mexiko -MZ=Moçambique -NC=Nya Kaledonien -NF=Norfolkön -NL=Nederländerna -NO=Norge -NZ=Nya Zeeland -PF=Franska Polynesien -PG=Papua Nya Guinea -PH=Filippinerna -PL=Polen -PM=S:t Pierre och Miquelon -PN=Pitcairnöarna -PS=Palestinska territorierna -RO=Rumänien -RS=Serbien -RU=Ryssland -SA=Saudiarabien -SB=Salomonöarna -SC=Seychellerna -SE=Sverige -SH=S:t Helena -SI=Slovenien -SJ=Svalbard och Jan Mayen -SK=Slovakien -SR=Surinam -ST=São Tomé och Príncipe -SY=Syrien -SZ=Swaziland -TC=Turks- och Caicosöarna -TD=Tchad -TF=Franska sydterritorierna -TJ=Tadzjikistan -TK=Tokelauöarna -TL=Östtimor -TN=Tunisien -TR=Turkiet -TT=Trinidad och Tobago -UA=Ukraina -UM=USA:s yttre öar -US=USA -VA=Vatikanstaten -VC=S:t Vincent och Grenadinerna -VG=Brittiska Jungfruöarna -VI=Amerikanska Jungfruöarna -WF=Wallis- och Futunaöarna -YE=Jemen -ZA=Sydafrika - -# territory names -# key is UN M.49 country and area code - -001=världen -002=Afrika -003=Nordamerika -005=Sydamerika -009=Oceanien -011=Västafrika -013=Centralamerika -014=Östafrika -015=Nordafrika -017=Centralafrika -018=södra Afrika -019=Nord- och Sydamerika -021=Norra Amerika -029=Karibien -030=Östasien -034=Sydasien -035=Sydostasien -039=Sydeuropa -053=Australasien -054=Melanesien -057=Mikronesiska öarna -061=Polynesien -142=Asien -143=Centralasien -145=Västasien -150=Europa -151=Östeuropa -154=Nordeuropa -155=Västeuropa -419=Latinamerika diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties deleted file mode 100644 index afb6ac55a0c..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties +++ /dev/null @@ -1,382 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -ab=อับฮาเซีย -aa=อะฟาร์ -af=แอฟริกานส์ -sq=แอลเบเนีย -am=อัมฮารา -ar=อาหรับ -hy=อาร์เมเนีย -as=อัสสัม -ay=ไอย์มารา -az=อาเซอร์ไบจาน -ba=บัชคีร์ -eu=บาสก์ -bn=บังกลา -dz=ซองคา -bh=บิฮารี -bi=บิสลามา -br=เบรตัน -bg=บัลแกเรีย -my=พม่า -be=เบลารุส -km=เขมร -ca=คาตาลัน -zh=จีน -co=คอร์ซิกา -hr=โครเอเชีย -cs=เช็ก -da=เดนมาร์ก -nl=ดัตช์ -en=อังกฤษ -eo=เอสเปรันโต -et=เอสโตเนีย -fo=แฟโร -fj=ฟิจิ -fi=ฟินแลนด์ -fr=ฝรั่งเศส -fy=ฟริเซียนตะวันตก -gl=กาลิเซีย -ka=จอร์เจีย -de=เยอรมัน -el=กรีก -kl=กรีนแลนด์ -gn=กัวรานี -gu=คุชราต -ha=เฮาซา -he=ฮิบรู -iw=ฮิบรู -hi=ฮินดี -hu=ฮังการี -is=ไอซ์แลนด์ -id=อินโดนีเซีย -in=อินโดนีเซีย -ia=อินเตอร์ลิงกัว -ie=อินเตอร์ลิงกิว -iu=อินุกติตุต -ik=อีนูเปียก -ga=ไอริช -it=อิตาลี -ja=ญี่ปุ่น -jw=ชวา -kn=กันนาดา -ks=แคชเมียร์ -kk=คาซัค -rw=รวันดา -ky=คีร์กีซ -rn=บุรุนดี -ko=เกาหลี -ku=เคิร์ด -lo=ลาว -la=ละติน -lv=ลัตเวีย -ln=ลิงกาลา -lt=ลิทัวเนีย -mk=มาซิโดเนีย -mg=มาลากาซี -ms=มาเลย์ -ml=มาลายาลัม -mt=มอลตา -mi=เมารี -mr=มราฐี -mo=โมดาเวีย -mn=มองโกเลีย -na=นาอูรู -ne=เนปาล -no=นอร์เวย์ -oc=อ็อกซิตัน -or=โอดิยา -om=โอโรโม -ps=พัชโต -fa=เปอร์เซีย -pl=โปแลนด์ -pt=โปรตุเกส -pa=ปัญจาบ -qu=เคชวา -rm=โรแมนซ์ -ro=โรมาเนีย -ru=รัสเซีย -sm=ซามัว -sg=ซันโก -sa=สันสกฤต -gd=เกลิกสกอต -sr=เซอร์เบีย -st=โซโทใต้ -tn=บอตสวานา -sn=โชนา -sd=สินธิ -si=สิงหล -ss=สวาติ -sk=สโลวัก -sl=สโลวีเนีย -so=โซมาลี -es=สเปน -su=ซุนดา -sw=สวาฮีลี -sv=สวีเดน -tl=ตากาล็อก -tg=ทาจิก -ta=ทมิฬ -tt=ตาตาร์ -te=เตลูกู -th=ไทย -bo=ทิเบต -ti=ติกริญญา -to=ตองกา -ts=ซิตซองกา -tr=ตุรกี -tk=เติร์กเมน -tw=ทวิ -ug=อุยกูร์ -uk=ยูเครน -ur=อูรดู -uz=อุซเบก -vi=เวียดนาม -vo=โวลาพึค -cy=เวลส์ -wo=โวลอฟ -xh=คะห์โอซา -ji=ยิดดิช -yi=ยิดดิช -yo=โยรูบา -za=จ้วง -zu=ซูลู - -# country names -# key is ISO 3166 country code - -AF=อัฟกานิสถาน -AL=แอลเบเนีย -DZ=แอลจีเรีย -AD=อันดอร์รา -AO=แองโกลา -AI=แองกวิลลา -AR=อาร์เจนตินา -AM=อาร์เมเนีย -AW=อารูบา -AU=ออสเตรเลีย -AT=ออสเตรีย -AZ=อาเซอร์ไบจาน -BS=บาฮามาส -BH=บาห์เรน -BD=บังกลาเทศ -BB=บาร์เบโดส -BY=เบลารุส -BE=เบลเยียม -BZ=เบลีซ -BJ=เบนิน -BM=เบอร์มิวดา -BT=ภูฏาน -BO=โบลิเวีย -BA=บอสเนียและเฮอร์เซโกวีนา -BW=บอตสวานา -BR=บราซิล -BN=บรูไน -BG=บัลแกเรีย -BF=บูร์กินาฟาโซ -BI=บุรุนดี -KH=กัมพูชา -CM=แคเมอรูน -CA=แคนาดา -CV=เคปเวิร์ด -CF=สาธารณรัฐแอฟริกากลาง -TD=ชาด -CL=ชิลี -CN=จีน -CO=โคลอมเบีย -KM=คอโมโรส -CG=คองโก - บราซซาวิล -CR=คอสตาริกา -CI=โกตดิวัวร์ -HR=โครเอเชีย -CU=คิวบา -CY=ไซปรัส -CZ=เช็ก -DK=เดนมาร์ก -DJ=จิบูตี -DM=โดมินิกา -DO=สาธารณรัฐโดมินิกัน -TP=ติมอร์ตะวันออก -EC=เอกวาดอร์ -EG=อียิปต์ -SV=เอลซัลวาดอร์ -GQ=อิเควทอเรียลกินี -ER=เอริเทรีย -EE=เอสโตเนีย -ET=เอธิโอเปีย -FJ=ฟิจิ -FI=ฟินแลนด์ -FR=ฝรั่งเศส -GF=เฟรนช์เกียนา -PF=เฟรนช์โปลินีเซีย -TF=เฟรนช์เซาเทิร์นเทร์ริทอรีส์ -GA=กาบอง -GM=แกมเบีย -GE=จอร์เจีย -DE=เยอรมนี -GH=กานา -GR=กรีซ -GP=กวาเดอลูป -GT=กัวเตมาลา -GN=กินี -GW=กินี-บิสเซา -GY=กายอานา -HT=เฮติ -HN=ฮอนดูรัส -HK=เขตปกครองพิเศษฮ่องกงแห่งสาธารณรัฐประชาชนจีน -HU=ฮังการี -IS=ไอซ์แลนด์ -IN=อินเดีย -ID=อินโดนีเซีย -IR=อิหร่าน -IQ=อิรัก -IE=ไอร์แลนด์ -IL=อิสราเอล -IT=อิตาลี -JM=จาเมกา -JP=ญี่ปุ่น -JO=จอร์แดน -KZ=คาซัคสถาน -KE=เคนยา -KI=คิริบาส -KP=เกาหลีเหนือ -KR=เกาหลีใต้ -KW=คูเวต -KG=คีร์กีซสถาน -LA=ลาว -LV=ลัตเวีย -LB=เลบานอน -LS=เลโซโท -LR=ไลบีเรีย -LY=ลิเบีย -LI=ลิกเตนสไตน์ -LT=ลิทัวเนีย -LU=ลักเซมเบิร์ก -MK=มาซิโดเนียเหนือ -MG=มาดากัสการ์ -MY=มาเลเซีย -ML=มาลี -MT=มอลตา -MQ=มาร์ตินีก -MR=มอริเตเนีย -MU=มอริเชียส -YT=มายอต -MX=เม็กซิโก -FM=ไมโครนีเซีย -MD=มอลโดวา -MC=โมนาโก -MN=มองโกเลีย -MS=มอนต์เซอร์รัต -MA=โมร็อกโก -MZ=โมซัมบิก -MM=เมียนมา (พม่า) -NA=นามิเบีย -NP=เนปาล -NL=เนเธอร์แลนด์ -AN=เนเธอร์แลนด์แอนทิลล์ -NC=นิวแคลิโดเนีย -NZ=นิวซีแลนด์ -NI=นิการากัว -NE=ไนเจอร์ -NG=ไนจีเรีย -NU=นีอูเอ -NO=นอร์เวย์ -OM=โอมาน -PK=ปากีสถาน -PA=ปานามา -PG=ปาปัวนิวกินี -PY=ปารากวัย -PE=เปรู -PH=ฟิลิปปินส์ -PL=โปแลนด์ -PT=โปรตุเกส -PR=เปอร์โตริโก -QA=กาตาร์ -RO=โรมาเนีย -RU=รัสเซีย -RW=รวันดา -SA=ซาอุดีอาระเบีย -SN=เซเนกัล -SP=เซอร์เบีย -SC=เซเชลส์ -SL=เซียร์ราลีโอน -SG=สิงคโปร์ -SK=สโลวะเกีย -SI=สโลวีเนีย -SO=โซมาเลีย -ZA=แอฟริกาใต้ -ES=สเปน -LK=ศรีลังกา -SD=ซูดาน -SR=ซูรินาเม -SZ=เอสวาตีนี -SE=สวีเดน -CH=สวิตเซอร์แลนด์ -SY=ซีเรีย -TW=ไต้หวัน -TJ=ทาจิกิสถาน -TZ=แทนซาเนีย -TH=ไทย -TG=โตโก -TK=โตเกเลา -TO=ตองกา -TT=ตรินิแดดและโตเบโก -TN=ตูนิเซีย -TR=ตุรกี -TM=เติร์กเมนิสถาน -UG=ยูกันดา -UA=ยูเครน -AE=สหรัฐอาหรับเอมิเรตส์ -GB=สหราชอาณาจักร -US=สหรัฐอเมริกา -UY=อุรุกวัย -UZ=อุซเบกิสถาน -VU=วานูอาตู -VA=นครวาติกัน -VE=เวเนซุเอลา -VN=เวียดนาม -VG=หมู่เกาะบริติชเวอร์จิน -VI=หมู่เกาะเวอร์จินของสหรัฐอเมริกา -EH=ซาฮาราตะวันตก -YE=เยเมน -ZR=แซร์ -ZM=แซมเบีย -ZW=ซิมบับเว diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties deleted file mode 100644 index efce71219e7..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -tr=Türkçe - -# country names -# key is ISO 3166 country code - -TR=Türkiye diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties deleted file mode 100644 index efedadcd4ce..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2005, 2012, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -uk=українська - -# country names -# key is ISO 3166 country code - -UA=Україна diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties deleted file mode 100644 index 146233e37cf..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# -#****************************************************************************** -# (C) Copyright IBM Corp. 1996-2003 - All Rights Reserved * -# * -# The original version of this source code and documentation is copyrighted * -# and owned by IBM, These materials are provided under terms of a License * -# Agreement between IBM and Sun. This technology is protected by multiple * -# US and International patents. This notice and attribution to IBM may not * -# to removed. * -#****************************************************************************** -# -# This locale data is based on the ICU's Vietnamese locale data (rev. 1.38) -# found at: -# -# http://oss.software.ibm.com/cvs/icu/icu/source/data/locales/vi.txt?rev=1.38 - - -# language names -# key is ISO 639 language code - -ar=Tiếng Ả Rập -az=Tiếng Azerbaijan -be=Tiếng Belarus -bg=Tiếng Bulgaria -bo=Tiếng Tây Tạng -ca=Tiếng Catalan -cs=Tiếng Séc -da=Tiếng Đan Mạch -de=Tiếng Đức -el=Tiếng Hy Lạp -en=Tiếng Anh -eo=Tiếng Quốc Tế Ngữ -es=Tiếng Tây Ban Nha -et=Tiếng Estonia -fa=Tiếng Ba Tư -fi=Tiếng Phần Lan -fr=Tiếng Pháp -ga=Tiếng Ireland -he=Tiếng Do Thái -hi=Tiếng Hindi -hr=Tiếng Croatia -hu=Tiếng Hungary -hy=Tiếng Armenia -ia=Tiếng Khoa Học Quốc Tế -id=Tiếng Indonesia -is=Tiếng Iceland -it=Tiếng Italy -ja=Tiếng Nhật -jv=Tiếng Java -km=Tiếng Khmer -kn=Tiếng Kannada -ko=Tiếng Hàn -la=Tiếng La-tinh -lo=Tiếng Lào -lt=Tiếng Litva -lv=Tiếng Latvia -mk=Tiếng Macedonia -mn=Tiếng Mông Cổ -ms=Tiếng Mã Lai -ne=Tiếng Nepal -nl=Tiếng Hà Lan -no=Tiếng Na Uy -pl=Tiếng Ba Lan -pt=Tiếng Bồ Đào Nha -ro=Tiếng Romania -ru=Tiếng Nga -sa=Tiếng Phạn -sk=Tiếng Slovak -sl=Tiếng Slovenia -so=Tiếng Somali -sq=Tiếng Albania -sr=Tiếng Serbia -sv=Tiếng Thụy Điển -th=Tiếng Thái -tr=Tiếng Thổ Nhĩ Kỳ -uk=Tiếng Ukraina -uz=Tiếng Uzbek -vi=Tiếng Việt -yi=Tiếng Yiddish -zh=Tiếng Trung - -# country names -# key is ISO 3166 country code - -AE=Các Tiểu Vương quốc Ả Rập Thống nhất -AG=Antigua và Barbuda -AT=Áo -BA=Bosnia và Herzegovina -BE=Bỉ -CF=Cộng hòa Trung Phi -CH=Thụy Sĩ -CN=Trung Quốc -CY=Síp -CZ=Séc -DE=Đức -DK=Đan Mạch -EG=Ai Cập -EH=Tây Sahara -ES=Tây Ban Nha -FI=Phần Lan -FR=Pháp -GB=Vương quốc Anh -GQ=Guinea Xích Đạo -GR=Hy Lạp -IN=Ấn Độ -JP=Nhật Bản -KH=Campuchia -KN=St. Kitts và Nevis -KP=Triều Tiên -KR=Hàn Quốc -LA=Lào -LB=Li-băng -LT=Litva -MA=Ma-rốc -MH=Quần đảo Marshall -MK=Bắc Macedonia -MM=Myanmar (Miến Điện) -MN=Mông Cổ -NL=Hà Lan -NO=Na Uy -PL=Ba Lan -PT=Bồ Đào Nha -RU=Nga -SA=Ả Rập Xê-út -SB=Quần đảo Solomon -SE=Thụy Điển -SP=Séc-bia -ST=São Tomé và Príncipe -TH=Thái Lan -TR=Thổ Nhĩ Kỳ -TT=Trinidad và Tobago -TW=Đài Loan -UA=Ukraina -US=Hoa Kỳ -VA=Thành Vatican -VC=St. Vincent và Grenadines -VN=Việt Nam -YU=Nam Tư -ZA=Nam Phi diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties deleted file mode 100644 index ffd74ab11ce..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties +++ /dev/null @@ -1,1145 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=阿法尔语 -ab=阿布哈西亚语 -ae=阿维斯塔语 -af=南非荷兰语 -ak=阿肯语 -am=阿姆哈拉语 -an=阿拉贡语 -ar=阿拉伯语 -as=阿萨姆语 -av=阿瓦尔语 -ay=艾马拉语 -az=阿塞拜疆语 -ba=巴什基尔语 -be=白俄罗斯语 -bg=保加利亚语 -bh=比哈尔文 -bi=比斯拉马语 -bm=班巴拉语 -bn=孟加拉语 -bo=藏语 -br=布列塔尼语 -bs=波斯尼亚语 -ca=加泰罗尼亚语 -ce=车臣语 -ch=查莫罗语 -co=科西嘉语 -cr=克里族语 -cs=捷克语 -cu=教会斯拉夫语 -cv=楚瓦什语 -cy=威尔士语 -da=丹麦语 -de=德语 -dv=迪维希语 -dz=宗卡语 -ee=埃维语 -el=希腊语 -en=英语 -eo=世界语 -es=西班牙语 -et=爱沙尼亚语 -eu=巴斯克语 -fa=波斯语 -ff=富拉语 -fi=芬兰语 -fj=斐济语 -fo=法罗语 -fr=法语 -fy=西弗里西亚语 -ga=爱尔兰语 -gd=苏格兰盖尔语 -gl=加利西亚语 -gn=瓜拉尼语 -gu=古吉拉特语 -gv=马恩语 -ha=豪萨语 -he=希伯来语 -hi=印地语 -ho=希里莫图语 -hr=克罗地亚语 -ht=海地克里奥尔语 -hu=匈牙利语 -hy=亚美尼亚语 -hz=赫雷罗语 -ia=国际语 -id=印度尼西亚语 -ie=国际文字（E） -ig=伊博语 -ii=四川彝语 -ik=伊努皮克语 -in=印度尼西亚语 -io=伊多语 -is=冰岛语 -it=意大利语 -iu=因纽特语 -iw=希伯来语 -ja=日语 -ji=意第绪语 -jv=爪哇语 -ka=格鲁吉亚语 -kg=刚果语 -ki=吉库尤语 -kj=宽亚玛语 -kk=哈萨克语 -kl=格陵兰语 -km=高棉语 -kn=卡纳达语 -ko=韩语 -kr=卡努里语 -ks=克什米尔语 -ku=库尔德语 -kv=科米语 -kw=康沃尔语 -ky=柯尔克孜语 -la=拉丁语 -lb=卢森堡语 -lg=卢干达语 -li=林堡语 -ln=林加拉语 -lo=老挝语 -lt=立陶宛语 -lu=鲁巴加丹加语 -lv=拉脱维亚语 -mg=马拉加斯语 -mh=马绍尔语 -mi=毛利语 -mk=马其顿语 -ml=马拉雅拉姆语 -mn=蒙古语 -mo=摩尔多瓦文 -mr=马拉地语 -ms=马来语 -mt=马耳他语 -my=缅甸语 -na=瑙鲁语 -nb=书面挪威语 -nd=北恩德贝勒语 -ne=尼泊尔语 -ng=恩东加语 -nl=荷兰语 -nn=挪威尼诺斯克语 -no=挪威语 -nr=南恩德贝勒语 -nv=纳瓦霍语 -ny=齐切瓦语 -oc=奥克语 -oj=奥吉布瓦语 -om=奥罗莫语 -or=奥里亚语 -os=奥塞梯语 -pa=旁遮普语 -pi=巴利语 -pl=波兰语 -ps=普什图语 -pt=葡萄牙语 -qu=克丘亚语 -rm=罗曼什语 -rn=隆迪语 -ro=罗马尼亚语 -ru=俄语 -rw=卢旺达语 -sa=梵语 -sc=萨丁语 -sd=信德语 -se=北方萨米语 -sg=桑戈语 -si=僧伽罗语 -sk=斯洛伐克语 -sl=斯洛文尼亚语 -sm=萨摩亚语 -sn=绍纳语 -so=索马里语 -sq=阿尔巴尼亚语 -sr=塞尔维亚语 -ss=斯瓦蒂语 -st=南索托语 -su=巽他语 -sv=瑞典语 -sw=斯瓦希里语 -ta=泰米尔语 -te=泰卢固语 -tg=塔吉克语 -th=泰语 -ti=提格利尼亚语 -tk=土库曼语 -tl=他加禄语 -tn=茨瓦纳语 -to=汤加语 -tr=土耳其语 -ts=聪加语 -tt=鞑靼语 -tw=契维语 -ty=塔希提语 -ug=维吾尔语 -uk=乌克兰语 -ur=乌尔都语 -uz=乌兹别克语 -ve=文达语 -vi=越南语 -vo=沃拉普克语 -wa=瓦隆语 -wo=沃洛夫语 -xh=科萨语 -yi=意第绪语 -yo=约鲁巴语 -za=壮语 -zh=中文 -zu=祖鲁语 - -# key is ISO 639.2 language code -aar=阿法尔文 -abk=阿布哈西亚文 -ace=亚齐语 -ach=阿乔利语 -ada=阿当梅语 -ady=阿迪格语 -afa=亚非诸语言 -afh=阿弗里希利语 -afr=南非荷兰文 -ain=阿伊努语 -aka=库阿文 -akk=阿卡德语 -alb=阿尔巴尼亚文 -ale=阿留申语 -alg=其他阿尔贡语系 -alt=南阿尔泰语 -amh=阿姆哈拉文 -ang=古英语 -anp=昂加语 -apa=阿帕切文 -ara=阿拉伯文 -arc=阿拉米语 -arg=阿拉贡文 -arm=亚美尼亚文 -arn=马普切语 -arp=阿拉帕霍语 -art=其他人工语系 -arw=阿拉瓦克语 -asm=阿萨姆文 -ast=阿斯图里亚斯语 -ath=阿萨帕斯坎语系 -aus=澳大利亚语系 -ava=阿瓦尔文 -ave=阿维斯陀文 -awa=阿瓦德语 -aym=艾马拉文 -aze=阿塞拜疆文 -bad=班达文 -bai=巴米累克语系 -bak=巴什客尔文 -bal=俾路支语 -bam=班巴拉文 -ban=巴厘语 -baq=巴斯克文 -bas=巴萨语 -bat=其他波罗的语系 -bej=贝沙语 -bel=白俄罗斯文 -bem=本巴语 -ben=孟加拉文 -ber=柏柏尔文 -bho=博杰普尔语 -bih=比哈尔文 -bik=比科尔语 -bin=比尼语 -bis=比斯拉马文 -bla=西克西卡语 -bnt=班图文 -bos=波斯尼亚文 -bra=布拉杰语 -bre=布里多尼文 -btk=巴塔克语 -bua=布里亚特语 -bug=布吉语 -bul=保加利亚文 -bur=缅甸文 -byn=比林语 -cad=卡多语 -cai=其他中美印第安语系 -car=加勒比语 -cat=加泰罗尼亚文 -cau=其他高加索语系 -ceb=宿务语 -cel=其他凯尔特语系 -cha=查莫罗文 -chb=奇布查语 -che=车臣文 -chg=察合台语 -chi=中文 -chk=楚克语 -chm=马里语 -chn=奇努克混合语 -cho=乔克托语 -chp=奇佩维安语 -chr=切罗基语 -chu=教会斯拉夫文 -chv=楚瓦什文 -chy=夏延语 -cmc=查米克文 -cop=科普特语 -cor=康沃尔文 -cos=科西嘉文 -cpe=其他以英文为基础的克里奥尔混合语系 -cpf=其他以法文为基础的克里奥尔混合语系 -cpp=其他以葡萄牙文为基础的克里奥尔混合语系 -cre=克里文 -crh=克里米亚土耳其语 -crp=其他克里奥尔混合语系 -csb=卡舒比语 -cus=其他库施特语系 -cze=捷克文 -dak=达科他语 -dan=丹麦文 -dar=达尔格瓦语 -day=达雅克文 -del=特拉华语 -den=史拉维语 -dgr=多格里布语 -din=丁卡语 -div=迪维希文 -doi=多格拉语 -dra=其他德拉维语系 -dsb=下索布语 -dua=杜阿拉语 -dum=中古荷兰语 -dut=荷兰文 -dyu=迪尤拉语 -dzo=不丹文 -efi=埃菲克语 -egy=古埃及语 -eka=艾卡朱克语 -elx=埃兰语 -eng=英文 -enm=中古英语 -epo=世界文 -est=爱沙尼亚文 -ewe=埃维文 -ewo=埃翁多语 -fan=芳格语 -fao=法罗文 -fat=芳蒂语 -fij=斐济文 -fil=菲律宾语 -fin=芬兰文 -fiu=其他芬兰乌戈尔语系 -fon=丰语 -fre=法文 -frm=中古法语 -fro=古法语 -frr=北弗里西亚语 -frs=东弗里西亚语 -fry=西弗里斯兰语 -ful=富拉文 -fur=弗留利语 -gaa=加族语 -gay=迦约语 -gba=格巴亚语 -gem=其他日尔曼语系 -geo=格鲁吉亚文 -ger=德文 -gez=吉兹语 -gil=吉尔伯特语 -gla=盖尔语 -gle=爱尔兰文 -glg=加利西亚文 -glv=马恩文 -gmh=中古高地德语 -goh=古高地德语 -gon=冈德语 -gor=哥伦打洛语 -got=哥特语 -grb=格列博语 -grc=古希腊语 -gre=希腊语, 现代 (1453-) -grn=瓜拉尼文 -gsw=瑞士德语 -guj=古加拉提文 -gwi=哥威迅语 -hai=海达语 -hat=海地文 -hau=豪撒文 -haw=夏威夷语 -heb=希伯来文 -her=赫雷罗文 -hil=希利盖农语 -him=赫马查利文 -hin=印地文 -hit=赫梯语 -hmn=苗语 -hmo=新里木托文 -hrv=克罗地亚文 -hsb=上索布语 -hun=匈牙利文 -hup=胡帕语 -iba=伊班语 -ibo=伊博文 -ice=冰岛文 -ido=伊多文 -iii=四川彝文 -ijo=伊乔文 -iku=爱斯基摩文 -ile=拉丁国际文 -ilo=伊洛卡诺语 -ina=拉丁国际语 (国际辅助语联盟) -inc=其他印度语系 -ind=印度尼西亚文 -ine=其他印欧语系 -inh=印古什语 -ipk=依奴皮维克文 -ira=伊朗文 -iro=伊洛魁语系 -ita=意大利文 -jav=爪哇文 -jbo=逻辑语 -jpn=日文 -jpr=犹太波斯语 -jrb=犹太阿拉伯语 -kaa=卡拉卡尔帕克语 -kab=卡拜尔语 -kac=克钦语 -kal=格陵兰文 -kam=卡姆巴语 -kan=卡纳塔克语 -kar=喀伦文 -kas=克什米尔文 -kau=卡努里文 -kaw=卡威语 -kaz=哈萨克文 -kbd=卡巴尔德语 -kha=卡西语 -khi=其他科伊桑语系 -khm=中高棉语 -kho=和田语 -kik=吉库尤文 -kin=卢旺达文 -kir=吉尔吉斯文 -kmb=金邦杜语 -kok=孔卡尼语 -kom=科米文 -kon=刚果文 -kor=朝鲜文 -kos=科斯拉伊语 -kpe=克佩列语 -krc=卡拉恰伊巴尔卡尔语 -krl=卡累利阿语 -kro=克鲁文 -kru=库鲁克语 -kua=宽亚玛语 -kum=库梅克语 -kur=库尔德文 -kut=库特奈语 -lad=拉迪诺语 -lah=印度-雅利安语 -lam=兰巴语 -lao=老挝文 -lat=拉丁文 -lav=拉托维亚文 (列托) -lez=列兹金语 -lim=林堡文 -lin=林加拉文 -lit=立陶宛文 -lol=蒙戈语 -loz=洛齐语 -ltz=卢森堡文 -lua=卢巴-卢拉语 -lub=卢巴-加丹加文 -lug=干达文 -lui=卢伊塞诺语 -lun=隆达语 -luo=卢奥语 -lus=米佐语 -mac=马其顿文 -mad=马都拉语 -mag=摩揭陀语 -mah=马绍尔文 -mai=迈蒂利语 -mak=望加锡语 -mal=马来亚拉姆文 -man=曼丁哥语 -mao=毛利文 -map=澳斯特罗尼西亚语系 -mar=马拉地文 -mas=马赛语 -may=马来文 -mdf=莫克沙语 -mdr=曼达尔语 -men=门德语 -mga=中古爱尔兰语 -mic=密克马克语 -min=米南佳保语 -mis=各种不同语系 -mkh=其他孟高棉语系 -mlg=马尔加什文 -mlt=马耳他文 -mnc=满语 -mni=曼尼普尔语 -mno=马诺博语系 -moh=摩霍克语 -mon=蒙古文 -mos=莫西语 -mul=多语种 -mun=蒙达语系 -mus=克里克语 -mwl=米兰德斯语 -mwr=马尔瓦里语 -myn=玛雅语系 -myv=厄尔兹亚语 -nah=纳瓦特尔文 -nai=其他北美印第安语系 -nap=那不勒斯语 -nau=瑙鲁文 -nav=纳瓦霍文 -nbl=恩德贝勒语, 南部 -nde=恩德贝勒语, 北部 -ndo=恩东加文 -nds=低地德语 -nep=尼泊尔文 -new=尼瓦尔语 -nia=尼亚斯语 -nic=尼加拉瓜科多巴 -niu=纽埃语 -nno=挪威尼诺斯克文 -nob=挪威博克马尔语 -nog=诺盖语 -non=古诺尔斯语 -nor=挪威文 -nqo=西非书面文字 -nso=北索托语 -nub=努比亚语系 -nwc=古典尼瓦尔语 -nya=齐切瓦语 -nym=尼扬韦齐语 -nyn=尼昂科勒语 -nyo=尼奥罗语 -nzi=恩济马语 -oci=奥西坦文 (1500 后) -oji=奥吉布瓦文 -ori=欧里亚文 -orm=阿曼文 -osa=奥塞治语 -oss=奥塞梯文 -ota=奥斯曼土耳其语 -oto=奥托米语系 -paa=其他巴布亚文 -pag=邦阿西南语 -pal=巴拉维语 -pam=邦板牙语 -pan=旁遮普文 -pap=帕皮阿门托语 -pau=帕劳语 -peo=古波斯语 -per=波斯文 -phi=其他菲律宾语系 -phn=腓尼基语 -pli=巴利文 -pol=波兰文 -pon=波纳佩语 -por=葡萄牙文 -pra=普拉克里特诸语言 -pro=古普罗文斯语 -pus=普什图文 -que=盖丘亚文 -raj=拉贾斯坦语 -rap=拉帕努伊语 -rar=拉罗汤加语 -roa=其他拉丁语系 -roh=罗曼什语 -rom=吉普赛语 -rum=罗马尼亚文 -run=基隆迪文 -rup=阿罗马尼亚语 -rus=俄文 -sad=桑达韦语 -sag=桑戈文 -sah=萨哈语 -sai=其他南美印第安文 -sal=萨利什文 -sam=萨马利亚阿拉姆语 -san=梵文 -sas=萨萨克文 -sat=桑塔利语 -scn=西西里语 -sco=苏格兰语 -sel=塞尔库普语 -sem=其他闪族语系 -sga=古爱尔兰语 -sgn=手语 -shn=掸语 -sid=悉达摩语 -sin=辛哈拉语 -sio=苏语诸语言 -sit=汉藏诸语言 -sla=其他斯拉夫语系 -slo=斯洛伐克文 -slv=斯洛文尼亚文 -sma=南萨米语 -sme=北沙密文 -smi=其他萨米文 -smj=吕勒萨米语 -smn=伊纳里萨米语 -smo=萨摩亚文 -sms=斯科特萨米语 -sna=修纳文 -snd=信德文 -snk=索宁克语 -sog=粟特语 -som=索马里文 -son=桑海文 -sot=索托语, 南部 -spa=西班牙文 -srd=撒丁文 -srn=苏里南汤加语 -srp=塞尔维亚文 -srr=塞雷尔语 -ssa=非洲撒哈拉沙漠边缘地带语言 -ssw=斯瓦特文 -suk=苏库马语 -sun=巽他文 -sus=苏苏语 -sux=苏美尔语 -swa=斯瓦希里文 -swe=瑞典文 -syc=古典叙利亚语 -syr=叙利亚语 -tah=塔希提文 -tai=傣语诸语言 (其他) -tam=泰米尔文 -tat=鞑靼文 -tel=泰卢固文 -tem=泰姆奈语 -ter=特伦诺语 -tet=德顿语 -tgk=塔吉克文 -tgl=塔加路族文 -tha=泰文 -tib=西藏文 -tig=提格雷语 -tir=提格里尼亚文 -tiv=蒂夫语 -tkl=托克劳语 -tlh=克林贡语 -tli=特林吉特语 -tmh=塔马奇克语 -tog=尼亚萨汤加语 -ton=汤加语 (汤加岛) -tpi=托克皮辛语 -tsi=钦西安语 -tsn=突尼斯文 -tso=特松加文 -tuk=土库曼文 -tum=通布卡语 -tup=图皮语系 -tur=土耳其文 -tut=阿尔泰诸语言 (其他) -tvl=图瓦卢语 -twi=契维文 -tyv=图瓦语 -udm=乌德穆尔特语 -uga=乌加里特语 -uig=维吾尔文 -ukr=乌克兰文 -umb=翁本杜语 -und=未知语言 -urd=乌尔都文 -uzb=乌兹别克文 -vai=瓦伊语 -ven=文达文 -vie=越南文 -vol=沃拉普克文 -vot=沃提克语 -wak=瓦卡什诸语言 -wal=瓦拉莫语 -war=瓦瑞语 -was=瓦绍语 -wel=威尔士文 -wen=索布诸语言 -wln=瓦龙文 -wol=沃尔夫文 -xal=卡尔梅克语 -xho=班图文 -yao=瑶族语 -yap=雅浦语 -yid=依地文 -yor=约鲁巴文 -ypk=尤皮克诸语言 -zap=萨波蒂克语 -zbl=布里斯符号 -zen=泽纳加语 -zha=壮文 -znd=赞德文 -zul=祖鲁文 -zun=祖尼语 -zxx=无语言内容 -zza=扎扎语 - -# script names -# key is ISO 15924 script code - -Arab=阿拉伯文 -Armi=皇室亚拉姆文 -Armn=亚美尼亚文 -Avst=阿维斯陀文 -Bali=巴厘文 -Bamu=巴姆穆文 -Bass=巴萨文 -Batk=巴塔克文 -Beng=孟加拉文 -Blis=布列斯符号 -Bopo=汉语拼音 -Brah=婆罗米文字 -Brai=布莱叶盲文 -Bugi=布吉文 -Buhd=布希德文 -Cakm=查克马文 -Cans=加拿大土著统一音节 -Cari=卡里亚文 -Cham=占文 -Cher=切罗基文 -Cirt=色斯文 -Copt=克普特文 -Cprt=塞浦路斯文 -Cyrl=西里尔文 -Cyrs=西里尔文字（古教会斯拉夫文的变体） -Deva=天城文 -Dsrt=德塞莱特文 -Dupl=杜普洛伊速记 -Egyd=后期埃及文 -Egyh=古埃及僧侣书写体 -Egyp=古埃及象形文 -Elba=爱尔巴桑文 -Ethi=埃塞俄比亚文 -Geok=格鲁吉亚文（教堂体） -Geor=格鲁吉亚文 -Glag=格拉哥里文 -Goth=哥特文 -Gran=格兰塔文 -Grek=希腊文 -Gujr=古吉拉特文 -Guru=果鲁穆奇文 -Hang=谚文 -Hani=汉字 -Hano=汉奴罗文 -Hans=简体 -Hant=繁体 -Hebr=希伯来文 -Hira=平假名 -Hmng=杨松录苗文 -Hrkt=假名表 -Hung=古匈牙利文 -Inds=印度河文字 -Ital=古意大利文 -Java=爪哇文 -Jpan=日文 -Kali=克耶李文字 -Kana=片假名 -Khar=卡罗须提文 -Khmr=高棉文 -Knda=卡纳达文 -Kore=韩文 -Kpel=克佩列文 -Kthi=凯提文 -Lana=兰拿文 -Laoo=老挝文 -Latf=拉丁文（哥特式字体变体） -Latg=拉丁文（盖尔文变体） -Latn=拉丁文 -Lepc=雷布查文 -Limb=林布文 -Lina=线形文字（A） -Linb=线形文字（B） -Lisu=傈僳文 -Loma=洛马文 -Lyci=利西亚文 -Lydi=吕底亚文 -Mand=阿拉米文 -Mani=摩尼教文 -Maya=玛雅圣符文 -Mend=门迪文 -Merc=麦罗埃草书 -Mero=麦若提克文 -Mlym=马拉雅拉姆文 -Mong=蒙古文 -Moon=韩文语系 -Mtei=曼尼普尔文 -Mymr=缅甸文 -Narb=古北方阿拉伯文 -Nbat=纳巴泰文 -Nkgb=纳西格巴文 -Nkoo=西非书面文字（N’Ko） -Ogam=欧甘文 -Olck=桑塔利文 -Orkh=鄂尔浑文 -Orya=奥里亚文 -Osma=奥斯曼亚文 -Palm=帕尔迈拉文 -Perm=古彼尔姆文 -Phag=八思巴文 -Phli=巴列维文碑铭体 -Phlp=巴列维文（圣诗体） -Phlv=巴列维文（书体） -Phnx=腓尼基文 -Plrd=波拉德音标文字 -Prti=帕提亚文碑铭体 -Rjng=拉让文 -Roro=朗格朗格文 -Runr=古代北欧文 -Samr=撒马利亚文 -Sara=沙拉堤文 -Sarb=古南阿拉伯文 -Saur=索拉什特拉文 -Sgnw=书写符号 -Shaw=萧伯纳式文 -Sind=信德文 -Sinh=僧伽罗文 -Sund=巽他文 -Sylo=锡尔赫特文 -Syrc=叙利亚文 -Syre=福音体叙利亚文 -Syrj=西叙利亚文 -Syrn=东叙利亚文 -Tagb=塔格班瓦文 -Tale=泰乐文 -Talu=新傣文 -Taml=泰米尔文 -Tavt=越南傣文 -Telu=泰卢固文 -Teng=腾格瓦文字 -Tfng=提非纳文 -Tglg=塔加路文 -Thaa=塔安那文 -Thai=泰文 -Tibt=藏文 -Ugar=乌加里特文 -Vaii=瓦依文 -Visp=可见语言 -Wara=瓦郎奇蒂文字 -Xpeo=古波斯文 -Xsux=苏美尔-阿卡德楔形文字 -Yiii=彝文 -Zinh=遗传学术语 -Zmth=数学符号 -Zsym=符号 -Zxxx=非书面文字 -Zyyy=通用 -Zzzz=未知文字 - -# country names -# key is ISO 3166 country code - -AD=安道尔 -AE=阿拉伯联合酋长国 -AF=阿富汗 -AG=安提瓜和巴布达 -AI=安圭拉 -AL=阿尔巴尼亚 -AM=亚美尼亚 -AN=荷属安的列斯群岛 -AO=安哥拉 -AQ=南极洲 -AR=阿根廷 -AS=美属萨摩亚 -AT=奥地利 -AU=澳大利亚 -AW=阿鲁巴 -AX=奥兰群岛 -AZ=阿塞拜疆 -BA=波斯尼亚和黑塞哥维那 -BB=巴巴多斯 -BD=孟加拉国 -BE=比利时 -BF=布基纳法索 -BG=保加利亚 -BH=巴林 -BI=布隆迪 -BJ=贝宁 -BM=百慕大 -BN=文莱 -BO=玻利维亚 -BR=巴西 -BS=巴哈马 -BT=不丹 -BV=布韦岛 -BW=博茨瓦纳 -BY=白俄罗斯 -BZ=伯利兹 -CA=加拿大 -CC=科科斯（基林）群岛 -CD=刚果（金） -CF=中非共和国 -CG=刚果（布） -CH=瑞士 -CI=科特迪瓦 -CK=库克群岛 -CL=智利 -CM=喀麦隆 -CN=中国 -CO=哥伦比亚 -CR=哥斯达黎加 -CS=塞尔维亚及黑山 -CU=古巴 -CV=佛得角 -CX=圣诞岛 -CY=塞浦路斯 -CZ=捷克 -DE=德国 -DJ=吉布提 -DK=丹麦 -DM=多米尼克 -DO=多米尼加共和国 -DZ=阿尔及利亚 -EC=厄瓜多尔 -EE=爱沙尼亚 -EG=埃及 -EH=西撒哈拉 -ER=厄立特里亚 -ES=西班牙 -ET=埃塞俄比亚 -FI=芬兰 -FJ=斐济 -FK=福克兰群岛 -FM=密克罗尼西亚 -FO=法罗群岛 -FR=法国 -GA=加蓬 -GB=英国 -GD=格林纳达 -GE=格鲁吉亚 -GF=法属圭亚那 -GH=加纳 -GI=直布罗陀 -GL=格陵兰 -GM=冈比亚 -GN=几内亚 -GP=瓜德罗普 -GQ=赤道几内亚 -GR=希腊 -GS=南乔治亚和南桑威奇群岛 -GT=危地马拉 -GU=关岛 -GW=几内亚比绍 -GY=圭亚那 -HK=中国香港特别行政区 -HM=赫德岛和麦克唐纳群岛 -HN=洪都拉斯 -HR=克罗地亚 -HT=海地 -HU=匈牙利 -ID=印度尼西亚 -IE=爱尔兰 -IL=以色列 -IN=印度 -IO=英属印度洋领地 -IQ=伊拉克 -IR=伊朗 -IS=冰岛 -IT=意大利 -JM=牙买加 -JO=约旦 -JP=日本 -KE=肯尼亚 -KG=吉尔吉斯斯坦 -KH=柬埔寨 -KI=基里巴斯 -KM=科摩罗 -KN=圣基茨和尼维斯 -KP=朝鲜 -KR=韩国 -KW=科威特 -KY=开曼群岛 -KZ=哈萨克斯坦 -LA=老挝 -LB=黎巴嫩 -LC=圣卢西亚 -LI=列支敦士登 -LK=斯里兰卡 -LR=利比里亚 -LS=莱索托 -LT=立陶宛 -LU=卢森堡 -LV=拉脱维亚 -LY=利比亚 -MA=摩洛哥 -MC=摩纳哥 -MD=摩尔多瓦 -ME=黑山 -MG=马达加斯加 -MH=马绍尔群岛 -MK=北马其顿 -ML=马里 -MM=缅甸 -MN=蒙古 -MO=中国澳门特别行政区 -MP=北马里亚纳群岛 -MQ=马提尼克 -MR=毛里塔尼亚 -MS=蒙特塞拉特 -MT=马耳他 -MU=毛里求斯 -MV=马尔代夫 -MW=马拉维 -MX=墨西哥 -MY=马来西亚 -MZ=莫桑比克 -NA=纳米比亚 -NC=新喀里多尼亚 -NE=尼日尔 -NF=诺福克岛 -NG=尼日利亚 -NI=尼加拉瓜 -NL=荷兰 -NO=挪威 -NP=尼泊尔 -NR=瑙鲁 -NU=纽埃 -NZ=新西兰 -OM=阿曼 -PA=巴拿马 -PE=秘鲁 -PF=法属波利尼西亚 -PG=巴布亚新几内亚 -PH=菲律宾 -PK=巴基斯坦 -PL=波兰 -PM=圣皮埃尔和密克隆群岛 -PN=皮特凯恩群岛 -PR=波多黎各 -PS=巴勒斯坦领土 -PT=葡萄牙 -PW=帕劳 -PY=巴拉圭 -QA=卡塔尔 -RE=留尼汪 -RO=罗马尼亚 -RS=塞尔维亚 -RU=俄罗斯 -RW=卢旺达 -SA=沙特阿拉伯 -SB=所罗门群岛 -SC=塞舌尔 -SD=苏丹 -SE=瑞典 -SG=新加坡 -SH=圣赫勒拿 -SI=斯洛文尼亚 -SJ=斯瓦尔巴和扬马延 -SK=斯洛伐克 -SL=塞拉利昂 -SM=圣马力诺 -SN=塞内加尔 -SO=索马里 -SR=苏里南 -ST=圣多美和普林西比 -SV=萨尔瓦多 -SY=叙利亚 -SZ=斯威士兰 -TC=特克斯和凯科斯群岛 -TD=乍得 -TF=法属南部领地 -TG=多哥 -TH=泰国 -TJ=塔吉克斯坦 -TK=托克劳 -TL=东帝汶 -TM=土库曼斯坦 -TN=突尼斯 -TO=汤加 -TR=土耳其 -TT=特立尼达和多巴哥 -TV=图瓦卢 -TW=台湾 -TZ=坦桑尼亚 -UA=乌克兰 -UG=乌干达 -UM=美国本土外小岛屿 -US=美国 -UY=乌拉圭 -UZ=乌兹别克斯坦 -VA=梵蒂冈 -VC=圣文森特和格林纳丁斯 -VE=委内瑞拉 -VG=英属维尔京群岛 -VI=美属维尔京群岛 -VN=越南 -VU=瓦努阿图 -WF=瓦利斯和富图纳 -WS=萨摩亚 -YE=也门 -YT=马约特 -ZA=南非 -ZM=赞比亚 -ZW=津巴布韦 - -# territory names -# key is UN M.49 country and area code - -001=世界 -002=非洲 -003=北美洲 -005=南美洲 -009=大洋洲 -011=西非 -013=中美洲 -014=东非 -015=北非 -017=中非 -018=南部非洲 -019=美洲 -021=美洲北部 -029=加勒比地区 -030=东亚 -034=南亚 -035=东南亚 -039=南欧 -053=澳大拉西亚 -054=美拉尼西亚 -057=密克罗尼西亚地区 -061=玻利尼西亚 -142=亚洲 -143=中亚 -145=西亚 -150=欧洲 -151=东欧 -154=北欧 -155=西欧 -419=拉丁美洲 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties deleted file mode 100644 index d144f4279c8..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. -# - -# -# COPYRIGHT AND PERMISSION NOTICE -# -# Copyright (C) 1991-2007 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. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties deleted file mode 100644 index b867e2259ae..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties +++ /dev/null @@ -1,1009 +0,0 @@ -# Copyright (c) 2005, 2022, 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. -# - -# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved -# -# The original version of this source code and documentation -# is copyrighted and owned by Taligent, Inc., a wholly-owned -# subsidiary of IBM. These materials are provided under terms -# of a License Agreement between Taligent and Sun. This technology -# is protected by multiple US and International patents. -# -# This notice and attribution to Taligent may not be removed. -# Taligent is a registered trademark of Taligent, Inc. - - -# language names -# key is ISO 639 language code - -aa=阿法文 -ab=阿布哈茲文 -ae=阿維斯塔文 -af=南非荷蘭文 -ak=阿坎文 -am=阿姆哈拉文 -an=阿拉貢文 -ar=阿拉伯文 -as=阿薩姆文 -av=阿瓦爾文 -ay=艾馬拉文 -az=亞塞拜然文 -ba=巴什喀爾文 -be=白俄羅斯文 -bg=保加利亞文 -bh=比哈爾文 -bi=比斯拉馬文 -bm=班巴拉文 -bn=孟加拉文 -bo=藏文 -br=布列塔尼文 -bs=波士尼亞文 -ca=加泰蘭文 -ce=車臣文 -ch=查莫洛文 -co=科西嘉文 -cr=克里文 -cs=捷克文 -cu=宗教斯拉夫文 -cv=楚瓦什文 -cy=威爾斯文 -da=丹麥文 -de=德文 -dv=迪維西文 -dz=宗卡文 -ee=埃維文 -el=希臘文 -en=英文 -eo=世界文 -es=西班牙文 -et=愛沙尼亞文 -eu=巴斯克文 -fa=波斯文 -ff=富拉文 -fi=芬蘭文 -fj=斐濟文 -fo=法羅文 -fr=法文 -fy=西弗里西亞文 -ga=愛爾蘭文 -gd=蘇格蘭蓋爾文 -gl=加利西亞文 -gn=瓜拉尼文 -gu=古吉拉特文 -gv=曼島文 -ha=豪撒文 -he=希伯來文 -hi=印地文 -ho=西里莫圖土文 -hr=克羅埃西亞文 -ht=海地文 -hu=匈牙利文 -hy=亞美尼亞文 -hz=赫雷羅文 -ia=國際文 -id=印尼文 -ie=國際文（E） -ig=伊布文 -ii=四川彝文 -ik=依奴皮維克文 -in=印尼文 -io=伊多文 -is=冰島文 -it=義大利文 -iu=因紐特文 -iw=希伯來文 -ja=日文 -ji=意第緒文 -jv=爪哇文 -ka=喬治亞文 -kg=剛果文 -ki=吉庫尤文 -kj=廣亞馬文 -kk=哈薩克文 -kl=格陵蘭文 -km=高棉文 -kn=坎那達文 -ko=韓文 -kr=卡努里文 -ks=喀什米爾文 -ku=庫德文 -kv=科米文 -kw=康瓦耳文 -ky=吉爾吉斯文 -la=拉丁文 -lb=盧森堡文 -lg=干達文 -li=林堡文 -ln=林加拉文 -lo=寮文 -lt=立陶宛文 -lu=魯巴加丹加文 -lv=拉脫維亞文 -mg=馬達加斯加文 -mh=馬紹爾文 -mi=毛利文 -mk=馬其頓文 -ml=馬來亞拉姆文 -mn=蒙古文 -mo=摩爾達維亞文 -mr=馬拉地文 -ms=馬來文 -mt=馬爾他文 -my=緬甸文 -na=諾魯文 -nb=巴克摩挪威文 -nd=北地畢列文 -ne=尼泊爾文 -ng=恩東加文 -nl=荷蘭文 -nn=耐諾斯克挪威文 -no=挪威文 -nr=南地畢列文 -nv=納瓦霍文 -ny=尼揚賈文 -oc=奧克西坦文 -oj=奧杰布瓦文 -om=奧羅莫文 -or=歐迪亞文 -os=奧塞提文 -pa=旁遮普文 -pi=巴利文 -pl=波蘭文 -ps=普什圖文 -pt=葡萄牙文 -qu=蓋楚瓦文 -rm=羅曼斯文 -rn=隆迪文 -ro=羅馬尼亞文 -ru=俄文 -rw=盧安達文 -sa=梵文 -sc=撒丁文 -sd=信德文 -se=北薩米文 -sg=桑戈文 -si=僧伽羅文 -sk=斯洛伐克文 -sl=斯洛維尼亞文 -sm=薩摩亞文 -sn=紹納文 -so=索馬利文 -sq=阿爾巴尼亞文 -sr=塞爾維亞文 -ss=斯瓦特文 -st=塞索托文 -su=巽他文 -sv=瑞典文 -sw=史瓦希里文 -ta=坦米爾文 -te=泰盧固文 -tg=塔吉克文 -th=泰文 -ti=提格利尼亞文 -tk=土庫曼文 -tl=塔加路族文 -tn=塞茲瓦納文 -to=東加文 -tr=土耳其文 -ts=特松加文 -tt=韃靼文 -tw=特威文 -ty=大溪地文 -ug=維吾爾文 -uk=烏克蘭文 -ur=烏都文 -uz=烏茲別克文 -ve=溫達文 -vi=越南文 -vo=沃拉普克文 -wa=瓦隆文 -wo=沃洛夫文 -xh=科薩文 -yi=意第緒文 -yo=約魯巴文 -za=壯文 -zu=祖魯文 - -# key is ISO 639.2 language code -aar=阿法文 -abk=阿布哈西亞文 -ace=亞齊文 -ach=阿僑利文 -ada=阿當莫文 -ady=阿迪各文 -afa=亞非語系 -afh=阿弗里希利文 -afr=南非荷蘭文 -ain=阿伊努文 -aka=阿寒文 -akk=阿卡德文 -alb=阿爾巴尼亞文 -ale=阿留申文 -alg=阿爾岡昆諸語言 -alt=南阿爾泰文 -amh=衣索比亞文 -ang=古英文 -anp=昂加文 -apa=阿帕切諸語言 -arc=阿拉米文 -arg=亞拉岡文 -arm=亞美尼亞文 -arn=馬普切文 -arp=阿拉帕霍文 -art=人工語言 -arw=阿拉瓦克文 -asm=阿薩姆文 -ast=阿斯圖里亞文 -ath=阿薩帕斯坎諸語言 -aus=澳洲諸語言 -ava=阿瓦雷文 -ave=阿未斯塔文 -awa=阿瓦文 -aym=亞摩拉文 -aze=亞塞拜然文 -bad=班達文 -bai=巴米累克諸語言 -bak=巴什喀爾文 -bal=俾路支文 -ban=峇里文 -bas=巴薩文 -bat=波羅的海諸語言 -bej=貝扎文 -bel=白俄羅斯文 -bem=別姆巴文 -ber=柏柏爾文 -bho=博傑普爾文 -bih=比哈爾文 -bik=比科爾文 -bin=比尼文 -bis=比斯拉馬文 -bla=錫克錫卡文 -bnt=班圖諸語言 -bos=波士尼亞文 -bra=布拉杰文 -bre=不列塔尼文 -btk=巴塔克文 -bua=布里阿特文 -bug=布吉斯文 -bul=保加利亞文 -bur=緬甸文 -byn=比林文 -cad=卡多文 -cai=中美印第安諸語言 -car=加勒比文 -cat=嘉泰羅尼亞文 -cau=高加索諸語言 -ceb=宿霧文 -cel=凱爾特諸語言 -cha=查摩洛文 -chb=奇布查文 -che=車臣文 -chg=查加文 -chk=處奇斯文 -chm=馬里文 -chn=契奴克文 -cho=喬克托文 -chp=奇佩瓦揚文 -chr=柴羅基文 -chu=教會斯拉夫文 -chv=楚瓦士文 -chy=沙伊安文 -cop=科普特文 -cor=康瓦耳文 -cpe=歐洲腔調和洋涇濱，源自英文的(其他) -cpf=歐洲腔調和洋涇濱，源自法文的(其他) -cpp=歐洲腔調和洋涇濱，源自葡萄牙文的(其他) -crh=土耳其文（克里米亞半島） -crp=其他克里奧爾混和語系 -csb=卡舒布文 -cus=庫施特諸語言 -dak=達科他文 -dan=丹麥文 -dar=達爾格瓦文 -day=迪雅克文 -del=德拉瓦文 -den=斯拉夫 -dgr=多格里布文 -din=丁卡文 -div=迪維西文 -doi=多格來文 -dra=德拉威諸語言 -dsb=下索布文 -dua=杜亞拉文 -dum=中古荷蘭文 -dut=荷蘭文 -dyu=迪尤拉文 -efi=埃菲克文 -egy=古埃及文 -eka=艾卡朱克文 -elx=埃蘭文 -enm=中古英文 -est=愛沙尼亞文 -ewe=埃維文 -ewo=依汪都文 -fan=芳族文 -fao=法羅文 -fat=芳蒂文 -fij=斐濟文 -fil=菲律賓文 -fin=芬蘭文 -fiu=芬烏諸語言 -fon=豐文 -frm=中古法文 -fro=古法文 -frr=北弗里西亞文 -frs=東弗里西亞文 -fry=西弗里西亞文 -fur=弗留利文 -gaa=加族文 -gay=加約文 -gba=葛巴亞文 -gem=其他日耳曼語系 -geo=喬治亞文 -gez=吉茲文 -gil=吉爾伯特群島文 -gla=蓋爾文 -gle=愛爾蘭文 -glg=加里西亞文 -glv=曼島文 -gmh=中古高地德文 -goh=古高地德文 -gon=岡德文 -gor=科隆達羅文 -got=哥德文 -grb=格列博文 -grc=古希臘文 -gre=中古希臘文 (1453-) -gsw=德文（瑞士） -guj=古吉拉特文 -gwi=圭契文 -hai=海達文 -hau=豪薩文 -haw=夏威夷文 -heb=希伯來文 -her=赫雷羅文 -hil=希利蓋農文 -him=赫馬查利文 -hin=北印度文 -hit=赫梯文 -hmn=孟文 -hrv=克羅埃西亞文 -hsb=上索布文 -hup=胡帕文 -iba=伊班文 -ibo=伊布文 -ice=冰島文 -iii=四川夷文 -ijo=伊喬文 -iku=伊努伊特文 -ile=人工國際文 -ilo=伊洛闊文 -ina=人工國際文 (國際輔助語言協會) -inc=印度諸語言 -ind=印尼文 -ine=印歐諸語言 -inh=印古什文 -ipk=依奴皮維克文 -ira=伊朗諸語言 -iro=易洛魁文 -ita=義大利文 -jbo=邏輯文 -jpr=猶太教-波斯文 -jrb=猶太阿拉伯文 -kaa=卡拉卡爾帕克文 -kab=卡比爾文 -kac=卡琴文 -kal=格陵蘭文 -kam=卡姆巴文 -kan=坎那達文 -kar=克倫文 -kas=喀什米爾文 -kaw=卡威文 -kaz=哈薩克文 -kbd=卡巴爾達文 -kha=卡西文 -khi=科依桑諸語言 -khm=中央柬埔寨文 -kho=和闐文 -kik=基庫猶文 -kin=金揚萬答文 -kir=吉爾吉斯文 -kmb=金邦杜文 -kok=貢根文 -kom=科密文 -kon=剛果文 -kor=韓文 -kos=科斯雷恩文 -kpe=克佩列文 -krc=卡拉柴-包爾卡爾文 -krl=卡累利阿文 -kro=克魯文 -kru=庫魯科文 -kua=關亞馬文 -kum=庫密克文 -kur=庫德文 -kut=庫特奈文 -lad=拉迪諾文 -lah=拉亨達文 -lam=蘭巴文 -lao=寮文 -lav=拉脫維亞文 (列特文) -lez=列茲干文 -lim=利博坎文 -lin=陵加拉文 -lol=芒戈文 -loz=洛齊文 -ltz=盧森堡文 -lua=魯巴魯魯亞文 -lub=盧巴-加丹加文 -lug=干達文 -lui=路易塞諾文 -lun=盧恩達文 -luo=盧奧文 -lus=米佐文 -mac=馬其頓文 -mad=馬都拉文 -mag=馬加伊文 -mah=馬紹爾群島文 -mai=邁蒂利文 -mak=望加錫文 -mal=馬來亞拉姆文 -man=曼丁哥文 -map=南島諸語言 -mar=馬拉地文 -mas=馬賽文 -may=馬來文 -mdf=莫克沙文 -mdr=曼達文 -men=門德文 -mga=中古愛爾蘭文 -mic=米克馬克文 -min=米南卡堡文 -mis=混雜語諸語言 -mkh=孟高棉諸語言 -mlg=馬拉加西文 -mlt=馬爾他文 -mnc=滿族文 -mni=曼尼普爾文 -mno=馬諾博諸語言 -moh=莫霍克文 -mos=莫西文 -mul=多種語言 -mun=蒙達諸語言 -mus=克里克文 -mwl=米蘭德斯文 -mwr=馬瓦里文 -myn=馬雅諸語言 -myv=厄爾茲亞文 -nah=納瓦特文 -nai=北美印第安諸語言 -nap=拿波里文 -nau=諾魯文 -nav=納瓦荷文 -nbl=南恩德比利文 -nde=北恩德比利文 -ndo=恩東加文 -nds=低地德文 -nep=尼泊爾文 -new=尼瓦爾文 -nia=尼亞斯文 -niu=紐埃文 -nno=挪威耐諾斯克文 -nob=博克馬爾文，挪威 -nog=諾蓋文 -non=古諾爾斯文 -nqo=曼德文字 (N’Ko) -nso=北索托文 -nub=努比亞諸語言 -nwc=古尼瓦爾文 -nya=齊切瓦文 -nym=尼揚韋齊文 -nyn=尼揚科萊文 -nyo=尼奧囉文 -nzi=尼茲馬文 -oci=歐西坦文 (前 1500) -oji=奧杰布韋文 -ori=歐利亞文 -orm=奧羅蒙文 -osa=歐塞奇文 -oss=奧塞梯文 -ota=鄂圖曼土耳其文 -oto=奧托米諸語言 -paa=巴布亞諸語言 -pag=潘加辛文 -pal=巴列維文 -pam=潘帕嘉文 -pap=帕皮阿門托文 -pau=帛琉文 -peo=古波斯文 -phi=菲律賓諸語言 -phn=腓尼基文 -pli=帕里文 -pol=波蘭文 -pon=波那貝文 -pra=普拉克里特諸語言 -pro=古普羅旺斯文 -pus=普什圖文 -que=蓋楚瓦文 -raj=拉賈斯坦諸文 -rap=復活島文 -rar=拉羅通加文 -roa=羅曼諸語言 -roh=羅曼什文 -rom=吉普賽文 -rum=羅馬尼亞文 -run=科隆地文 -rup=羅馬尼亞語系 -sad=桑達韋文 -sag=桑戈語 -sah=雅庫特文 -sal=薩利什諸語言 -sam=薩瑪利亞阿拉姆文 -san=梵文字母 -sas=撒撒克文 -sat=桑塔利文 -scn=西西里文 -sco=蘇格蘭文 -sel=塞爾庫普文 -sem=閃語諸語言 -sga=古愛爾蘭文 -sgn=手語 -shn=撣文 -sid=希達摩文 -sin=錫蘭文 -sio=蘇語諸語言 -sit=漢藏語系 -sla=斯拉夫諸語言 -slv=斯洛維尼亞語 -sma=南薩米文 -smi=薩米諸語言 -smj=魯勒薩米文 -smn=伊納里薩米文 -smo=薩摩亞文 -sms=斯科特薩米文 -sna=頌哈文 -snk=索尼基文 -sog=索格底亞納文 -som=索馬利文 -sot=索托文, 南部 -srd=薩丁尼亞文 -srn=蘇拉南東墎文 -srp=塞爾維亞文 -srr=塞雷爾文 -ssa=尼羅撒哈拉諸語言 -ssw=西斯瓦提文 -suk=蘇庫馬文 -sun=巽丹文 -sus=蘇蘇文 -sux=蘇美文 -swa=史瓦西里文 -syc=古敘利亞文 -syr=敘利亞文 -tah=大溪地文 -tai=傣語諸語言 -tam=坦米爾文 -tat=韃靼文 -tel=特拉古文 -tem=提姆文 -ter=泰雷諾文 -tet=泰頓文 -tgl=塔加拉族文 -tig=蒂格雷文 -tir=提格利尼亞文 -tiv=提夫文 -tkl=托克勞文 -tlh=克林貢文 -tli=特林基特文 -tmh=塔馬奇克文 -tog=東加文（尼亞薩） -ton=東加文 (東加群島) -tpi=托比辛文 -tsi=欽西安文 -tsn=塞茲瓦納文 -tso=頌加文 -tuk=土庫曼文 -tum=圖姆布卡文 -tup=圖皮諸語言 -tut=阿爾泰諸語言 (其他) -tvl=吐瓦魯文 -twi=契維文 -tyv=圖瓦文 -udm=烏德穆爾特文 -uga=烏加列文 -uig=維吾爾文 -ukr=烏克蘭文 -umb=姆本杜文 -und=未知語言 -urd=烏都文 -uzb=烏茲別克文 -vai=瓦伊文 -ven=文達文 -vot=沃提克文 -wak=瓦卡什諸語言 -wal=瓦拉莫文 -war=瓦瑞文 -was=瓦紹文 -wel=威爾斯文 -wen=索布諸語言 -wln=華隆文 -wol=沃洛夫文 -xal=卡爾梅克文 -xho=廓薩文 -yao=瑤文 -yap=雅浦文 -yid=意第緒文 -yor=優魯巴文 -ypk=尤皮克諸語言 -zap=薩波特克文 -zbl=布列斯符號 -zen=澤納加文 -zha=壯文 -znd=贊德文 -zul=祖魯文 -zun=祖尼文 -zxx=無語言內容 -zza=扎扎文 - -# script names -# key is ISO 15924 script code - -Armi=皇室亞美尼亞文 -Armn=亞美尼亞文 -Avst=阿維斯陀文 -Bali=峇里文 -Bass=巴薩文 -Blis=布列斯文 -Bopo=注音符號 -Brah=婆羅米文 -Brai=盲人用點字 -Bugi=布吉斯文 -Cakm=查克馬文 -Cans=加拿大原住民通用字符 -Cari=卡里亞文 -Cher=柴羅基文 -Copt=科普特文 -Cyrl=斯拉夫文 -Cyrs=西里爾文（古教會斯拉夫文變體） -Dsrt=德瑟雷特文 -Dupl=杜普洛伊速記 -Egyd=古埃及世俗體 -Egyh=古埃及僧侶體 -Egyp=古埃及象形文字 -Elba=愛爾巴桑文 -Ethi=衣索比亞文 -Geok=喬治亞語系（阿索他路里和努斯克胡里文） -Geor=喬治亞文 -Goth=歌德文 -Gran=格蘭他文字 -Grek=希臘文 -Guru=古魯穆奇文 -Hang=韓文字 -Hani=漢字 -Hano=哈努諾文 -Hans=簡體 -Hant=繁體 -Hebr=希伯來文 -Hmng=楊松錄苗文 -Hrkt=片假名或平假名 -Inds=印度河流域（哈拉帕文） -Kali=克耶李文 -Khar=卡羅須提文 -Knda=坎那達文 -Kore=韓文 -Kpel=克培列文 -Kthi=凱提文 -Lana=藍拿文 -Laoo=寮國文 -Latf=拉丁文（尖角體活字變體） -Latg=拉丁文（蓋爾語變體） -Limb=林佈文 -Lina=線性文字（A） -Linb=線性文字（B） -Lisu=栗僳文 -Loma=洛馬文 -Lyci=呂西亞語 -Lydi=里底亞語 -Mand=曼底安文 -Maya=瑪雅象形文字 -Mend=門德文 -Merc=麥羅埃文（曲線字體） -Mero=麥羅埃文 -Mlym=馬來亞拉姆文 -Moon=蒙氏點字 -Mtei=曼尼普爾文 -Mymr=緬甸文 -Narb=古北阿拉伯文 -Nbat=納巴泰文字 -Nkgb=納西格巴文 -Nkoo=西非書面語言 (N’Ko) -Ogam=歐甘文 -Orkh=鄂爾渾文 -Orya=歐迪亞文 -Osma=歐斯曼亞文 -Palm=帕米瑞拉文字 -Perm=古彼爾姆諸文 -Phli=巴列維文（碑銘體） -Phlp=巴列維文（聖詩體） -Phlv=巴列維文（書體） -Plrd=柏格理拼音符 -Prti=帕提亞文（碑銘體） -Rjng=拉讓文 -Roro=朗格朗格象形文 -Runr=古北歐文字 -Samr=撒馬利亞文 -Sgnw=手語書寫符號 -Shaw=簫柏納字符 -Sinh=錫蘭文 -Sylo=希洛弟納格里文 -Syrc=敍利亞文 -Syre=敘利亞文（福音體文字變體） -Syrj=敘利亞文（西方文字變體） -Syrn=敘利亞文（東方文字變體） -Tagb=南島文 -Tale=傣哪文 -Talu=西雙版納新傣文 -Taml=坦米爾文 -Tavt=傣擔文 -Telu=泰盧固文 -Teng=談格瓦文 -Tfng=提非納文 -Tglg=塔加拉文 -Tibt=西藏文 -Ugar=烏加列文 -Visp=視覺語音文字 -Xsux=蘇米魯亞甲文楔形文字 -Yiii=彞文 -Zinh=繼承文字（Unicode） -Zmth=數學符號 -Zsym=符號 -Zxxx=非書寫語言 -Zyyy=一般文字 - -# country names -# key is ISO 3166 country code - -AD=安道爾 -AE=阿拉伯聯合大公國 -AG=安地卡及巴布達 -AI=安奎拉 -AL=阿爾巴尼亞 -AM=亞美尼亞 -AN=荷屬安替列斯 -AQ=南極洲 -AS=美屬薩摩亞 -AT=奧地利 -AU=澳洲 -AW=荷屬阿魯巴 -AX=奧蘭群島 -AZ=亞塞拜然 -BA=波士尼亞與赫塞哥維納 -BB=巴貝多 -BD=孟加拉 -BE=比利時 -BF=布吉納法索 -BG=保加利亞 -BI=蒲隆地 -BJ=貝南 -BM=百慕達 -BN=汶萊 -BO=玻利維亞 -BS=巴哈馬 -BV=布威島 -BW=波札那 -BY=白俄羅斯 -BZ=貝里斯 -CC=科克斯（基靈）群島 -CD=剛果（金夏沙） -CF=中非共和國 -CG=剛果（布拉薩） -CI=象牙海岸 -CK=庫克群島 -CM=喀麥隆 -CN=中國 -CO=哥倫比亞 -CR=哥斯大黎加 -CS=塞爾維亞及蒙特尼哥羅 -CV=維德角 -CX=聖誕島 -CY=賽普勒斯 -DE=德國 -DJ=吉布地 -DK=丹麥 -DO=多明尼加共和國 -DZ=阿爾及利亞 -EC=厄瓜多 -EE=愛沙尼亞 -ER=厄利垂亞 -ET=衣索比亞 -FI=芬蘭 -FJ=斐濟 -FK=福克蘭群島 -FM=密克羅尼西亞 -FO=法羅群島 -FR=法國 -GA=加彭 -GB=英國 -GD=格瑞那達 -GE=喬治亞 -GF=法屬圭亞那 -GH=迦納 -GI=直布羅陀 -GL=格陵蘭 -GM=甘比亞 -GN=幾內亞 -GP=瓜地洛普 -GQ=赤道幾內亞 -GR=希臘 -GS=南喬治亞與南三明治群島 -GT=瓜地馬拉 -GU=關島 -GW=幾內亞比索 -GY=蓋亞那 -HK=中國香港特別行政區 -HM=赫德島及麥唐納群島 -HN=宏都拉斯 -HR=克羅埃西亞 -ID=印尼 -IE=愛爾蘭 -IO=英屬印度洋領地 -IS=冰島 -IT=義大利 -JM=牙買加 -JO=約旦 -KE=肯亞 -KG=吉爾吉斯 -KI=吉里巴斯 -KM=葛摩 -KN=聖克里斯多福及尼維斯 -KP=北韓 -KR=南韓 -KY=開曼群島 -KZ=哈薩克 -LA=寮國 -LC=聖露西亞 -LI=列支敦斯登 -LK=斯里蘭卡 -LR=賴比瑞亞 -LS=賴索托 -LU=盧森堡 -LV=拉脫維亞 -LY=利比亞 -MC=摩納哥 -MD=摩爾多瓦 -ME=蒙特內哥羅 -MG=馬達加斯加 -MH=馬紹爾群島 -MK=北馬其頓 -ML=馬利 -MM=緬甸 -MO=中國澳門特別行政區 -MP=北馬利安納群島 -MQ=馬丁尼克 -MR=茅利塔尼亞 -MS=蒙哲臘 -MT=馬爾他 -MU=模里西斯 -MV=馬爾地夫 -MW=馬拉威 -MY=馬來西亞 -MZ=莫三比克 -NA=納米比亞 -NC=新喀里多尼亞 -NE=尼日 -NF=諾福克島 -NG=奈及利亞 -NL=荷蘭 -NP=尼泊爾 -NR=諾魯 -NU=紐埃島 -NZ=紐西蘭 -PA=巴拿馬 -PE=秘魯 -PF=法屬玻里尼西亞 -PG=巴布亞紐幾內亞 -PH=菲律賓 -PL=波蘭 -PM=聖皮埃與密克隆群島 -PN=皮特肯群島 -PS=巴勒斯坦自治區 -PW=帛琉 -QA=卡達 -RE=留尼旺 -RO=羅馬尼亞 -RS=塞爾維亞 -RU=俄羅斯 -RW=盧安達 -SA=沙烏地阿拉伯 -SB=索羅門群島 -SC=塞席爾 -SD=蘇丹 -SH=聖赫勒拿島 -SI=斯洛維尼亞 -SJ=挪威屬斯瓦巴及尖棉 -SL=獅子山 -SM=聖馬利諾 -SN=塞內加爾 -SO=索馬利亞 -SR=蘇利南 -ST=聖多美普林西比 -SV=薩爾瓦多 -SY=敘利亞 -SZ=史瓦帝尼 -TC=土克斯及開科斯群島 -TD=查德 -TF=法屬南部屬地 -TH=泰國 -TJ=塔吉克 -TK=托克勞群島 -TL=東帝汶 -TM=土庫曼 -TN=突尼西亞 -TO=東加 -TT=千里達及托巴哥 -TV=吐瓦魯 -TW=台灣 -TZ=坦尚尼亞 -UA=烏克蘭 -UG=烏干達 -UM=美國本土外小島嶼 -US=美國 -UY=烏拉圭 -UZ=烏茲別克 -VA=梵蒂岡 -VC=聖文森及格瑞那丁 -VE=委內瑞拉 -VG=英屬維京群島 -VI=美屬維京群島 -VU=萬那杜 -WF=瓦利斯群島和富圖那群島 -WS=薩摩亞 -YE=葉門 -YT=馬約特島 -ZM=尚比亞 -ZW=辛巴威 - -# territory names -# key is UN M.49 country and area code - -013=中美 -014=東非 -018=非洲南部 -021=北美 -029=加勒比海 -030=東亞 -034=南亞 -035=東南亞 -039=南歐 -053=澳洲與紐西蘭 -054=美拉尼西亞 -057=密克羅尼西亞群島 -061=玻里尼西亞 -142=亞洲 -143=中亞 -145=西亞 -150=歐洲 -151=東歐 -154=北歐 -155=西歐 diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames.java similarity index 64% rename from src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames.java index 306582406bb..5f4b01f9dd7 100644 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 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,22 +25,15 @@ package sun.util.resources.ext; -import java.util.Locale; -import java.util.ResourceBundle; -import sun.util.locale.provider.LocaleProviderAdapter; -import sun.util.locale.provider.ResourceBundleBasedAdapter; -import sun.util.resources.OpenListResourceBundle; - -public final class LocaleNames_zh_HK extends OpenListResourceBundle { - - // reparent to zh_TW for traditional Chinese names - public LocaleNames_zh_HK() { - ResourceBundle bundle = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getLocaleNames(Locale.TAIWAN); - setParent(bundle); - } +import sun.util.resources.TimeZoneNamesBundle; +public final class TimeZoneNames extends TimeZoneNamesBundle { + /** + * Exists to keep sun.util.resources.ext package alive + * with IncludeLocales jlink plugin + */ @Override protected Object[][] getContents() { - return new Object[][] {}; + return new Object[][]{}; } } diff --git a/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java b/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java index 2ed2851a521..96041fea03f 100644 --- a/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java +++ b/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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 @@ -31,7 +31,6 @@ /** * Service Provider for loading locale data resource bundles in jdk.localedata - * except for JavaTimeSupplementary resource bundles. */ public class LocaleDataProvider extends LocaleData.CommonResourceBundleProvider { @Override diff --git a/src/jdk.localedata/share/classes/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java b/src/jdk.localedata/share/classes/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java new file mode 100644 index 00000000000..aa2cf33b2d7 --- /dev/null +++ b/src/jdk.localedata/share/classes/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2005, 2024, 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. + */ + +/* + * This class contains a map which records the locale list string for + * each resource in sun.util.resources & sun.text.resources. + * It is used to avoid loading non-existent localized resources so that + * jar files won't be opened unnecessarily to look up them. + */ +package sun.util.resources.provider; + +import java.util.HashMap; +import java.util.Map; +import sun.util.locale.provider.LocaleDataMetaInfo; +import static sun.util.locale.provider.LocaleProviderAdapter.Type; + +public class NonBaseLocaleDataMetaInfo implements LocaleDataMetaInfo { + + private static final Map resourceNameToLocales = HashMap.newHashMap(5); + + static { + resourceNameToLocales.put("FormatData", + " ja "); + + resourceNameToLocales.put("CollationData", + " ar be bg ca cs da el es et fi fr he hi hr hu is ja ko lt lv mk nb nb-NO nn-NO no pl ro ru sk sl sq sr sr-Latn sv th tr uk vi zh zh-HK zh-Hant-HK zh-Hant-TW zh-TW "); + + resourceNameToLocales.put("BreakIteratorInfo", + " nb nb-NO nn-NO th "); + + resourceNameToLocales.put("BreakIteratorRules", + " nb nb-NO nn-NO th "); + + resourceNameToLocales.put("AvailableLocales", + " ar ar-AE ar-BH ar-DZ ar-EG ar-IQ ar-JO ar-KW ar-LB ar-LY ar-MA ar-OM ar-QA ar-SA ar-SD ar-SY ar-TN ar-YE be be-BY bg bg-BG ca ca-ES cs cs-CZ da da-DK de de-AT de-CH de-DE de-LU el el-CY el-GR en-AU en-CA en-GB en-IE en-IN en-MT en-NZ en-PH en-SG en-ZA es es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-ES es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE et et-EE fi fi-FI fr fr-BE fr-CA fr-CH fr-FR fr-LU ga ga-IE he he-IL hi hi-IN hr hr-HR hu hu-HU id id-ID is is-IS it it-CH it-IT ja ja-JP ja-JP-JP ko ko-KR lt lt-LT lv lv-LV mk mk-MK ms ms-MY mt mt-MT nb nb-NO nl nl-BE nl-NL nn-NO no no-NO no-NO-NY pl pl-PL pt pt-BR pt-PT ro ro-RO ru ru-RU sk sk-SK sl sl-SI sq sq-AL sr sr-BA sr-CS sr-Latn sr-Latn-BA sr-Latn-ME sr-Latn-RS sr-ME sr-RS sv sv-SE th th-TH th-TH-TH tr tr-TR uk uk-UA vi vi-VN zh zh-CN zh-HK zh-Hans-CN zh-Hans-SG zh-Hant-HK zh-Hant-TW zh-SG zh-TW "); + } + + /* + * Gets the supported locales string based on the availability of + * locale data resource bundles for each resource name. + * + * @param resourceName the resource name + * @return the supported locale string for the passed in resource. + */ + public static String getSupportedLocaleString(String resourceName) { + return resourceNameToLocales.getOrDefault(resourceName, ""); + } + + @Override + public Type getType() { + return Type.JRE; + } + + @Override + public String availableLanguageTags(String category) { + return getSupportedLocaleString(category); + } +} diff --git a/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java b/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java deleted file mode 100644 index c214dedba20..00000000000 --- a/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2015, 2021, 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.util.resources.provider; - -import java.util.Locale; -import java.util.ResourceBundle; -import sun.util.resources.LocaleData; - -/** - * Service Provider for loading JavaTimeSupplementary resource bundles in jdk.localedata. - */ -public class SupplementaryLocaleDataProvider extends LocaleData.SupplementaryResourceBundleProvider { - @Override - public ResourceBundle getBundle(String baseName, Locale locale) { - var bundleName = toBundleName(baseName, locale); - var rb = LocaleDataProvider.loadResourceBundle(bundleName); - if (rb == null) { - var otherBundleName = toOtherBundleName(baseName, bundleName, locale); - if (!bundleName.equals(otherBundleName)) { - rb = LocaleDataProvider.loadResourceBundle(otherBundleName); - } - } - return rb; - } -} diff --git a/test/jdk/java/text/Format/CompactNumberFormat/TestWithCompatProvider.java b/test/jdk/java/text/Format/CompactNumberFormat/TestWithCompatProvider.java deleted file mode 100644 index 510d3d9062f..00000000000 --- a/test/jdk/java/text/Format/CompactNumberFormat/TestWithCompatProvider.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2018, 2022, 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. - * - * 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. - */ -/* - * @test - * @bug 8177552 - * @summary Checks the compact number format with COMPAT provider. Since the - * compact number resources are only provided by CLDR, using COMPAT - * as a provider should always use the default patterns added in the - * FormatData.java resource bundle - * @modules jdk.localedata - * @run testng/othervm -Djava.locale.providers=COMPAT TestWithCompatProvider - */ -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.Locale; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -public class TestWithCompatProvider { - - private static final NumberFormat FORMAT_DZ_SHORT = NumberFormat - .getCompactNumberInstance(Locale.of("dz"), NumberFormat.Style.SHORT); - - private static final NumberFormat FORMAT_EN_US_SHORT = NumberFormat - .getCompactNumberInstance(Locale.US, NumberFormat.Style.SHORT); - - @DataProvider(name = "format") - Object[][] compactFormatData() { - return new Object[][]{ - {FORMAT_DZ_SHORT, 1000.09, "1K"}, - {FORMAT_DZ_SHORT, -999.99, "-1K"}, - {FORMAT_DZ_SHORT, -0.0, "-0"}, - {FORMAT_DZ_SHORT, new BigInteger("12345678901234567890"), "12345679T"}, - {FORMAT_DZ_SHORT, new BigDecimal("12345678901234567890.89"), "12345679T"}, - {FORMAT_EN_US_SHORT, -999.99, "-1K"}, - {FORMAT_EN_US_SHORT, 9999, "10K"}, - {FORMAT_EN_US_SHORT, 3000.90, "3K"}, - {FORMAT_EN_US_SHORT, new BigInteger("12345678901234567890"), "12345679T"}, - {FORMAT_EN_US_SHORT, new BigDecimal("12345678901234567890.89"), "12345679T"},}; - } - - @DataProvider(name = "parse") - Object[][] compactParseData() { - return new Object[][]{ - {FORMAT_DZ_SHORT, "1K", 1000L}, - {FORMAT_DZ_SHORT, "-3K", -3000L}, - {FORMAT_DZ_SHORT, "12345700T", 1.23457E19}, - {FORMAT_EN_US_SHORT, "-99", -99L}, - {FORMAT_EN_US_SHORT, "10K", 10000L}, - {FORMAT_EN_US_SHORT, "12345679T", 1.2345679E19},}; - } - - @Test(dataProvider = "format") - public void testFormat(NumberFormat cnf, Object number, - String expected) { - CompactFormatAndParseHelper.testFormat(cnf, number, expected); - } - - @Test(dataProvider = "parse") - public void testParse(NumberFormat cnf, String parseString, - Number expected) throws ParseException { - CompactFormatAndParseHelper.testParse(cnf, parseString, expected, null, null); - } - -} diff --git a/test/jdk/java/text/Format/DateFormat/Bug4823811.java b/test/jdk/java/text/Format/DateFormat/Bug4823811.java deleted file mode 100644 index e7acc91cdcc..00000000000 --- a/test/jdk/java/text/Format/DateFormat/Bug4823811.java +++ /dev/null @@ -1,791 +0,0 @@ -/* - * Copyright (c) 2008, 2022, 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. - * - * 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. - */ - -/** - * @test - * @bug 4823811 8008577 - * @summary Confirm that text which includes numbers with a trailing minus sign is parsed correctly. - * @modules jdk.localedata - * @run main/othervm -Duser.timezone=GMT+09:00 -Djava.locale.providers=JRE,SPI Bug4823811 - */ - -import java.text.*; -import java.util.*; - -public class Bug4823811 { - - private static Locale localeEG = Locale.of("ar", "EG"); - private static Locale localeUS = Locale.US; - - private static String JuneInArabic = "\u064a\u0648\u0646\u064a\u0648"; - private static String JulyInArabic = "\u064a\u0648\u0644\u064a\u0648"; - private static String JuneInEnglish = "June"; - private static String JulyInEnglish = "July"; - - private static String BORDER = - "============================================================"; - - /* - * I don't use static import here intentionally so that this test program - * can be run on JDK 1.4.2. - */ - private static int ERA = Calendar.ERA; - private static int BC = GregorianCalendar.BC; -// private static int JAN = Calendar.JANUARY; -// private static int FEB = Calendar.FEBRUARY; -// private static int MAR = Calendar.MARCH; - private static int APR = Calendar.APRIL; - private static int MAY = Calendar.MAY; - private static int JUN = Calendar.JUNE; - private static int JUL = Calendar.JULY; -// private static int AUG = Calendar.AUGUST; -// private static int SEP = Calendar.SEPTEMBER; -// private static int OCT = Calendar.OCTOBER; -// private static int NOV = Calendar.NOVEMBER; -// private static int DEC = Calendar.DECEMBER; - - private static String[] patterns = { - "yyyy MMMM d H m s", - "yyyy MM dd hh mm ss", - - /* - * Because 1-based HOUR_OF_DAY, 1-based HOUR, MONTH, and YEAR fields - * are parsed using different code from the code for other numeric - * fields, I prepared YEAR-preceding patterns and SECOND-preceding - * patterns. - */ - "yyyy M d h m s", - " yyyy M d h m s", - "yyyy M d h m s ", - - "s m h d M yyyy", - " s m h d M yyyy", - "s m h d M yyyy ", - }; - - private static char originalMinusSign1 = ':'; - private static char originalMinusSign2 = '\uff0d'; // fullwidth minus - private static String[] delimiters = {"-", "/", ":", "/", "\uff0d", "/"}; - private static String[][] specialDelimiters = { - // for Arabic formatter and modified English formatter - {"--", "-/", "::", ":/", "\uff0d\uff0d", "\uff0d/"}, - - // for English formatter and modified Arabic formatter - {"--", "/-", "::", "/:", "\uff0d\uff0d", "/\uff0d"}, - }; - - /* - * Format: - * +-------------------------------------------------------------------+ - * | Input | Output | - * +---------------------+---------------------------------------------| - * | datesEG & datesUS | formattedDatesEG & formattedDatesUS | - * +-------------------------------------------------------------------+ - * - * Parse: - * +-------------------------------------------------------------------+ - * | Input | Output | - * |---------------------+---------------------------------------------| - * | datesToParse | datesEG & datesUS | - * +-------------------------------------------------------------------+ - */ - private static String[][] datesToParse = { - // "JUNE" and "JULY" are replaced with a localized month name later. - {"2008 JULY 20 3 12 83", - "2008 JULY 20 3 12 83", - "2008 JULY 20 3 12 83"}, - - {"2008 07 20 03 12 83", - "2008 07 20 03 12 83", - "2008 07 20 03 12 83"}, - - {"2008 7 20 3 12 83", - "2008 7 20 3 12 83", - "2008 7 20 3 12 83"}, - - {" 2008 7 20 3 12 83", - " 2008 7 20 3 12 83", - " 2008 7 20 3 12 83", - "2008 7 20 3 12 83"}, - - {"2008 7 20 3 12 83 ", - "2008 7 20 3 12 83 ", - "2008 7 20 3 12 83"}, - - {"83 12 3 20 7 2008", - "83 12 3 20 7 2008", - "83 12 3 20 7 2008"}, - - {" 83 12 3 20 7 2008", - " 83 12 3 20 7 2008", - " 83 12 3 20 7 2008", - "83 12 3 20 7 2008"}, - - {"83 12 3 20 7 2008 ", - "83 12 3 20 7 2008 ", - "83 12 3 20 7 2008"}, - }; - - // For formatting - private static String[][] formattedDatesEG = { - {"2008 JULY 20 3 13 23", - "2009 JULY 20 3 13 23", - null}, - - {"2008 07 20 03 13 23", - "2009 07 20 03 13 23", - "2007 05 20 03 13 23"}, - - {"2008 7 20 3 13 23", - "2009 6 10 3 13 23", - "2007 4 10 3 13 23"}, - - {" 2008 7 20 3 13 23", - null, - " 2009 7 20 3 13 23", - null}, - - {"2008 7 20 3 13 23 ", - "2008 7 20 3 10 37 ", - null}, - - {"23 13 3 20 7 2008", - "37 10 9 19 7 2008", - "23 49 8 19 7 2008"}, - - {" 23 13 3 20 7 2008", - null, - " 37 10 3 20 7 2008", - null}, - - {"23 13 3 20 7 2008 ", - "23 13 3 20 7 2009 ", - null}, - }; - - private static String[][] formattedDatesUS = { - {"2008 JULY 20 3 13 23", - null, - "2008 JUNE 10 3 13 23"}, - - {"2008 07 20 03 13 23", - "2007 05 20 03 13 23", - "2008 06 10 03 13 23"}, - - {"2008 7 20 3 13 23", - "2007 5 19 9 13 23", - "2008 6 9 9 13 23"}, - - {" 2008 7 20 3 13 23", - " 2009 7 20 3 13 23", - " 2007 5 20 3 13 23", - null}, - - {"2008 7 20 3 13 23 ", - "2008 7 20 3 13 23 ", - null}, - - {"23 13 3 20 7 2008", - "23 49 2 10 6 2008", - "23 13 9 9 6 2008"}, - - {" 23 13 3 20 7 2008", - " 37 10 3 20 7 2008", - " 23 49 2 20 7 2008", - null}, - - {"23 13 3 20 7 2008 ", - "23 13 3 20 7 2008 ", - null}, - }; - - private static GregorianCalendar[][] datesEG = { - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar(-2008, JUL, 20, 3, 12, 83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar(-2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2007, MAY, 20, 3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar(-2008, JUL, -20, 3, 12, 83), - new GregorianCalendar( 2007, APR, 10, 3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - null, - new GregorianCalendar(-2008, JUL, 20, 3, 12, 83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, 20, 3, 12, -83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, 20, -3, 12, -83), - new GregorianCalendar( 2008, JUL, 20, -3, -12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - null, - new GregorianCalendar( 2008, JUL, 20, 3, 12, -83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar(-2008, JUL, 20, 3, 12, 83), - null}, - }; - - private static GregorianCalendar[][] datesUS = { - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - null, - new GregorianCalendar( 2008, JUN, 10, 3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2007, MAY, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUN, 10, 3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2007, MAY, 20, -3, 12, 83), - new GregorianCalendar( 2008, JUL, -20, -3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar(-2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2007, MAY, 20, 3, 12, 83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, -20, 3, -12, 83), - new GregorianCalendar( 2008, JUL, -20, -3, 12, 83)}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, 20, 3, 12, -83), - new GregorianCalendar( 2008, JUL, 20, 3, -12, 83), - null}, - - {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - new GregorianCalendar( 2008, JUL, 20, 3, 12, 83), - null}, - }; - - /* flags */ - private static boolean err = false; - private static boolean verbose = false; - - - public static void main(String[] args) { - if (args.length == 1 && args[0].equals("-v")) { - verbose = true; - } - - Locale defaultLocale = Locale.getDefault(); - TimeZone defaultTimeZone = TimeZone.getDefault(); - - TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo")); - - try { - /* - * Test SimpleDateFormat.parse() and format() for original - * SimpleDateFormat instances - */ - testDateFormat1(); - - /* - * Test SimpleDateFormat.parse() and format() for modified - * SimpleDateFormat instances using an original minus sign, - * pattern, and diffenrent month names in DecimalFormat - */ - testDateFormat2(); - - /* - * Test SimpleDateFormat.parse() and format() for modified - * SimpleDateFormat instances using a fullwidth minus sign - */ - testDateFormat3(); - - /* - * Just to confirm that regressions aren't introduced in - * DecimalFormat. This cannot happen, though. Because I didn't - * change DecimalFormat at all. - */ - testNumberFormat(); - } - catch (Exception e) { - err = true; - System.err.println("Unexpected exception: " + e); - } - finally { - Locale.setDefault(defaultLocale); - TimeZone.setDefault(defaultTimeZone); - - if (err) { - System.err.println(BORDER + " Test failed."); - throw new RuntimeException("Date/Number formatting/parsing error."); - } else { - System.out.println(BORDER + " Test passed."); - } - } - } - - - // - // DateFormat test - // - private static void testDateFormat1() { - for (int i = 0; i < patterns.length; i++) { - System.out.println(BORDER); - for (int j = 0; j <= 1; j++) { - // Generate a pattern - String pattern = patterns[i].replaceAll(" ", delimiters[j]); - System.out.println("Pattern=\"" + pattern + "\""); - - System.out.println("*** DateFormat.format test in ar_EG"); - testDateFormatFormattingInRTL(pattern, i, j, null, localeEG, false); - - System.out.println("*** DateFormat.parse test in ar_EG"); - testDateFormatParsingInRTL(pattern, i, j, null, localeEG, false); - - System.out.println("*** DateFormat.format test in en_US"); - testDateFormatFormattingInLTR(pattern, i, j, null, localeUS, true); - - System.out.println("*** DateFormat.parse test in en_US"); - testDateFormatParsingInLTR(pattern, i, j, null, localeUS, true); - } - } - } - - private static void testDateFormat2() { - /* - * modified ar_EG Date&Time formatter : - * minus sign: ':' - * pattern: "#,##0.###" - * month names: In Arabic - * - * modified en_US Date&Time formatter : - * minus sign: ':' - * pattern: "#,##0.###;#,##0.###-" - * month names: In English - */ - DecimalFormat dfEG = (DecimalFormat)NumberFormat.getInstance(localeEG); - DecimalFormat dfUS = (DecimalFormat)NumberFormat.getInstance(localeUS); - - DecimalFormatSymbols dfsEG = dfEG.getDecimalFormatSymbols(); - DecimalFormatSymbols dfsUS = dfUS.getDecimalFormatSymbols(); - dfsEG.setMinusSign(originalMinusSign1); - dfsUS.setMinusSign(originalMinusSign1); - dfEG.setDecimalFormatSymbols(dfsUS); - dfUS.setDecimalFormatSymbols(dfsEG); - - String patternEG = dfEG.toPattern(); - String patternUS = dfUS.toPattern(); - - dfEG.applyPattern(patternUS); - dfUS.applyPattern(patternEG); - - for (int i = 0; i < patterns.length; i++) { - System.out.println(BORDER); - for (int j = 2; j <= 3; j++) { - // Generate a pattern - String pattern = patterns[i].replaceAll(" ", delimiters[j]); - System.out.println("Pattern=\"" + pattern + "\""); - - System.out.println("*** DateFormat.format test in modified en_US"); - testDateFormatFormattingInRTL(pattern, i, j, dfUS, localeUS, true); - - System.out.println("*** DateFormat.parse test in modified en_US"); - testDateFormatParsingInRTL(pattern, i, j, dfUS, localeUS, true); - - System.out.println("*** DateFormat.format test in modified ar_EG"); - testDateFormatFormattingInLTR(pattern, i, j, dfEG, localeEG, false); - - System.out.println("*** DateFormat.parse test in modified ar_EG"); - testDateFormatParsingInLTR(pattern, i, j, dfEG, localeEG, false); - } - } - } - - private static void testDateFormat3() { - /* - * modified ar_EG Date&Time formatter : - * minus sign: '\uff0d' // fullwidth minus - * pattern: "#,##0.###;#,##0.###-" - * month names: In Arabic - * - * modified en_US Date&Time formatter : - * minus sign: '\uff0d' // fullwidth minus - * pattern: "#,##0.###" - * month names: In English - */ - DecimalFormat dfEG = (DecimalFormat)NumberFormat.getInstance(localeEG); - DecimalFormat dfUS = (DecimalFormat)NumberFormat.getInstance(localeUS); - - DecimalFormatSymbols dfsEG = dfEG.getDecimalFormatSymbols(); - DecimalFormatSymbols dfsUS = dfUS.getDecimalFormatSymbols(); - dfsEG.setMinusSign(originalMinusSign2); - dfsUS.setMinusSign(originalMinusSign2); - dfEG.setDecimalFormatSymbols(dfsEG); - dfUS.setDecimalFormatSymbols(dfsUS); - - for (int i = 0; i < patterns.length; i++) { - System.out.println(BORDER); - for (int j = 4; j <= 5; j++) { - // Generate a pattern - String pattern = patterns[i].replaceAll(" ", delimiters[j]); - System.out.println("Pattern=\"" + pattern + "\""); - - System.out.println("*** DateFormat.format test in modified ar_EG"); - testDateFormatFormattingInRTL(pattern, i, j, dfEG, localeEG, false); - - System.out.println("*** DateFormat.parse test in modified ar_EG"); - testDateFormatParsingInRTL(pattern, i, j, dfEG, localeEG, false); - - System.out.println("*** DateFormat.format test in modified en_US"); - testDateFormatFormattingInLTR(pattern, i, j, dfUS, localeUS, true); - - System.out.println("*** DateFormat.parse test in modified en_US"); - testDateFormatParsingInLTR(pattern, i, j, dfUS, localeUS, true); - } - } - } - - private static void testDateFormatFormattingInRTL(String pattern, - int basePattern, - int delimiter, - NumberFormat nf, - Locale locale, - boolean useEnglishMonthName) { - Locale.setDefault(locale); - - SimpleDateFormat sdf = new SimpleDateFormat(pattern); - if (nf != null) { - sdf.setNumberFormat(nf); - } - for (int i = 0; i < datesToParse[basePattern].length; i++) { - if (datesEG[basePattern][i] == null) { - continue; - } - - String expected = formattedDatesEG[basePattern][i] - .replaceAll("JUNE", (useEnglishMonthName ? - JuneInEnglish : JuneInArabic)) - .replaceAll("JULY", (useEnglishMonthName ? - JulyInEnglish : JulyInArabic)) - .replaceAll(" ", delimiters[delimiter]); - testDateFormatFormatting(sdf, pattern, datesEG[basePattern][i], - expected, locale.toString()); - } - } - - private static void testDateFormatFormattingInLTR(String pattern, - int basePattern, - int delimiter, - NumberFormat nf, - Locale locale, - boolean useEnglishMonthName) { - Locale.setDefault(locale); - - SimpleDateFormat sdf = new SimpleDateFormat(pattern); - if (nf != null) { - sdf.setNumberFormat(nf); - } - for (int i = 0; i < datesToParse[basePattern].length; i++) { - if (datesUS[basePattern][i] == null) { - continue; - } - - String expected = formattedDatesUS[basePattern][i] - .replaceAll("JUNE", (useEnglishMonthName ? - JuneInEnglish : JuneInArabic)) - .replaceAll("JULY", (useEnglishMonthName ? - JulyInEnglish : JulyInArabic)) - .replaceAll(" ", delimiters[delimiter]); - testDateFormatFormatting(sdf, pattern, datesUS[basePattern][i], - expected, locale.toString()); - } - } - - private static void testDateFormatFormatting(SimpleDateFormat sdf, - String pattern, - GregorianCalendar givenGC, - String expected, - String locale) { - Date given = givenGC.getTime(); - String str = sdf.format(given); - if (expected.equals(str)) { - if (verbose) { - System.out.print(" Passed: SimpleDateFormat("); - System.out.print(locale + ", \"" + pattern + "\").format("); - System.out.println(given + ")"); - - System.out.print(" ---> \"" + str + "\" "); - System.out.println((givenGC.get(ERA) == BC) ? "(BC)" : "(AD)"); - } - } else { - err = true; - - System.err.print(" Failed: Unexpected SimpleDateFormat("); - System.out.print(locale + ", \"" + pattern + "\").format("); - System.out.println(given + ") result."); - - System.out.println(" Expected: \"" + expected + "\""); - - System.out.print(" Got: \"" + str + "\" "); - System.out.println((givenGC.get(ERA) == BC) ? "(BC)" : "(AD)"); - } - } - - private static void testDateFormatParsingInRTL(String pattern, - int basePattern, - int delimiter, - NumberFormat nf, - Locale locale, - boolean useEnglishMonthName) { - Locale.setDefault(locale); - - SimpleDateFormat sdf = new SimpleDateFormat(pattern); - if (nf != null) { - sdf.setNumberFormat(nf); - } - for (int i = 0; i < datesToParse[basePattern].length; i++) { - String given = datesToParse[basePattern][i] - .replaceAll(" ", specialDelimiters[0][delimiter]) - .replaceAll(" ", delimiters[delimiter]); - - testDateFormatParsing(sdf, pattern, - given.replaceAll("JULY", (useEnglishMonthName ? - JulyInEnglish : JulyInArabic)), - datesEG[basePattern][i], locale.toString()); - } - } - - private static void testDateFormatParsingInLTR(String pattern, - int basePattern, - int delimiter, - NumberFormat nf, - Locale locale, - boolean useEnglishMonthName) { - Locale.setDefault(locale); - - SimpleDateFormat sdf = new SimpleDateFormat(pattern); - if (nf != null) { - sdf.setNumberFormat(nf); - } - for (int i = 0; i < datesToParse[basePattern].length; i++) { - String given = datesToParse[basePattern][i] - .replaceAll(" ", specialDelimiters[1][delimiter]) - .replaceAll(" ", delimiters[delimiter]); - - testDateFormatParsing(sdf, pattern, - given.replaceAll("JULY", (useEnglishMonthName ? - JulyInEnglish : JulyInArabic)), - datesUS[basePattern][i], locale.toString()); - } - } - - private static void testDateFormatParsing(SimpleDateFormat sdf, - String pattern, - String given, - GregorianCalendar expectedGC, - String locale) { - try { - Date d = sdf.parse(given); - if (expectedGC == null) { - err = true; - System.err.print(" Failed: SimpleDateFormat(" + locale); - System.err.print(", \"" + pattern + "\").parse(\"" + given); - System.err.println("\") should have thrown ParseException"); - } else if (expectedGC.getTime().equals(d)) { - if (verbose) { - System.out.print(" Passed: SimpleDateFormat(" + locale); - System.out.print(", \"" + pattern + "\").parse(\"" + given); - System.out.println("\")"); - - System.out.print(" ---> " + d + " (" + d.getTime()); - System.out.println(")"); - } - } else { - err = true; - System.err.print(" Failed: SimpleDateFormat(" + locale); - System.err.print(", \"" + pattern + "\").parse(\"" + given); - System.err.println("\")"); - - System.err.print(" Expected: " + expectedGC.getTime()); - System.err.println(" (" + d.getTime() + ")"); - - System.err.print(" Got: " + d + " (" + d.getTime()); - System.err.println(")"); - - System.err.print(" Pattern: \""); - System.err.print(((DecimalFormat)sdf.getNumberFormat()).toPattern()); - System.err.println("\""); - } - } - catch (ParseException pe) { - if (expectedGC == null) { - if (verbose) { - System.out.print(" Passed: SimpleDateFormat(" + locale); - System.out.print(", \"" + pattern + "\").parse(\"" + given); - System.out.println("\")"); - - System.out.println(" threw ParseException as expected"); - } - } else { - err = true; - System.err.println(" Failed: Unexpected exception with"); - - System.err.print(" SimpleDateFormat(" + locale); - System.err.print(", \"" + pattern + "\").parse(\""); - System.err.println(given + "\"):"); - - System.err.println(" " + pe); - - System.err.print(" Pattern: \""); - System.err.print(((DecimalFormat)sdf.getNumberFormat()).toPattern()); - System.err.println("\""); - - System.err.print(" Month 0: "); - System.err.println(sdf.getDateFormatSymbols().getMonths()[0]); - } - } - } - - - // - // NumberFormat test - // - private static void testNumberFormat() { - NumberFormat nfEG = NumberFormat.getInstance(localeEG); - NumberFormat nfUS = NumberFormat.getInstance(localeUS); - - System.out.println("*** DecimalFormat.format test in ar_EG"); - testNumberFormatFormatting(nfEG, -123456789, "123,456,789-", "ar_EG"); - testNumberFormatFormatting(nfEG, -456, "456-", "ar_EG"); - - System.out.println("*** DecimalFormat.parse test in ar_EG"); - testNumberFormatParsing(nfEG, "123-", -123L, "ar_EG"); - testNumberFormatParsing(nfEG, "123--",-123L, "ar_EG"); - testNumberFormatParsingCheckException(nfEG, "-123", 0, "ar_EG"); - - System.out.println("*** DecimalFormat.format test in en_US"); - testNumberFormatFormatting(nfUS, -123456789, "-123,456,789", "en_US"); - testNumberFormatFormatting(nfUS, -456, "-456", "en_US"); - - System.out.println("*** DecimalFormat.parse test in en_US"); - testNumberFormatParsing(nfUS, "123-", 123L, "en_US"); - testNumberFormatParsing(nfUS, "-123",-123L, "en_US"); - testNumberFormatParsingCheckException(nfUS, "--123", 0, "en_US"); - } - - private static void testNumberFormatFormatting(NumberFormat nf, - int given, - String expected, - String locale) { - String str = nf.format(given); - if (expected.equals(str)) { - if (verbose) { - System.out.print(" Passed: NumberFormat(" + locale); - System.out.println(").format(" + given + ")"); - - System.out.println(" ---> \"" + str + "\""); - } - } else { - err = true; - System.err.print(" Failed: Unexpected NumberFormat(" + locale); - System.err.println(").format(" + given + ") result."); - - System.err.println(" Expected: \"" + expected + "\""); - - System.err.println(" Got: \"" + str + "\""); - } - } - - private static void testNumberFormatParsing(NumberFormat nf, - String given, - Number expected, - String locale) { - try { - Number n = nf.parse(given); - if (n.equals(expected)) { - if (verbose) { - System.out.print(" Passed: NumberFormat(" + locale); - System.out.println(").parse(\"" + given + "\")"); - - System.out.println(" ---> " + n); - } - } else { - err = true; - System.err.print(" Failed: Unexpected NumberFormat(" + locale); - System.err.println(").parse(\"" + given + "\") result."); - - System.err.println(" Expected: " + expected); - - System.err.println(" Got: " + n); - } - } - catch (ParseException pe) { - err = true; - System.err.print(" Failed: Unexpected exception with NumberFormat("); - System.err.println(locale + ").parse(\"" + given + "\") :"); - - System.err.println(" " + pe); - } - } - - private static void testNumberFormatParsingCheckException(NumberFormat nf, - String given, - int expected, - String locale) { - try { - Number n = nf.parse(given); - err = true; - - System.err.print(" Failed: NumberFormat(" + locale); - System.err.println(").parse(\"" + given + "\")"); - - System.err.println(" should have thrown ParseException"); - } - catch (ParseException pe) { - int errorOffset = pe.getErrorOffset(); - if (errorOffset == expected) { - if (verbose) { - System.out.print(" Passed: NumberFormat(" + locale); - System.out.println(").parse(\"" + given + "\")"); - - System.out.print(" threw ParseException as expected, and its errorOffset was correct: "); - System.out.println(errorOffset); - } - } else { - err = true; - System.err.print(" Failed: NumberFormat(" + locale); - System.err.println(").parse(\"" + given + "\")"); - - System.err.print(" threw ParseException as expected, but its errorOffset was incorrect: "); - System.err.println(errorOffset); - } - } - } - -} diff --git a/test/jdk/java/text/Format/DateFormat/Bug6530336.java b/test/jdk/java/text/Format/DateFormat/Bug6530336.java index ba280084666..385577f52bb 100644 --- a/test/jdk/java/text/Format/DateFormat/Bug6530336.java +++ b/test/jdk/java/text/Format/DateFormat/Bug6530336.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,9 +23,9 @@ /* * @test - * @bug 6530336 6537997 8008577 + * @bug 6530336 6537997 8008577 8174269 * @library /java/text/testlib - * @run main/othervm -Djava.locale.providers=COMPAT,SPI Bug6530336 + * @run main Bug6530336 */ import java.text.SimpleDateFormat; @@ -78,6 +78,14 @@ public static void main(String[] args) throws Exception { for (int j = 0; j < timezones.length; j++) { sdf.setTimeZone(timezones[j]); String date = sdf.format(dates[j]); + // CLDR localizes GMT format into for some locales. Ignore those cases + if (date.matches(".*GMT[\\s+-]\\D.*") || + date.contains("UTC") || + date.contains("TMG") || // Interlingue + date.contains("\u07dc\u07ed\u07d5\u07d6") || // N’Ko + date.contains("\u06af\u0631\u06cc\u0646\u06cc\u0686")) { // Central Kurdish + continue; + } sdf.setTimeZone(timezone_LA); String date_LA = sdf.parse(date).toString(); diff --git a/test/jdk/java/text/Format/DateFormat/Bug6683975.java b/test/jdk/java/text/Format/DateFormat/Bug6683975.java index e2e2c108010..051db6ff579 100644 --- a/test/jdk/java/text/Format/DateFormat/Bug6683975.java +++ b/test/jdk/java/text/Format/DateFormat/Bug6683975.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, 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,10 +23,10 @@ /** * @test - * @bug 6683975 8008577 - * @summary Make sure that date is formatted correctlyin th locale. + * @bug 6683975 8008577 8174269 + * @summary Make sure that date is formatted correctly in th locale. * @modules jdk.localedata - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6683975 + * @run main Bug6683975 */ import java.text.*; import java.util.*; @@ -38,16 +38,16 @@ public class Bug6683975 { private static Locale th = Locale.of("th"); private static Locale th_TH = Locale.of("th", "TH"); private static String expected_th[] = { - "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL - "30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG - "30 \u0e01.\u0e22. 2008, 8:00:00", // 2: MEDIUM - "30/9/2008, 8:00 \u0e19.", // 3: SHORT + "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 \u0e40\u0e27\u0e25\u0e32\u0e2d\u0e2d\u0e21\u0e41\u0e2a\u0e07\u0e41\u0e1b\u0e0b\u0e34\u0e1f\u0e34\u0e01\u0e43\u0e19\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32\u0e40\u0e2b\u0e19\u0e37\u0e2d", // 0: FULL + "30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 PDT", // 1: LONG + "30 \u0e01.\u0e22. 2008 08:00:00", // 2: MEDIUM + "30/9/08 08:00", // 3: SHORT }; private static String expected_th_TH[] = { - "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e1e.\u0e28. 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL - "30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG - "30 \u0e01.\u0e22. 2551, 8:00:00", // 2: MEDIUM - "30/9/2551, 8:00 \u0e19." // 3: SHORT + "\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a 2551 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 \u0e40\u0e27\u0e25\u0e32\u0e2d\u0e2d\u0e21\u0e41\u0e2a\u0e07\u0e41\u0e1b\u0e0b\u0e34\u0e1f\u0e34\u0e01\u0e43\u0e19\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32\u0e40\u0e2b\u0e19\u0e37\u0e2d", // 0: FULL + "30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2551 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 PDT", // 1: LONG + "30 \u0e01.\u0e22. 2551 08:00:00", // 2: MEDIUM + "30/9/51 08:00" // 3: SHORT }; private static String stylePattern[] = { "FULL", "LONG", "MEDIUM", "SHORT" @@ -59,12 +59,13 @@ private static void test(int style) { String str_th = ((SimpleDateFormat)df_th).toPattern(); String str_th_TH = ((SimpleDateFormat)df_th_TH).toPattern(); - if (!str_th.equals(str_th_TH)) { - err = true; - System.err.println("Error: Pattern for th locale should be the same as pattern for th_TH locale. (" + stylePattern[style] + ")"); - System.err.println("\tth: " + str_th); - System.err.println("\tth_TH: " + str_th_TH); - } + // CLDR has different patterns for Gregorian and Buddhist calendars, thus they don't match +// if (!str_th.equals(str_th_TH)) { +// err = true; +// System.err.println("Error: Pattern for th locale should be the same as pattern for th_TH locale. (" + stylePattern[style] + ")"); +// System.err.println("\tth: " + str_th); +// System.err.println("\tth_TH: " + str_th_TH); +// } @SuppressWarnings("deprecation") Date date = new Date(2008-1900, Calendar.SEPTEMBER, 30, 8, 0, 0); diff --git a/test/jdk/java/text/Format/DateFormat/Bug8141243.java b/test/jdk/java/text/Format/DateFormat/Bug8141243.java index ddc78acea06..4185fc7bfdc 100644 --- a/test/jdk/java/text/Format/DateFormat/Bug8141243.java +++ b/test/jdk/java/text/Format/DateFormat/Bug8141243.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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,10 +23,9 @@ /* * @test - * @bug 8141243 + * @bug 8141243 8174269 * @summary Make sure that SimpleDateFormat parses "UTC" as the UTC time zone. * @run main Bug8141243 - * @run main/othervm -Djava.locale.providers=COMPAT Bug8141243 */ import java.text.DateFormat; diff --git a/test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java b/test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java index 90d90ef9bfd..eff903f7b00 100644 --- a/test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java +++ b/test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,10 +23,10 @@ /* * @test - * @bug 7079560 8008577 + * @bug 7079560 8008577 8174269 * @summary Unit test for context-sensitive month names * @modules jdk.localedata - * @run main/othervm -Djava.locale.providers=JRE,SPI ContextMonthNamesTest + * @run main ContextMonthNamesTest */ import java.text.*; @@ -47,11 +47,11 @@ public class ContextMonthNamesTest { // NOTE: expected results are locale data dependent. static String[] EXPECTED = { "30. ledna 2012", - "30. Led 2012", + "30. led 2012", "leden", - "I", + "led", "30. leden 2012", - "30. I 2012", + "30. led 2012", }; public static void main(String[] args) { diff --git a/test/jdk/java/text/Format/DateFormat/DateFormatRegression.java b/test/jdk/java/text/Format/DateFormat/DateFormatRegression.java index a1851908ca9..cda264b6281 100644 --- a/test/jdk/java/text/Format/DateFormat/DateFormatRegression.java +++ b/test/jdk/java/text/Format/DateFormat/DateFormatRegression.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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,9 +34,9 @@ * @bug 4029195 4052408 4056591 4059917 4060212 4061287 4065240 4071441 4073003 * 4089106 4100302 4101483 4103340 4103341 4104136 4104522 4106807 4108407 * 4134203 4138203 4148168 4151631 4151706 4153860 4162071 4182066 4209272 4210209 - * 4213086 4250359 4253490 4266432 4406615 4413980 8008577 8305853 + * 4213086 4250359 4253490 4266432 4406615 4413980 8008577 8305853 8174269 * @library /java/text/testlib - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI DateFormatRegression + * @run junit DateFormatRegression */ public class DateFormatRegression { @@ -81,8 +81,8 @@ public void Test4052408() { String str; System.out.println(str = fmt.format(date)); - if (!str.equals("5/3/97 8:55 AM")) - fail("Fail: Test broken; Want 5/3/97 8:55 AM Got " + str); + if (!str.equals("5/3/97, 8:55\u202fAM")) + fail("Fail: Test broken; Want 5/3/97, 8:55\u202fAM Got " + str); Map expected = new HashMap<>(); expected.put(DateFormat.MONTH_FIELD, "5"); expected.put(DateFormat.DATE_FIELD, "3"); diff --git a/test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java index 2ef57b3d19f..e09099c3700 100644 --- a/test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java +++ b/test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java @@ -24,8 +24,8 @@ /* * @test * @summary test Date Format (Round Trip) - * @bug 8008577 - * @run main/othervm -Djava.locale.providers=COMPAT,SPI DateFormatRoundTripTest + * @bug 8008577 8174269 + * @run junit DateFormatRoundTripTest */ import java.text.DateFormat; diff --git a/test/jdk/java/text/Format/DateFormat/DateFormatTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatTest.java index 5f02c12e80d..20490f43a38 100644 --- a/test/jdk/java/text/Format/DateFormat/DateFormatTest.java +++ b/test/jdk/java/text/Format/DateFormat/DateFormatTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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 @@ -24,10 +24,10 @@ /** * @test * @bug 4052223 4089987 4469904 4326988 4486735 8008577 8045998 8140571 - * 8190748 8216969 + * 8190748 8216969 8174269 * @summary test DateFormat and SimpleDateFormat. * @modules jdk.localedata - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI DateFormatTest + * @run junit DateFormatTest */ import java.util.*; @@ -130,7 +130,11 @@ public void TestWallyWedel() String fmtDstOffset = null; if (fmtOffset.startsWith("GMT")) { - fmtDstOffset = fmtOffset.substring(3); + if (fmtOffset.length() > 3) { + fmtDstOffset = fmtOffset.substring(3); + } else { + fmtDstOffset = "+00:00"; + } } /* * Show our result. @@ -255,10 +259,10 @@ public void TestFieldPosition() String[] expected = { "", "1997", "August", "", "", "13", "", "Wednesday", "", - "PM", "", "2", "", "", "34", "12", "", "PDT", + "PM", "", "2", "", "", "34", "12", "", "Pacific Daylight Time", "", "1997", "ao\u00FBt", "", "", "13", "", "mercredi", "", "", - "", "", "14", "", "34", "", "", "PDT" /*"GMT-07:00"*/, + "", "", "14", "", "34", "12", "", "heure d\u2019\u00e9t\u00e9 du Pacifique nord-am\u00e9ricain" /*"GMT-07:00"*/, "AD", "1997", "8", "33", "3", "13", "225", "Wed", "2", "PM", "2", "2", "14", "14", "34", "12", "513", "PDT", @@ -1006,20 +1010,21 @@ public void Test4052223() /** * Bug4469904 -- th_TH date format doesn't use Thai B.E. */ - @Test - public void TestBuddhistEraBugId4469904() { - String era = "\u0e1e.\u0e28."; - Locale loc = Locale.of("th", "TH"); - Calendar cal = Calendar.getInstance(Locale.US); - cal.set(2001, 7, 23); - Date date = cal.getTime(); - DateFormat df = DateFormat.getDateInstance(DateFormat.FULL, loc); - String output = df.format(date); - int index = output.indexOf(era); - if (index == -1) { - fail("Test4469904: Failed. Buddhist Era abbrev not present."); - } - } +// CLDR full date do not include era +// @Test +// public void TestBuddhistEraBugId4469904() { +// String era = "\u0e1e.\u0e28."; +// Locale loc = Locale.of("th", "TH"); +// Calendar cal = Calendar.getInstance(Locale.US); +// cal.set(2001, 7, 23); +// Date date = cal.getTime(); +// DateFormat df = DateFormat.getDateInstance(DateFormat.FULL, loc); +// String output = df.format(date); +// int index = output.indexOf(era); +// if (index == -1) { +// fail("Test4469904: Failed. Buddhist Era abbrev not present."); +// } +// } /** * 4326988: API: SimpleDateFormat throws NullPointerException when parsing with null pattern @@ -1233,12 +1238,12 @@ public void Test4486735() throws Exception { @Test public void Test8216969() throws Exception { Locale locale = Locale.of("ru"); - String format = "\u0434\u0435\u043a"; - String standalone = "\u0434\u0435\u043a."; + String format = "\u0438\u044e\u043d."; + String standalone = "\u0438\u044e\u043d\u044c"; // Check that format form is used so that the dot is parsed correctly. - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM.yyyy", locale); - System.out.println(simpleDateFormat.parse("28 " + format + ".2018")); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMyyyy", locale); + System.out.println(simpleDateFormat.parse("28 " + format + "2018")); // Check that standalone form is used. simpleDateFormat = new SimpleDateFormat("MMM", locale); diff --git a/test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java index ebac773bd7e..126349dbd2f 100644 --- a/test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java +++ b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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 @@ -24,8 +24,8 @@ /* * @test * @summary test International Date Format - * @bug 8008577 - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI IntlTestDateFormat + * @bug 8008577 8174269 + * @run junit IntlTestDateFormat * @key randomness */ /* diff --git a/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java index 1563874f696..30676f275b4 100644 --- a/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java +++ b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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 @@ -24,8 +24,8 @@ /* * @test * @summary test International Date Format API - * @bug 8008577 - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI IntlTestDateFormatAPI + * @bug 8008577 8174269 + * @run junit IntlTestDateFormatAPI */ /* (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved @@ -127,7 +127,7 @@ public void TestAPI() System.out.println("Testing parse()"); - String text = new String("02/03/76 2:50 AM, CST"); + String text = new String("02/03/76, 2:50 AM, CST"); Object result1 = new Date(); Date result2 = new Date(); Date result3 = new Date(); diff --git a/test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java b/test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java index 379a82b872e..afda3af83b6 100644 --- a/test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java +++ b/test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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 @@ -24,8 +24,8 @@ /* * @test * @summary test International Simple Date Format API - * @bug 8008577 - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI IntlTestSimpleDateFormatAPI + * @bug 8008577 8174269 + * @run junit IntlTestSimpleDateFormatAPI */ /* (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved @@ -103,7 +103,7 @@ public void TestAPI() System.out.println("Testing parse()"); - String text = new String("02/03/76 2:50 AM, CST"); + String text = new String("02/03/76, 2:50 AM, CST"); Date result1 = new Date(); Date result2 = new Date(); ParsePosition pos= new ParsePosition(0); diff --git a/test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java b/test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java index 6e58cef5c4b..f5ebdccb91f 100644 --- a/test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java +++ b/test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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,9 +23,9 @@ /** * @test - * @bug 8080774 + * @bug 8080774 8174269 * @modules jdk.localedata - * @run testng/othervm -Djava.locale.providers=JRE,CLDR LocaleDateFormats + * @run testng LocaleDateFormats * @summary This file contains tests for JRE locales date formats */ @@ -54,9 +54,9 @@ private Object[][] dateFormats() { //8080774 //Locale, Format type, year, month, date, expected result {localeEnSG, DateFormat.SHORT, 2015, 5, 6, "6/5/15"}, - {localeEnSG, DateFormat.MEDIUM, 2015, 5, 6, "6 May, 2015"}, - {localeEnSG, DateFormat.LONG, 2015, 5, 6, "6 May, 2015"}, - {localeEnSG, DateFormat.FULL, 2015, 5, 6, "Wednesday, 6 May, 2015"} + {localeEnSG, DateFormat.MEDIUM, 2015, 5, 6, "6 May 2015"}, + {localeEnSG, DateFormat.LONG, 2015, 5, 6, "6 May 2015"}, + {localeEnSG, DateFormat.FULL, 2015, 5, 6, "Wednesday, 6 May 2015"} }; } // en_SG Locale instance diff --git a/test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java b/test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java index 504d3cdf1c2..2a091d8cd35 100644 --- a/test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java +++ b/test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4833268 6253991 8008577 8190748 + * @bug 4833268 6253991 8008577 8190748 8174269 * @summary Test formatting and parsing with non-Gregorian calendars * @modules jdk.localedata - * @run main/othervm -Djava.locale.providers=COMPAT,SPI NonGregorianFormatTest + * @run main NonGregorianFormatTest */ import java.time.ZoneId; @@ -39,37 +39,37 @@ public class NonGregorianFormatTest { @SuppressWarnings("deprecation") static final Object[][] JAPANESE_EN = { - { "GGGG yyyy MMMM d", "Showa 1 December 31", new Date(1926-1900, DECEMBER, 31) }, - { "GGGG yyyy MMMM d", "Showa 64 January 6", new Date(1989-1900, JANUARY, 6) }, + { "GGGG yyyy MMMM d", "Sh\u014dwa 1 December 31", new Date(1926-1900, DECEMBER, 31) }, + { "GGGG yyyy MMMM d", "Sh\u014dwa 64 January 6", new Date(1989-1900, JANUARY, 6) }, { "GGGG yyyy MMMM d", "Heisei 1 August 9", new Date(1989-1900, AUGUST, 9) }, { "GGGG yyyy MMMM d", "Heisei 17 June 10", new Date(2005-1900, JUNE, 10) }, - { "Gy.MM.dd", "S1.12.31", new Date(1926-1900, DECEMBER, 31) }, - { "Gy.MM.dd", "S64.01.06", new Date(1989-1900, JANUARY, 6) }, - { "Gyy.MM.dd", "H01.08.09", new Date(1989-1900, AUGUST, 9) }, - { "Gy.M.d", "H1.8.9", new Date(1989-1900, AUGUST, 9) }, - { "Gy.MM.dd", "H17.06.10", new Date(2005-1900, JUNE, 10) }, + { "Gy.MM.dd", "Sh\u014dwa1.12.31", new Date(1926-1900, DECEMBER, 31) }, + { "Gy.MM.dd", "Sh\u014dwa64.01.06", new Date(1989-1900, JANUARY, 6) }, + { "Gyy.MM.dd", "Heisei01.08.09", new Date(1989-1900, AUGUST, 9) }, + { "Gy.M.d", "Heisei1.8.9", new Date(1989-1900, AUGUST, 9) }, + { "Gy.MM.dd", "Heisei17.06.10", new Date(2005-1900, JUNE, 10) }, }; // Invalid dates for parse exception tests static final Object[][] EXCEPTION_JAPANESE_EN = { - { "GGGG yyyy MMMM d", "Showa 1 December 10" }, - { "GGGG yyyy MMMM d", "Showa 64 January 16" }, + { "GGGG yyyy MMMM d", "Sh\u014dwa 1 December 10" }, + { "GGGG yyyy MMMM d", "Sh\u014dwa 64 January 16" }, { "GGGG yyyy MMMM d", "Heisei 1 January 1" }, - { "Gy.MM.dd", "S1.12.10" }, - { "Gy.MM.dd", "S64.01.16" }, - { "Gyy.MM.dd", "H01.01.01" }, + { "Gy.MM.dd", "Sh\u014dwa1.12.10" }, + { "Gy.MM.dd", "Sh\u014dwa64.01.16" }, + { "Gyy.MM.dd", "Heisei01.01.01" }, }; @SuppressWarnings("deprecation") static final Object[][] BUDDHIST_EN = { - { "GGGG yyyy MMMM d", "B.E. 2469 December 31", new Date(1926-1900, DECEMBER, 31) }, - { "GGGG yyyy MMMM d", "B.E. 2532 January 6", new Date(1989-1900, JANUARY, 6) }, - { "GGGG yyyy MMMM d", "B.E. 2532 August 8", new Date(1989-1900, AUGUST, 8) }, - { "GGGG yyyy MMMM d", "B.E. 2548 June 10", new Date(2005-1900, JUNE, 10) }, - { "Gyyyy/MM/dd", "B.E.2469/12/31", new Date(1926-1900, DECEMBER, 31) }, - { "Gyyyy/MM/dd", "B.E.2532/01/06", new Date(1989-1900, JANUARY, 6) }, - { "Gyyyy/MM/dd", "B.E.2532/08/09", new Date(1989-1900, AUGUST, 9) }, - { "Gyyyy/MM/dd", "B.E.2548/06/10", new Date(2005-1900, JUNE, 10) }, + { "GGGG yyyy MMMM d", "BE 2469 December 31", new Date(1926-1900, DECEMBER, 31) }, + { "GGGG yyyy MMMM d", "BE 2532 January 6", new Date(1989-1900, JANUARY, 6) }, + { "GGGG yyyy MMMM d", "BE 2532 August 8", new Date(1989-1900, AUGUST, 8) }, + { "GGGG yyyy MMMM d", "BE 2548 June 10", new Date(2005-1900, JUNE, 10) }, + { "Gyyyy/MM/dd", "BE2469/12/31", new Date(1926-1900, DECEMBER, 31) }, + { "Gyyyy/MM/dd", "BE2532/01/06", new Date(1989-1900, JANUARY, 6) }, + { "Gyyyy/MM/dd", "BE2532/08/09", new Date(1989-1900, AUGUST, 9) }, + { "Gyyyy/MM/dd", "BE2548/06/10", new Date(2005-1900, JUNE, 10) }, }; static final String FULL_DATE_FORMAT_JA = "GGGGyyyy'\u5e74'M'\u6708'd'\u65e5'"; @@ -80,11 +80,11 @@ public class NonGregorianFormatTest { { FULL_DATE_FORMAT_JA, "\u662d\u548c64\u5e741\u67086\u65e5", new Date(1989-1900, JANUARY, 6) }, { FULL_DATE_FORMAT_JA, "\u5e73\u6210\u5143\u5e748\u67089\u65e5", new Date(1989-1900, AUGUST, 9) }, { FULL_DATE_FORMAT_JA, "\u5e73\u621017\u5e746\u670810\u65e5", new Date(2005-1900, JUNE, 10) }, - { "Gyy.MM.dd", "S01.12.31", new Date(1926-1900, DECEMBER, 31) }, - { "Gyy.MM.dd", "S64.01.06", new Date(1989-1900, JANUARY, 6) }, - { "Gyy.MM.dd", "H01.08.09", new Date(1989-1900, AUGUST, 9) }, - { "Gy.M.d", "H1.8.9", new Date(1989-1900, AUGUST, 9) }, - { "Gyy.MM.dd", "H17.06.10", new Date(2005-1900, JUNE, 10) }, + { "Gyy.MM.dd", "\u662d\u548c01.12.31", new Date(1926-1900, DECEMBER, 31) }, + { "Gyy.MM.dd", "\u662d\u548c64.01.06", new Date(1989-1900, JANUARY, 6) }, + { "Gyy.MM.dd", "\u5e73\u621001.08.09", new Date(1989-1900, AUGUST, 9) }, + { "Gy.M.d", "\u5e73\u62101.8.9", new Date(1989-1900, AUGUST, 9) }, + { "Gyy.MM.dd", "\u5e73\u621017.06.10", new Date(2005-1900, JUNE, 10) }, }; // Invalid dates for parse exception tests @@ -92,9 +92,9 @@ public class NonGregorianFormatTest { { FULL_DATE_FORMAT_JA, "\u662d\u548c\u5143\u5e7412\u670810\u65e5" }, { FULL_DATE_FORMAT_JA, "\u662d\u548c64\u5e741\u670816\u65e5" }, { FULL_DATE_FORMAT_JA, "\u5e73\u6210\u5143\u5e741\u67081\u65e5" }, - { "Gyy.MM.dd", "S01.12.10" }, - { "Gyy.MM.dd", "S64.01.16" }, - { "Gyy.MM.dd", "H01.01.01" }, + { "Gyy.MM.dd", "\u662d\u548c01.12.10" }, + { "Gyy.MM.dd", "\u662d\u548c64.01.16" }, + { "Gyy.MM.dd", "\u5e73\u621001.01.01" }, }; @SuppressWarnings("deprecation") @@ -103,10 +103,10 @@ public class NonGregorianFormatTest { { FULL_DATE_FORMAT_JA, "\u4ecf\u66a62532\u5e741\u67086\u65e5", new Date(1989-1900, JANUARY, 6) }, { FULL_DATE_FORMAT_JA, "\u4ecf\u66a62532\u5e748\u67089\u65e5", new Date(1989-1900, AUGUST, 9) }, { FULL_DATE_FORMAT_JA, "\u4ecf\u66a62548\u5e746\u670810\u65e5", new Date(2005-1900, JUNE, 10) }, - { "Gyyyy/MM/dd", "B.E.2469/12/31", new Date(1926-1900, DECEMBER, 31) }, - { "Gyyyy/MM/dd", "B.E.2532/01/06", new Date(1989-1900, JANUARY, 6) }, - { "Gyyyy/MM/dd", "B.E.2532/08/09", new Date(1989-1900, AUGUST, 9) }, - { "Gyyyy/MM/dd", "B.E.2548/06/10", new Date(2005-1900, JUNE, 10) }, + { "Gyyyy/MM/dd", "BE2469/12/31", new Date(1926-1900, DECEMBER, 31) }, + { "Gyyyy/MM/dd", "BE2532/01/06", new Date(1989-1900, JANUARY, 6) }, + { "Gyyyy/MM/dd", "BE2532/08/09", new Date(1989-1900, AUGUST, 9) }, + { "Gyyyy/MM/dd", "BE2548/06/10", new Date(2005-1900, JUNE, 10) }, }; public static void main(String[] args) throws ParseException { diff --git a/test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java b/test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java index b4fae8286a7..8ce11445ca0 100644 --- a/test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java +++ b/test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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,9 +23,9 @@ /** * @test - * @bug 4348864 4112924 4425386 4495052 4836940 4851113 8008577 + * @bug 4348864 4112924 4425386 4495052 4836940 4851113 8008577 8174269 * @summary test time zone display names in en_US locale - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI TimeZoneNameTest + * @run junit TimeZoneNameTest */ import java.util.*; @@ -47,18 +47,18 @@ static void initAll() { static final String[] data = { // Added to verify the fix for 4836940 - "N", "Antarctica/Rothera", "ROTT", "Rothera Time", "ROTT", "Rothera Time", - "N", "Asia/Tehran", "IRST", "Iran Standard Time", "IRDT", "Iran Daylight Time", - "N", "Iran", "IRST", "Iran Standard Time", "IRDT", "Iran Daylight Time", + "N", "Antarctica/Rothera", "GMT-03:00", "Rothera Time", "GMT-03:00", "Rothera Time", + "N", "Asia/Tehran", "GMT+03:30", "Iran Standard Time", "GMT+04:30", "Iran Daylight Time", + "N", "Iran", "GMT+03:30", "Iran Standard Time", "GMT+04:30", "Iran Daylight Time", // Added to verify the fix for 4851113 "N", "America/Rankin_Inlet", "CST", "Central Standard Time", "CDT", "Central Daylight Time", - "N", "Asia/Samarkand", "UZT", "Uzbekistan Time", "UZT", "Uzbekistan Time", - "N", "Asia/Tashkent", "UZT", "Uzbekistan Time", "UZT", "Uzbekistan Time", - "N", "Atlantic/Jan_Mayen", "CET", "Central European Time", "CEST", "Central European Summer Time", - "N", "Europe/Oslo", "CET", "Central European Time", "CEST", "Central European Summer Time", + "N", "Asia/Samarkand", "GMT+05:00", "Uzbekistan Standard Time", "GMT+05:00", "Uzbekistan Standard Time", + "N", "Asia/Tashkent", "GMT+05:00", "Uzbekistan Standard Time", "GMT+05:00", "Uzbekistan Standard Time", + "N", "Atlantic/Jan_Mayen", "CET", "Central European Standard Time", "CEST", "Central European Summer Time", + "N", "Europe/Oslo", "CET", "Central European Standard Time", "CEST", "Central European Summer Time", - "N", "Pacific/Honolulu", "HST", "Hawaii Standard Time", "HST", "Hawaii Standard Time", + "N", "Pacific/Honolulu", "HST", "Hawaii-Aleutian Standard Time", "HST", "Hawaii-Aleutian Standard Time", "N", "America/Los_Angeles", "PST", "Pacific Standard Time", "PDT", "Pacific Daylight Time", "N", "US/Pacific", "PST", "Pacific Standard Time", "PDT", "Pacific Daylight Time", "N", "America/Phoenix", "MST", "Mountain Standard Time", "MST", "Mountain Standard Time", @@ -68,37 +68,37 @@ static void initAll() { "N", "America/Montreal", "EST", "Eastern Standard Time", "EDT", "Eastern Daylight Time", "N", "America/Toronto", "EST", "Eastern Standard Time", "EDT", "Eastern Daylight Time", "N", "America/New_York", "EST", "Eastern Standard Time", "EDT", "Eastern Daylight Time", - "S", "America/Manaus", "AMT", "Amazon Time", "AMT", "Amazon Time", - "S", "America/Campo_Grande", "AMT", "Amazon Time", "AMST", "Amazon Summer Time", - "S", "America/Bahia", "BRT", "Brasilia Time", "BRST", "Brasilia Summer Time", + "S", "America/Manaus", "GMT-04:00", "Amazon Standard Time", "GMT-04:00", "Amazon Standard Time", + "S", "America/Campo_Grande", "GMT-04:00", "Amazon Standard Time", "GMT-03:00", "Amazon Summer Time", + "S", "America/Bahia", "GMT-03:00", "Brasilia Standard Time", "GMT-02:00", "Brasilia Summer Time", "N", "America/Halifax", "AST", "Atlantic Standard Time", "ADT", "Atlantic Daylight Time", "N", "GMT", "GMT", "Greenwich Mean Time", "GMT", "Greenwich Mean Time", "N", "Europe/London", "GMT", "Greenwich Mean Time", "BST", "British Summer Time", - "N", "Europe/Paris", "CET", "Central European Time", "CEST", "Central European Summer Time", - "N", "WET", "WET", "Western European Time", "WEST", "Western European Summer Time", - "N", "Europe/Berlin", "CET", "Central European Time", "CEST", "Central European Summer Time", + "N", "Europe/Paris", "CET", "Central European Standard Time", "CEST", "Central European Summer Time", + "N", "WET", "WET", "GMT", "WEST", "GMT+01:00", + "N", "Europe/Berlin", "CET", "Central European Standard Time", "CEST", "Central European Summer Time", "N", "Asia/Jerusalem", "IST", "Israel Standard Time", "IDT", "Israel Daylight Time", - "N", "Europe/Helsinki", "EET", "Eastern European Time", "EEST", "Eastern European Summer Time", - "N", "Africa/Cairo", "EET", "Eastern European Time", "EEST", "Eastern European Summer Time", - "N", "Europe/Moscow", "MSK", "Moscow Standard Time", "MSD", "Moscow Daylight Time", - "N", "Asia/Omsk", "OMST", "Omsk Time", "OMSST", "Omsk Summer Time", + "N", "Europe/Helsinki", "EET", "Eastern European Standard Time", "EEST", "Eastern European Summer Time", + "N", "Africa/Cairo", "EET", "Eastern European Standard Time", "EEST", "Eastern European Summer Time", + "N", "Europe/Moscow", "MSK", "Moscow Standard Time", "MSK", "Moscow Summer Time", + "N", "Asia/Omsk", "GMT+06:00", "Omsk Standard Time", "GMT+07:00", "Omsk Summer Time", "N", "Asia/Shanghai", "CST", "China Standard Time", "CST", "China Standard Time", "N", "Asia/Tokyo", "JST", "Japan Standard Time", "JST", "Japan Standard Time", "N", "Japan", "JST", "Japan Standard Time", "JST", "Japan Standard Time", - "N", "Asia/Seoul", "KST", "Korea Standard Time", "KST", "Korea Standard Time", - "N", "ROK", "KST", "Korea Standard Time", "KST", "Korea Standard Time", - "S", "Australia/Darwin", "ACST", "Australian Central Standard Time (Northern Territory)", - "ACST", "Australian Central Standard Time (Northern Territory)", - "S", "Australia/Adelaide", "ACST", "Australian Central Standard Time (South Australia)", - "ACDT", "Australian Central Daylight Time (South Australia)", - "S", "Australia/Broken_Hill", "ACST", "Australian Central Standard Time (South Australia/New South Wales)", - "ACDT", "Australian Central Daylight Time (South Australia/New South Wales)", - "S", "Australia/Hobart", "AEST", "Australian Eastern Standard Time (Tasmania)", - "AEDT", "Australian Eastern Daylight Time (Tasmania)", - "S", "Australia/Brisbane", "AEST", "Australian Eastern Standard Time (Queensland)", - "AEST", "Australian Eastern Standard Time (Queensland)", - "S", "Australia/Sydney", "AEST", "Australian Eastern Standard Time (New South Wales)", - "AEDT", "Australian Eastern Daylight Time (New South Wales)", + "N", "Asia/Seoul", "KST", "Korean Standard Time", "KST", "Korean Standard Time", + "N", "ROK", "KST", "Korean Standard Time", "KST", "Korean Standard Time", + "S", "Australia/Darwin", "ACST", "Australian Central Standard Time", + "ACST", "Australian Central Standard Time", + "S", "Australia/Adelaide", "ACST", "Australian Central Standard Time", + "ACDT", "Australian Central Daylight Time", + "S", "Australia/Broken_Hill", "ACST", "Australian Central Standard Time", + "ACDT", "Australian Central Daylight Time", + "S", "Australia/Hobart", "AEST", "Australian Eastern Standard Time", + "AEDT", "Australian Eastern Daylight Time", + "S", "Australia/Brisbane", "AEST", "Australian Eastern Standard Time", + "AEST", "Australian Eastern Standard Time", + "S", "Australia/Sydney", "AEST", "Australian Eastern Standard Time", + "AEDT", "Australian Eastern Daylight Time", "N", "Pacific/Guam", "ChST", "Chamorro Standard Time", "ChST", "Chamorro Standard Time", "N", "Pacific/Saipan", "ChST", "Chamorro Standard Time", diff --git a/test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java b/test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java index 9ff3b1c62c8..be845f4431e 100644 --- a/test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java +++ b/test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4112090 8008577 + * @bug 4112090 8008577 8174269 * @summary verify that MessageFormat can handle large numbers of arguments * @modules jdk.localedata - * @run main/othervm -Djava.locale.providers=COMPAT,SPI LargeMessageFormat + * @run main LargeMessageFormat */ import java.text.MessageFormat; @@ -88,7 +88,7 @@ private static void testFormat() { expected.append("string: hello; "); expected.append("date: 09.11.1989; "); expected.append("integer: 567.890; "); - expected.append("currency: 1.234,50 \u20AC;\n"); + expected.append("currency: 1.234,50\u00a0\u20AC;\n"); } // create message format diff --git a/test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java b/test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java index 2fa6db702fc..a220e509a3e 100644 --- a/test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java +++ b/test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java @@ -23,9 +23,9 @@ /* * @test - * @bug 4018937 8008577 + * @bug 4018937 8008577 8174269 * @summary Confirm that methods which are newly added to support BigDecimal and BigInteger work as expected. - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI BigDecimalFormat + * @run junit BigDecimalFormat */ import java.math.BigDecimal; @@ -916,10 +916,10 @@ void test_Format_in_NumberFormat_SpecialNumber() { }; int multipliers[] = {0, 5, -5}; String[][] expected = { - {"-0", "0", "\ufffd", "\ufffd", "0", "0", "\ufffd", "-0", "-0"}, - {"-0", "0", "\ufffd", "\u221e", "25.5", "25", "-\u221e", "-25.5", + {"-0", "0", "NaN", "NaN", "0", "0", "NaN", "-0", "-0"}, + {"-0", "0", "NaN", "\u221e", "25.5", "25", "-\u221e", "-25.5", "-25"}, - {"0", "-0", "\ufffd", "-\u221e", "-25.5", "-25", "\u221e", "25.5", + {"0", "-0", "NaN", "-\u221e", "-25.5", "-25", "\u221e", "25.5", "25"}, }; @@ -987,7 +987,7 @@ void test_Format_in_MessageFormat() { " {1, number, currency}\n" + " {1, number, percent}\n" + " {1, number,0.#######E0}\n", - Locale.US + Locale.forLanguageTag("en-US-u-cf-account") ); Object[] testArgs = { new BigInteger("9876543210987654321098765432109876543210"), diff --git a/test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java b/test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java index c878165c5ba..771ae761a3a 100644 --- a/test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java +++ b/test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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,9 +23,9 @@ /* * @test - * @bug 4018937 8008577 + * @bug 4018937 8008577 8174269 * @summary Confirm that methods which are newly added to support BigDecimal and BigInteger work as expected. - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI BigDecimalParse + * @run junit/othervm BigDecimalParse */ import java.math.BigDecimal; @@ -42,7 +42,7 @@ public class BigDecimalParse { // Change JVM default Locale @BeforeAll static void initAll() { - Locale.setDefault(Locale.US); + Locale.setDefault(Locale.forLanguageTag("en-US-u-cf-account")); } @@ -240,7 +240,7 @@ public void test_Parse_in_DecimalFormat_Double_DivisionByZero() { // From: Double.NaN // To: Double.NaN - check("\ufffd", Double.NaN); + check("NaN", Double.NaN); // From: Double.POSITIVE_INFINITY // To: Double.NaN @@ -350,7 +350,7 @@ public void test_Parse_in_DecimalFormat_SpecialNumber() { df.setParseBigDecimal(true); String[] numbers = { - "0", "0.0", "25", "25.0", "25.5", "\u221e", "\ufffd", + "0", "0.0", "25", "25.0", "25.5", "\u221e", "NaN", "-0", "-0.0", "-25", "-25.0", "-25.5", "-\u221e", }; int multipliers[] = {5, -5}; diff --git a/test/jdk/java/text/Format/NumberFormat/Bug4838107.java b/test/jdk/java/text/Format/NumberFormat/Bug4838107.java index e672bbfcf14..1f0eb536e78 100644 --- a/test/jdk/java/text/Format/NumberFormat/Bug4838107.java +++ b/test/jdk/java/text/Format/NumberFormat/Bug4838107.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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,11 +23,11 @@ /* * @test - * @bug 4838107 8008577 + * @bug 4838107 8008577 8174269 * @summary Confirm that DecimalFormat can format a number with a negative * exponent number correctly. Tests also involve using a DecimalFormat * with a custom pattern or a custom minus sign. - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI Bug4838107 + * @run junit Bug4838107 */ import java.math.BigDecimal; @@ -97,7 +97,7 @@ private static Stream doubles() { Arguments.of(-0.1234, "-0.123", defaultDf), // rounded Arguments.of(Double.POSITIVE_INFINITY, "\u221e", defaultDf), Arguments.of(Double.NEGATIVE_INFINITY, "-\u221e", defaultDf), - Arguments.of(Double.NaN, "\ufffd", defaultDf), // without prefix and suffix + Arguments.of(Double.NaN, "NaN", defaultDf), // without prefix and suffix Arguments.of(0.0, "0", defaultDf), Arguments.of(-0.0, "-0", defaultDf), // with the minus sign // Test with a pattern and the minus sign @@ -119,7 +119,7 @@ private static Stream doubles() { Arguments.of(-0.1234, "

    m1.234Em01", customDf4), Arguments.of(Double.POSITIVE_INFINITY, "

    \u221e", customDf4), Arguments.of(Double.NEGATIVE_INFINITY, "

    m\u221e", customDf4), - Arguments.of(Double.NaN, "\ufffd", customDf4), // without prefix and suffix + Arguments.of(Double.NaN, "NaN", customDf4), // without prefix and suffix Arguments.of(0.0, "

    0E00", customDf4), Arguments.of(-0.0, "

    m0E00", customDf4) // with the minus sign ); diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java index f8890b2c1ba..fa50ecde2aa 100644 --- a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java +++ b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2024, 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 @@ -24,10 +24,10 @@ /* * @test * @bug 4290801 4942982 5102005 8008577 8021121 8210153 8227313 8301991 + * 8174269 * @summary Basic tests for currency formatting. * Tests both COMPAT and CLDR data. * @modules jdk.localedata - * @run junit/othervm -Djava.locale.providers=COMPAT CurrencyFormat * @run junit/othervm -Djava.locale.providers=CLDR CurrencyFormat */ @@ -56,11 +56,6 @@ public class CurrencyFormat { - // Expected data is switched depending on COMPAT or CLDR - // currencySymbolsTest() is only ran for COMPAT - private static final boolean isCompat = - "COMPAT".equals(System.getProperty("java.locale.providers")); - // Tests the formatting of data for COMPAT + CLDR under various currencies // Using a NumberFormat generated by getCurrencyInstance() @ParameterizedTest @@ -98,15 +93,6 @@ private static Stream currencyFormatDataProvider() { Currency.getInstance("DEM"), Currency.getInstance("EUR"), }; - String[][] expectedCOMPATData = { - {"$1,234.56", "$1,234.56", "JPY1,235", "DEM1,234.56", "EUR1,234.56"}, - {"\uFFE51,235", "USD1,234.56", "\uFFE51,235", "DEM1,234.56", "EUR1,234.56"}, - {"1.234,56 \u20AC", "1.234,56 USD", "1.235 JPY", "1.234,56 DM", "1.234,56 \u20AC"}, - {"\u20AC 1.234,56", "USD 1.234,56", "JPY 1.235", "DEM 1.234,56", "\u20AC 1.234,56"}, - {"\u20AC 1.234,56", "USD 1.234,56", "JPY 1.235", "DEM 1.234,56", "\u20AC 1.234,56"}, - {"\u20AC 1.234,56", "USD 1.234,56", "JPY 1.235", "DEM 1.234,56", "\u20AC 1.234,56"}, - {"SFr. 1'234.56", "USD 1'234.56", "JPY 1'235", "DEM 1'234.56", "EUR 1'234.56"}, - }; String[][] expectedCLDRData = { {"$1,234.56", "$1,234.56", "\u00a51,235", "DEM1,234.56", "\u20ac1,234.56"}, {"\uFFE51,235", "$1,234.56", "\uFFE51,235", "DEM1,234.56", "\u20ac1,234.56"}, @@ -121,65 +107,10 @@ private static Stream currencyFormatDataProvider() { NumberFormat format = NumberFormat.getCurrencyInstance(locale); for (int j = 0; j < currencies.length; j++) { Currency currency = currencies[j]; - String expected = isCompat ? expectedCOMPATData[i][j] : expectedCLDRData[i][j]; + String expected = expectedCLDRData[i][j]; data.add(Arguments.of(expected, currency, format, locale)); } } return data.stream(); } - - // Compares the expected currency symbol of a locale to the value returned by - // DecimalFormatSymbols.getCurrencySymbol(). - @ParameterizedTest - @MethodSource("currencySymbolsDataProvider") - public void currencySymbolsTest(String expected, Locale locale) throws ParseException { - if (!isCompat) { - return; // For COMPAT only. - } - if (expected == null) { - System.out.println("Warning: No expected currency symbol defined for locale " + locale); - } else { - // Reserved for when a currency will change its symbol at a given time in the future - if (expected.contains(";")) { - expected = getFutureSymbol(expected); - } - DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(locale); - String result = symbols.getCurrencySymbol(); - assertEquals(expected, result, "Wrong currency symbol for locale " + - locale + ", expected: " + expected + ", got: " + result); - } - } - - // Grabs the custom CurrencySymbols.properties and loads the file into a Properties - // instance. Building the data set, which consists of the currency symbol for the locale. - private static Stream currencySymbolsDataProvider() throws IOException { - ArrayList data = new ArrayList(); - FileInputStream stream = new FileInputStream(new File( - System.getProperty("test.src", "."), "CurrencySymbols.properties")); - InputStreamReader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8); - Properties props = new Properties(); - props.load(streamReader); - Locale[] locales = NumberFormat.getAvailableLocales(); - for (Locale locale : locales) { - String expected = (String) props.get(locale.toString()); - data.add(Arguments.of(expected, locale)); - } - return data.stream(); - } - - // Utility to grab the future symbol if in the right format and date cut-over allows - private static String getFutureSymbol(String expected) throws ParseException { - StringTokenizer tokens = new StringTokenizer(expected, ";"); - int tokensCount = tokens.countTokens(); - if (tokensCount == 3) { - expected = tokens.nextToken(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US); - format.setTimeZone(TimeZone.getTimeZone("GMT")); - format.setLenient(false); - if (format.parse(tokens.nextToken()).getTime() < System.currentTimeMillis()) { - expected = tokens.nextToken(); - } - } - return expected; - } } diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties deleted file mode 100644 index a324fb19f02..00000000000 --- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties +++ /dev/null @@ -1,157 +0,0 @@ -# -# Copyright (c) 2001, 2023, 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. -# -# 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. -# - -ar=¤ -ar_AE=د.إ.‏ -ar_BH=د.ب.‏ -ar_DZ=د.ج.‏ -ar_EG=ج.م.‏ -ar_IQ=د.ع.‏ -ar_JO=د.أ.‏ -ar_KW=د.ك.‏ -ar_LB=ل.ل.‏ -ar_LY=د.ل.‏ -ar_MA=د.م.‏ -ar_OM=ر.ع.‏ -ar_QA=ر.ق.‏ -ar_SA=ر.س.‏ -# see bug 4412080 -# ar_SD=ج.س.‏ -ar_SY=ل.س.‏ -ar_TN=د.ت.‏ -ar_YE=ر.ي.‏ -be=¤ -# see bug 4412080 -# be_BY=Руб -bg=¤ -# see bug 4412080 -# bg_BG=Lr -ca=¤ -ca_ES=€ -cs=¤ -cs_CZ=Kč -da=¤ -da_DK=kr -de=¤ -de_AT=€ -de_CH=SFr. -de_DE=€ -de_LU=€ -el=¤ -el_GR=€ -en=¤ -en_AU=$ -en_CA=$ -en_GB=£ -en_IE=€ -en_NZ=$ -en_US=$ -en_ZA=R -es=¤ -es_AR=$ -es_BO=B$ -es_CL=Ch$ -# 5102005 -es_CO=$ -es_CR=C -es_CU=CU$ -es_DO=RD$ -# see bug 4412080 -# es_EC=S/ -es_ES=€ -es_GT=Q -es_HN=L -es_MX=$ -es_NI=$C -es_PA=B -es_PE=S/. -es_PR=$ -es_PY=G -es_SV=C -es_UY=NU$ -es_VE=Bs.S. -et=¤ -et_EE=€ -fi=¤ -fi_FI=€ -fr=¤ -fr_BE=€ -fr_CA=$ -fr_CH=SFr. -fr_FR=€ -fr_LU=€ -hi_IN=रू -hr=¤ -hr_HR=€ -hu=¤ -hu_HU=Ft -is=¤ -is_IS=kr. -it=¤ -it_CH=SFr. -it_IT=€ -iw=¤ -iw_IL=ש"ח -ja=¤ -ja_JP=￥ -ko=¤ -ko_KR=￦ -lt=¤ -lt_LT=€ -lv=¤ -lv_LV=€ -mk=¤ -mk_MK=Den -nl=¤ -nl_BE=€ -nl_NL=€ -no=¤ -no_NO=kr -no_NO_NY=kr -pl=¤ -pl_PL=zł -pt=¤ -pt_BR=R$ -pt_PT=€ -ro=¤ -ro_RO=LEI -ru=¤ -ru_RU=руб. -sk=¤ -sk_SK=€ -sl=¤ -sl_SI=€ -sq=¤ -sq_AL=Lek -sv=¤ -sv_SE=kr -th=¤ -th_TH=฿ -tr=¤ -tr_TR=TL -uk=¤ -uk_UA=грн. -zh=¤ -zh_CN=￥ -zh_HK=HK$ -zh_TW=NT$ diff --git a/test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java b/test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java index 26ae64b1963..3dee4377da4 100644 --- a/test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java +++ b/test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,9 +23,9 @@ /* * @test - * @bug 7073852 8008577 + * @bug 7073852 8008577 8174269 * @summary Support multiple scripts for digits and decimal symbols per locale - * @run main/othervm -Djava.locale.providers=JRE,SPI MultipleNumberScriptTest + * @run main MultipleNumberScriptTest */ import java.text.*; @@ -52,8 +52,8 @@ public class MultipleNumberScriptTest { // expected numbering system for each locale static String[] expectedNumSystem = { - "latn", // ar - "latn", // ar-EG + "arab", // ar + "arab", // ar-EG "latn", // ar-DZ "arab", // ar-EG-u-nu-arab "latn", // ar-EG-u-nu-latn diff --git a/test/jdk/java/text/Format/NumberFormat/NumberRegression.java b/test/jdk/java/text/Format/NumberFormat/NumberRegression.java index 3ef134ee4dd..2ff111f0e4b 100644 --- a/test/jdk/java/text/Format/NumberFormat/NumberRegression.java +++ b/test/jdk/java/text/Format/NumberFormat/NumberRegression.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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 @@ -30,13 +30,14 @@ * 4125885 4134034 4134300 4140009 4141750 4145457 4147295 4147706 4162198 * 4162852 4167494 4170798 4176114 4179818 4185761 4212072 4212073 4216742 * 4217661 4243011 4243108 4330377 4233840 4241880 4833877 8008577 8227313 + * 8174269 * @summary Regression tests for NumberFormat and associated classes * @library /java/text/testlib * @build HexDumpReader TestUtils * @modules java.base/sun.util.resources * jdk.localedata * @compile -XDignore.symbol.file NumberRegression.java - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI NumberRegression + * @run junit NumberRegression */ /* @@ -277,11 +278,11 @@ public void Test4086575() { System.out.println("nf toPattern2: " + ((DecimalFormat)nf).toPattern()); System.out.println("nf toLocPattern2: " + ((DecimalFormat)nf).toLocalizedPattern()); String buffer = nf.format(1234); - if (!buffer.equals("1\u00a0234,00")) - fail("nf : " + buffer); // Expect 1 234,00 + if (!buffer.equals("1234,00\u00a0")) + fail("nf : " + buffer); // Expect 1234,00\u00a0 buffer = nf.format(-1234); - if (!buffer.equals("(1\u00a0234,00)")) - fail("nf : " + buffer); // Expect (1 234,00) + if (!buffer.equals("(1234,00\u00a0)")) + fail("nf : " + buffer); // Expect (1234,00\u00a0) // Erroneously prints: // 1234,00 , @@ -545,10 +546,10 @@ public void Test4070798 () { String expectedCurrency = "5\u00a0789,98 F"; String expectedPercent = "-578\u00a0998%"; */ - String expectedDefault = "-5\u00a0789,988"; - String expectedCurrency = "5\u00a0789,99 \u20AC"; + String expectedDefault = "-5\u202f789,988"; + String expectedCurrency = "5\u202f789,99\u00a0\u20AC"; // changed for bug 6547501 - String expectedPercent = "-578\u00a0999 %"; + String expectedPercent = "-578\u202f999\u00a0%"; formatter = NumberFormat.getNumberInstance(Locale.FRANCE); tempString = formatter.format (-5789.9876); @@ -599,9 +600,9 @@ public void Test4071005 () { String expectedPercent = "-578 998%"; */ String expectedDefault = "-5\u00a0789,988"; - String expectedCurrency = "5\u00a0789,99 $"; + String expectedCurrency = "5\u00a0789,99\u00a0$"; // changed for bug 6547501 - String expectedPercent = "-578\u00a0999 %"; + String expectedPercent = "-578\u00a0999\u00a0%"; formatter = NumberFormat.getNumberInstance(Locale.CANADA_FRENCH); tempString = formatter.format (-5789.9876); @@ -648,8 +649,8 @@ public void Test4071014 () { String expectedPercent = "-578.998%"; */ String expectedDefault = "-5.789,988"; - String expectedCurrency = "5.789,99 \u20AC"; - String expectedPercent = "-578.999%"; + String expectedCurrency = "5.789,99\u00a0\u20AC"; + String expectedPercent = "-578.999\u00a0%"; formatter = NumberFormat.getNumberInstance(Locale.GERMANY); tempString = formatter.format (-5789.9876); @@ -698,7 +699,7 @@ public void Test4071859 () { String expectedPercent = "-578.998%"; */ String expectedDefault = "-5.789,988"; - String expectedCurrency = "-\u20AC 5.789,99"; + String expectedCurrency = "-5.789,99\u00a0\u20ac"; String expectedPercent = "-578.999%"; formatter = NumberFormat.getNumberInstance(Locale.ITALY); @@ -1641,12 +1642,13 @@ public void Test4212072() throws IOException, ClassNotFoundException { } // Test toLocalizedPattern/applyLocalizedPattern round trip - pat = df.toLocalizedPattern(); - f2.applyLocalizedPattern(pat); - if (!df.equals(f2)) { - fail("FAIL: " + avail[i] + " -> localized \"" + pat + - "\" -> \"" + f2.toPattern() + '"'); - } +// CLDR does not support localized patterns +// pat = df.toLocalizedPattern(); +// f2.applyLocalizedPattern(pat); +// if (!df.equals(f2)) { +// fail("FAIL: " + avail[i] + " -> localized \"" + pat + +// "\" -> \"" + f2.toPattern() + '"'); +// } // Test writeObject/readObject round trip ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/test/jdk/java/text/Format/NumberFormat/NumberTest.java b/test/jdk/java/text/Format/NumberFormat/NumberTest.java index fc24322ada9..bb3c9bee7b1 100644 --- a/test/jdk/java/text/Format/NumberFormat/NumberTest.java +++ b/test/jdk/java/text/Format/NumberFormat/NumberTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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,12 +23,12 @@ /** * @test - * @bug 4122840 4135202 4408066 4838107 8008577 + * @bug 4122840 4135202 4408066 4838107 8008577 8174269 * @summary test NumberFormat * @modules java.base/sun.util.resources * jdk.localedata * @compile -XDignore.symbol.file NumberTest.java - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI NumberTest + * @run junit NumberTest */ import java.util.*; @@ -228,20 +228,20 @@ public void TestCurrency() { NumberFormat.getCurrencyInstance(Locale.CANADA_FRENCH); String s = currencyFmt.format(1.50); System.out.println("Un pauvre ici a..........." + s); - if (!s.equals("1,50 $")) { - fail("FAIL: Expected 1,50 $; got " + s + "; "+ dumpFmt(currencyFmt)); + if (!s.equals("1,50\u00a0$")) { + fail("FAIL: Expected 1,50\u00a0$; got " + s + "; "+ dumpFmt(currencyFmt)); } currencyFmt = NumberFormat.getCurrencyInstance(Locale.GERMANY); s = currencyFmt.format(1.50); System.out.println("Un pauvre en Allemagne a.." + s); - if (!s.equals("1,50 \u20AC")) { - fail("FAIL: Expected 1,50 \u20AC; got " + s + "; " + dumpFmt(currencyFmt)); + if (!s.equals("1,50\u00a0\u20AC")) { + fail("FAIL: Expected 1,50\u00a0\u20AC; got " + s + "; " + dumpFmt(currencyFmt)); } currencyFmt = NumberFormat.getCurrencyInstance(Locale.FRANCE); s = currencyFmt.format(1.50); System.out.println("Un pauvre en France a....." + s); - if (!s.equals("1,50 \u20AC")) { - fail("FAIL: Expected 1,50 \u20AC; got " + s + "; " + dumpFmt(currencyFmt)); + if (!s.equals("1,50\u00a0\u20AC")) { + fail("FAIL: Expected 1,50\u00a0\u20AC; got " + s + "; " + dumpFmt(currencyFmt)); } } diff --git a/test/jdk/java/text/Format/NumberFormat/TestPeruCurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/TestPeruCurrencyFormat.java deleted file mode 100644 index 12403b022a8..00000000000 --- a/test/jdk/java/text/Format/NumberFormat/TestPeruCurrencyFormat.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2019, 2023, 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. - * - * 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. - */ - -/* - * @test - * @bug 8206879 - * @modules jdk.localedata - * @summary Currency decimal marker incorrect for Peru (COMPAT). - * @run junit/othervm -Djava.locale.providers=COMPAT TestPeruCurrencyFormat - */ - -import java.text.NumberFormat; -import java.util.Locale; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class TestPeruCurrencyFormat { - - // Confirm correct decimal marker for Peru locale on COMPAT - @Test - public void peruDecimalMarketCOMPAT() { - final String expected = "S/.1,234.56"; - NumberFormat currencyFmt = - NumberFormat.getCurrencyInstance(Locale.of("es", "PE")); - String s = currencyFmt.format(1234.56); - assertEquals(expected, s, - "Currency format for Peru failed, expected " + expected + ", got " + s); - } -} diff --git a/test/jdk/java/time/test/java/time/format/TestUTCParse.java b/test/jdk/java/time/test/java/time/format/TestUTCParse.java index c1766b47030..2c41af68281 100644 --- a/test/jdk/java/time/test/java/time/format/TestUTCParse.java +++ b/test/jdk/java/time/test/java/time/format/TestUTCParse.java @@ -23,18 +23,15 @@ /* * @test * @modules jdk.localedata - * @bug 8303440 8317979 8322647 + * @bug 8303440 8317979 8322647 8174269 * @summary Test parsing "UTC-XX:XX" text works correctly */ package test.java.time.format; import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.format.TextStyle; import java.time.temporal.TemporalQueries; -import java.util.Locale; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -42,12 +39,6 @@ public class TestUTCParse { - static { - // Assuming CLDR's SHORT name for "America/Manaus" - // produces "UTC\u221204:00" - System.setProperty("java.locale.providers", "CLDR"); - } - @DataProvider public Object[][] utcZoneIdStrings() { return new Object[][] { @@ -57,15 +48,6 @@ public Object[][] utcZoneIdStrings() { }; } - @Test - public void testUTCShortNameRoundTrip() { - var fmt = DateTimeFormatter.ofPattern("z", Locale.FRANCE); - var zdt = ZonedDateTime.of(2023, 3, 3, 0, 0, 0, 0, ZoneId.of("America/Manaus")); - var formatted = fmt.format(zdt); - assertEquals(formatted, "UTC\u221204:00"); - assertEquals(fmt.parse(formatted).query(TemporalQueries.zoneId()), zdt.getZone()); - } - @Test(dataProvider = "utcZoneIdStrings") public void testUTCOffsetRoundTrip(String zidString) { var fmt = new DateTimeFormatterBuilder() diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java index dbc912d1f23..224c0c05771 100644 --- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java +++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -52,6 +52,7 @@ /* * @test * @bug 8081022 8151876 8166875 8177819 8189784 8206980 8277049 8278434 + * 8174269 * @key randomness */ @@ -94,6 +95,10 @@ public void test_printText() { String shortDisplayName = tz.getDisplayName(isDST, TimeZone.SHORT, locale); if ((longDisplayName.startsWith("GMT+") && shortDisplayName.startsWith("GMT+")) || (longDisplayName.startsWith("GMT-") && shortDisplayName.startsWith("GMT-"))) { + // exclude ROOT + if (locale.equals(Locale.ROOT)) { + continue; + } printText(locale, zdt, TextStyle.FULL, tz, tz.getID()); printText(locale, zdt, TextStyle.SHORT, tz, tz.getID()); continue; diff --git a/test/jdk/java/util/Calendar/Bug8007038.java b/test/jdk/java/util/Calendar/Bug8007038.java index 5c363063578..874aaf10922 100644 --- a/test/jdk/java/util/Calendar/Bug8007038.java +++ b/test/jdk/java/util/Calendar/Bug8007038.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, 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,13 +23,12 @@ /* * @test - * @bug 8007038 8247781 - * @summary Verify ArrayIndexOutOfBoundsException is not thrown on + * @bug 8007038 8247781 8174269 + * @summary Verify ArrayIndexOutOfBoundsException is not thrown * on calling localizedDateTime().print() with JapaneseChrono * @modules java.base/sun.util.locale.provider * @modules jdk.localedata * @compile -XDignore.symbol.file Bug8007038.java - * @run main/othervm -Djava.locale.providers=COMPAT Bug8007038 COMPAT * @run main/othervm -Djava.locale.providers=CLDR Bug8007038 CLDR */ diff --git a/test/jdk/java/util/Calendar/Bug8167273.java b/test/jdk/java/util/Calendar/Bug8167273.java index 1899313453e..e4de858d4da 100644 --- a/test/jdk/java/util/Calendar/Bug8167273.java +++ b/test/jdk/java/util/Calendar/Bug8167273.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024, 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,24 +23,20 @@ /* * @test - * @bug 8167273 8251317 8258794 + * @bug 8167273 8251317 8258794 8174269 * @summary Test * Era names retrieved from Calendar and DateFormatSymbols class * should match for default providers preference - * as well as when preference list is [COMPAT, CLDR], - * Empty era names are not retrieved from DateformatSymbols class. + * Empty era names are not retrieved from DateFormatSymbols class. * Equivalent locales specified for [zh-HK, no-NO, no] for * CLDR Provider works correctly. - * Implict COMPAT Locale nb is reflected in available locales - * for all Providers for COMPAT. + * Implicit COMPAT Locale nb is reflected in available locales * @modules java.base/sun.util.locale.provider * java.base/sun.util.spi * jdk.localedata - * @run main/othervm -Djava.locale.providers=COMPAT,CLDR Bug8167273 testEraName - * @run main/othervm Bug8167273 testEraName + * @run main Bug8167273 testEraName * @run main/othervm -Djava.locale.providers=CLDR Bug8167273 testCldr - * @run main/othervm Bug8167273 testEmptyEraNames - * @run main/othervm -Djava.locale.providers=COMPAT Bug8167273 testCompat + * @run main Bug8167273 testEmptyEraNames */ import java.text.DateFormatSymbols; import java.util.Arrays; @@ -67,9 +63,6 @@ public static void main(String[] args) throws Exception { case "testCldr": testCldrSupportedLocales(); break; - case "testCompat": - testCompatSupportedLocale(); - break; default: throw new RuntimeException("no test was specified."); } @@ -157,44 +150,4 @@ private static void testCldrSupportedLocales() { throw new RuntimeException("Locale " + loc + " is not supported by CLDR Locale Provider"); }); } - - /** - * Tests that locale nb should be supported by JRELocaleProvider . - */ - private static void testCompatSupportedLocale() { - LocaleProviderAdapter jre = LocaleProviderAdapter.forJRE(); - checkPresenceCompat("BreakIteratorProvider", - jre.getBreakIteratorProvider().getAvailableLocales()); - checkPresenceCompat("CollatorProvider", - jre.getCollatorProvider().getAvailableLocales()); - checkPresenceCompat("DateFormatProvider", - jre.getDateFormatProvider().getAvailableLocales()); - checkPresenceCompat("DateFormatSymbolsProvider", - jre.getDateFormatSymbolsProvider().getAvailableLocales()); - checkPresenceCompat("DecimalFormatSymbolsProvider", - jre.getDecimalFormatSymbolsProvider().getAvailableLocales()); - checkPresenceCompat("NumberFormatProvider", - jre.getNumberFormatProvider().getAvailableLocales()); - checkPresenceCompat("CurrencyNameProvider", - jre.getCurrencyNameProvider().getAvailableLocales()); - checkPresenceCompat("LocaleNameProvider", - jre.getLocaleNameProvider().getAvailableLocales()); - checkPresenceCompat("TimeZoneNameProvider", - jre.getTimeZoneNameProvider().getAvailableLocales()); - checkPresenceCompat("CalendarDataProvider", - jre.getCalendarDataProvider().getAvailableLocales()); - checkPresenceCompat("CalendarNameProvider", - jre.getCalendarNameProvider().getAvailableLocales()); - checkPresenceCompat("CalendarProvider", - jre.getCalendarProvider().getAvailableLocales()); - } - - private static void checkPresenceCompat(String testName, Locale[] got) { - List gotLocalesList = Arrays.asList(got); - Locale nb = Locale.forLanguageTag("nb"); - if (!gotLocalesList.contains(nb)) { - throw new RuntimeException("Locale nb not supported by JREProvider for " - + testName + " test "); - } - } } diff --git a/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java b/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java index d5293a296bb..7c40714fc02 100644 --- a/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java +++ b/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, 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 @@ -30,12 +30,12 @@ /** * @test - * @bug 8262108 + * @bug 8262108 8174269 * @summary Verify the results returned by Calendar.getDisplayNames() API - * @comment Locale providers: COMPAT,SPI - * @run testng/othervm -Djava.locale.providers=COMPAT,SPI CalendarDisplayNamesTest - * @comment Locale providers: CLDR - * @run testng/othervm -Djava.locale.providers=CLDR CalendarDisplayNamesTest + * @comment Locale providers: CLDR,SPI + * @run testng/othervm -Djava.locale.providers=CLDR,SPI CalendarDisplayNamesTest + * @comment Locale providers: default + * @run testng CalendarDisplayNamesTest */ public class CalendarDisplayNamesTest { diff --git a/test/jdk/java/util/Calendar/JapanEraNameCompatTest.java b/test/jdk/java/util/Calendar/JapanEraNameCompatTest.java deleted file mode 100644 index b2e506597d9..00000000000 --- a/test/jdk/java/util/Calendar/JapanEraNameCompatTest.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) 2019, 2022, 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. - * - * 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. - */ - -/* - * @test - * @bug 8218781 - * @summary Test the localized names of Japanese era Reiwa from COMPAT provider. - * @modules jdk.localedata - * @run testng/othervm -Djava.locale.providers=COMPAT JapanEraNameCompatTest - */ - -import static java.util.Calendar.*; -import static java.util.Locale.*; - -import java.time.LocalDate; -import java.time.chrono.JapaneseChronology; -import java.time.chrono.JapaneseEra; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.time.format.TextStyle; -import java.util.Calendar; -import java.util.Locale; - -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; - -@Test -public class JapanEraNameCompatTest { - static final Calendar c = new Calendar.Builder() - .setCalendarType("japanese") - .setFields(ERA, 5, YEAR, 1, MONTH, MAY, DAY_OF_MONTH, 1) - .build(); - static final String EngName = "Reiwa"; - static final String CJName = "\u4ee4\u548c"; - static final String KoreanName = "\ub808\uc774\uc640"; - static final String ArabicName = "\u0631\u064a\u0648\u0627"; - static final String ThaiName = "\u0e40\u0e23\u0e27\u0e30"; - static final String HindiName = "\u0930\u0947\u0907\u0935\u093e"; - static final String RussianName = "\u0420\u044d\u0439\u0432\u0430"; - static final String SerbianName = "\u0420\u0435\u0438\u0432\u0430"; - static final String SerbLatinName = "Reiva"; - - @DataProvider(name="UtilCalendar") - Object[][] dataUtilCalendar() { - return new Object[][] { - //locale, long, short - { JAPAN, CJName, "R" }, - { KOREAN, KoreanName, "R" }, - { CHINA, CJName, "R" }, - { TAIWAN, CJName, "R" }, // fallback to zh - { Locale.of("ar"), ArabicName, ArabicName }, - { Locale.of("th"), ThaiName, "R" }, - // hi_IN fallback to root - { Locale.of("hi", "IN"), EngName, "R" } - }; - } - - @Test(dataProvider="UtilCalendar") - public void testCalendarEraDisplayName(Locale locale, - String longName, String shortName) { - assertEquals(c.getDisplayName(ERA, LONG, locale), longName); - assertEquals(c.getDisplayName(ERA, SHORT, locale), shortName); - } - - @DataProvider(name="JavaTime") - Object[][] dataJavaTime() { - return new Object[][] { - // locale, full, short - { JAPAN, CJName, CJName }, - { KOREAN, KoreanName, KoreanName }, - { CHINA, CJName, CJName }, - { TAIWAN, CJName, CJName }, - { Locale.of("ar"), ArabicName, ArabicName }, - { Locale.of("th"), ThaiName, ThaiName }, - { Locale.of("hi", "IN"), HindiName, HindiName }, - { Locale.of("ru"), RussianName, RussianName }, - { Locale.of("sr"), SerbianName, SerbianName }, - { Locale.forLanguageTag("sr-Latn"), SerbLatinName, SerbLatinName }, - { Locale.of("hr"), EngName, EngName }, - { Locale.of("in"), EngName, EngName }, - { Locale.of("lt"), EngName, EngName }, - { Locale.of("nl"), EngName, EngName }, - { Locale.of("no"), EngName, "R" }, - { Locale.of("sv"), EngName, EngName }, - // el fallback to root - { Locale.of("el"), EngName, EngName } - }; - } - - @Test(dataProvider="JavaTime") - public void testChronoJapanEraDisplayName(Locale locale, - String fullName, String shortName) { - - JapaneseEra era = JapaneseEra.valueOf("Reiwa"); - assertEquals(era.getDisplayName(TextStyle.FULL, locale), fullName); - assertEquals(era.getDisplayName(TextStyle.SHORT, locale), shortName); - assertEquals(era.getDisplayName(TextStyle.NARROW, locale), "R"); - } - - @Test - public void testFormatParseEraName() { - LocalDate date = LocalDate.of(2019, 5, 1); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy MM dd GGGG"); - formatter = formatter.withChronology(JapaneseChronology.INSTANCE); - - int num = 0; - for (Locale locale : Calendar.getAvailableLocales()) { - formatter = formatter.withLocale(locale); - try { - LocalDate.parse(date.format(formatter), formatter); - } catch (DateTimeParseException e) { - // If an array is defined for Japanese eras in java.time resource, - // but an era entry is missing, format fallback to English name - // while parse throw DateTimeParseException. - num++; - System.out.println("Missing java.time resource data for locale: " + locale); - } - } - if (num > 0) { - throw new RuntimeException("Missing java.time data for " + num + " locales"); - } - } -} diff --git a/test/jdk/java/util/Calendar/NarrowNamesTest.java b/test/jdk/java/util/Calendar/NarrowNamesTest.java index 2f3720b78c7..ab79e339444 100644 --- a/test/jdk/java/util/Calendar/NarrowNamesTest.java +++ b/test/jdk/java/util/Calendar/NarrowNamesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,13 +23,13 @@ /* * @test - * @bug 8000983 8008577 8247781 8262108 + * @bug 8000983 8008577 8247781 8262108 8174269 * @summary Unit test for narrow names support. This test is locale data-dependent * and assumes that both COMPAT and CLDR have the same narrow names if not * explicitly specified. * @modules jdk.localedata - * @comment Locale providers: COMPAT,SPI - * @run main/othervm -Djava.locale.providers=COMPAT,SPI NarrowNamesTest COMPAT,SPI + * @comment Locale providers: CLDR,SPI + * @run main/othervm -Djava.locale.providers=CLDR,SPI NarrowNamesTest CLDR,SPI * @comment Locale providers: CLDR * @run main/othervm -Djava.locale.providers=CLDR NarrowNamesTest CLDR */ diff --git a/test/jdk/java/util/Formatter/spi/FormatterWithProvider.java b/test/jdk/java/util/Formatter/spi/FormatterWithProvider.java index 8c0eddc7bd6..90e16725831 100644 --- a/test/jdk/java/util/Formatter/spi/FormatterWithProvider.java +++ b/test/jdk/java/util/Formatter/spi/FormatterWithProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2024, 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 @@ -22,15 +22,15 @@ */ /* * @test - * @bug 8199672 + * @bug 8199672 8174269 * @summary test the Formatter.format() method with java.locale.providers=SPI, - * COMPAT. It should not throw ClassCastException if an SPI is + * CLDR. It should not throw ClassCastException if an SPI is * used and NumberFormat.getInstance() does not return a * DecimalFormat object. * @modules jdk.localedata * @library provider * @build provider/module-info provider/test.NumberFormatProviderImpl - * @run main/othervm -Djava.locale.providers=SPI,COMPAT FormatterWithProvider + * @run main/othervm -Djava.locale.providers=SPI,CLDR FormatterWithProvider */ import java.util.Formatter; @@ -51,7 +51,7 @@ public static void main(String[] args) { } catch (ClassCastException ex) { throw new RuntimeException("[FAILED: A ClassCastException is" + " thrown while using Formatter.format() with VM" + - " argument java.locale.providers=SPI,COMPAT]", ex); + " argument java.locale.providers=SPI,CLDR]", ex); } } diff --git a/test/jdk/java/util/Formatter/spi/NoGroupingUsed.java b/test/jdk/java/util/Formatter/spi/NoGroupingUsed.java index 1ff86cec801..943494986e7 100644 --- a/test/jdk/java/util/Formatter/spi/NoGroupingUsed.java +++ b/test/jdk/java/util/Formatter/spi/NoGroupingUsed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2024, 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 @@ -22,13 +22,13 @@ */ /* * @test - * @bug 8196399 8202537 + * @bug 8196399 8202537 8174269 * @summary test Formatter if any ArithmeticException is thrown while * formatting a number in the locale which does not use any * grouping, but specifies a grouping separator. * @library provider * @build provider/module-info provider/test.NumberFormatProviderImpl - * @run main/othervm -Djava.locale.providers=SPI,COMPAT NoGroupingUsed + * @run main/othervm -Djava.locale.providers=SPI,CLDR NoGroupingUsed */ import java.util.Formatter; diff --git a/test/jdk/java/util/Locale/CompareProviderFormats.java b/test/jdk/java/util/Locale/CompareProviderFormats.java deleted file mode 100644 index 225043624c7..00000000000 --- a/test/jdk/java/util/Locale/CompareProviderFormats.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2016, 2023, 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. - * - * 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. - */ - -/* - * @test - * @bug 8154797 - * @modules java.base/sun.util.locale.provider - * java.base/sun.util.resources - * jdk.localedata - * @summary Test for checking HourFormat and GmtFormat resources are retrieved from - * COMPAT and CLDR Providers. - * @run junit CompareProviderFormats -*/ - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; -import java.util.stream.Stream; - -import sun.util.locale.provider.LocaleProviderAdapter.Type; -import sun.util.locale.provider.LocaleProviderAdapter; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - -public class CompareProviderFormats { - static Map expectedResourcesMap = new HashMap<>(); - static final String GMT_RESOURCE_KEY = "timezone.gmtFormat"; - static final String HMT_RESOURCE_KEY = "timezone.hourFormat"; - static final String GMT = "Gmt"; - static final String HMT = "Hmt"; - - /** - * Fill the expectedResourcesMap with the desired key / values - */ - @BeforeAll - static void populateResourcesMap() { - expectedResourcesMap.put("FR" + GMT, "UTC{0}"); - expectedResourcesMap.put("FR" + HMT, "+HH:mm;\u2212HH:mm"); - expectedResourcesMap.put("FI" + HMT, "+H.mm;-H.mm"); - expectedResourcesMap.put("FI" + GMT, "UTC{0}"); - /* For root locale, en_US, de_DE, hi_IN, ja_JP, Root locale resources - * should be returned. - */ - expectedResourcesMap.put(GMT, "GMT{0}"); // Root locale resource - expectedResourcesMap.put(HMT, "+HH:mm;-HH:mm"); // Root locale resource - } - - /** - * For each locale, ensure that the returned resources for gmt and hmt match - * the expected resources for both COMPAT and CLDR - */ - @ParameterizedTest - @MethodSource("localeProvider") - public void compareResourcesTest(Locale loc) { - compareResources(loc); - } - - private void compareResources(Locale loc) { - String mapKeyHourFormat = HMT, mapKeyGmtFormat = GMT; - ResourceBundle compatBundle, cldrBundle; - compatBundle = LocaleProviderAdapter.forJRE().getLocaleResources(loc) - .getJavaTimeFormatData(); - cldrBundle = LocaleProviderAdapter.forType(Type.CLDR) - .getLocaleResources(loc).getJavaTimeFormatData(); - - if (loc.getCountry().equals("FR") || loc.getCountry().equals("FI")) { - mapKeyHourFormat = loc.getCountry() + HMT; - mapKeyGmtFormat = loc.getCountry() + GMT; - } - - if (!(expectedResourcesMap.get(mapKeyGmtFormat) - .equals(compatBundle.getString(GMT_RESOURCE_KEY)) - && expectedResourcesMap.get(mapKeyHourFormat) - .equals(compatBundle.getString(HMT_RESOURCE_KEY)) - && expectedResourcesMap.get(mapKeyGmtFormat) - .equals(cldrBundle.getString(GMT_RESOURCE_KEY)) - && expectedResourcesMap.get(mapKeyHourFormat) - .equals(cldrBundle.getString(HMT_RESOURCE_KEY)))) { - throw new RuntimeException("Retrieved resource does not match with " - + " expected string for Locale " + compatBundle.getLocale()); - } - } - - private static Stream localeProvider() { - return Stream.of( - Locale.of("hi", "IN"), - Locale.UK, Locale.of("fi", "FI"), - Locale.ROOT, Locale.GERMAN, Locale.JAPANESE, - Locale.ENGLISH, Locale.FRANCE - ); - } -} diff --git a/test/jdk/java/util/Locale/CompatWarning.java b/test/jdk/java/util/Locale/CompatWarning.java index 4e24c8ebff4..e3fe086661e 100644 --- a/test/jdk/java/util/Locale/CompatWarning.java +++ b/test/jdk/java/util/Locale/CompatWarning.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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,10 +23,14 @@ /* * @test - * @bug 8304982 + * @bug 8304982 8174269 * @summary Check if a warning is logged with COMPAT locale provider * @run main/othervm -Djava.locale.providers=COMPAT CompatWarning + * @run main/othervm -Djava.locale.providers=SPI,COMPAT CompatWarning + * @run main/othervm -Djava.locale.providers=COMPAT,SPI CompatWarning * @run main/othervm -Djava.locale.providers=JRE CompatWarning + * @run main/othervm -Djava.locale.providers=SPI,JRE CompatWarning + * @run main/othervm -Djava.locale.providers=JRE,SPI CompatWarning */ import java.io.File; @@ -38,7 +42,7 @@ public class CompatWarning { private static final String WARNING = - "COMPAT locale provider will be removed in a future release"; + "COMPAT locale provider has been removed"; private static boolean logged; public static void main(String[] args) throws Throwable { diff --git a/test/jdk/java/util/Locale/ExpectedAdapterTypes.java b/test/jdk/java/util/Locale/ExpectedAdapterTypes.java index 60c24b01fb5..eec19466b08 100644 --- a/test/jdk/java/util/Locale/ExpectedAdapterTypes.java +++ b/test/jdk/java/util/Locale/ExpectedAdapterTypes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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,7 +23,7 @@ /* * @test - * @bug 8008577 8138613 + * @bug 8008577 8138613 8174269 * @summary Check whether CLDR locale provider adapter is enabled by default * @compile -XDignore.symbol.file ExpectedAdapterTypes.java * @modules java.base/sun.util.locale.provider @@ -42,7 +42,7 @@ public class ExpectedAdapterTypes { static final LocaleProviderAdapter.Type[] expected = { LocaleProviderAdapter.Type.CLDR, - LocaleProviderAdapter.Type.JRE, + LocaleProviderAdapter.Type.FALLBACK, }; /** diff --git a/test/jdk/java/util/Locale/InternationalBAT.java b/test/jdk/java/util/Locale/InternationalBAT.java index 0b2de901b37..0b68cd17425 100644 --- a/test/jdk/java/util/Locale/InternationalBAT.java +++ b/test/jdk/java/util/Locale/InternationalBAT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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 @@ -22,13 +22,13 @@ */ /* * @test - * @bug 4449637 8008577 + * @bug 4449637 8008577 8174269 * @summary Basic acceptance test for international J2RE. Verifies that the * most important locale data and character converters exist and are * minimally functional. * @modules jdk.localedata * jdk.charsets - * @run main/othervm -Djava.locale.providers=JRE,SPI InternationalBAT + * @run main InternationalBAT */ import java.io.UnsupportedEncodingException; @@ -93,26 +93,26 @@ public static void main(String[] args) { // Date strings for May 10, 2001, for the required locales private static String[] requiredLocaleDates = { - "10 \u0645\u0627\u064A\u0648, 2001", - "2001\u5E745\u670810\u65E5 \u661F\u671F\u56DB", + "\u0627\u0644\u062e\u0645\u064a\u0633\u060c \u0661\u0660 \u0645\u0627\u064a\u0648 \u0662\u0660\u0660\u0661", + "2001\u5e745\u670810\u65e5\u661f\u671f\u56db", "2001\u5E745\u670810\u65E5 \u661F\u671F\u56DB", "donderdag 10 mei 2001", - "Thursday, 10 May 2001", + "Thursday 10 May 2001", "Thursday, May 10, 2001", - "Thursday, 10 May 2001", + "Thursday 10 May 2001", "Thursday, May 10, 2001", "jeudi 10 mai 2001", "jeudi 10 mai 2001", "Donnerstag, 10. Mai 2001", - "\u05D9\u05D5\u05DD \u05D7\u05DE\u05D9\u05E9\u05D9 10 \u05DE\u05D0\u05D9 2001", - "\u0917\u0941\u0930\u0941\u0935\u093E\u0930, \u0967\u0966 \u092E\u0908, \u0968\u0966\u0966\u0967", + "\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9, 10 \u05d1\u05de\u05d0\u05d9 2001", + "\u0917\u0941\u0930\u0941\u0935\u093e\u0930, 10 \u092e\u0908 2001", "gioved\u00EC 10 maggio 2001", - "2001\u5E745\u670810\u65E5", // ja_JP + "2001\u5e745\u670810\u65e5\u6728\u66dc\u65e5", // ja_JP "2001\uB144 5\uC6D4 10\uC77C \uBAA9\uC694\uC77C", - "Quinta-feira, 10 de Maio de 2001", - "jueves 10 de mayo de 2001", - "den 10 maj 2001", - "\u0E27\u0E31\u0E19\u0E1E\u0E24\u0E2B\u0E31\u0E2A\u0E1A\u0E14\u0E35\u0E17\u0E35\u0E48 10 \u0E1E\u0E24\u0E29\u0E20\u0E32\u0E04\u0E21 \u0E1E.\u0E28. 2544", + "quinta-feira, 10 de maio de 2001", + "jueves, 10 de mayo de 2001", + "torsdag 10 maj 2001", + "\u0e27\u0e31\u0e19\u0e1e\u0e24\u0e2b\u0e31\u0e2a\u0e1a\u0e14\u0e35\u0e17\u0e35\u0e48 10 \u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21 \u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a 2544", }; private static boolean testRequiredLocales() { @@ -206,26 +206,26 @@ private static boolean testRequiredLocales() { // expected conversion results for the date strings of the sample locales private static byte[][] expectedBytes = { - { 0x31, 0x30, 0x20, (byte) 0xE3, (byte) 0xC7, (byte) 0xED, (byte) 0xE6, 0x2C, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, 0x20, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4}, + { (byte) 0xC7, (byte) 0xE1, (byte) 0xCE, (byte) 0xE3, (byte) 0xED, (byte) 0xD3, (byte) 0xA1, 0x20, 0x3F, 0x3F, 0x20, (byte) 0xE3, (byte) 0xC7, (byte) 0xED, (byte) 0xE6, 0x20, 0x3F, 0x3F, 0x3F, 0x3F, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4, }, { 0x32, 0x30, 0x30, 0x31, (byte) 0xA6, 0x7E, 0x35, (byte) 0xA4, (byte) 0xEB, 0x31, 0x30, (byte) 0xA4, (byte) 0xE9, 0x20, (byte) 0xAC, (byte)0x50, (byte) 0xB4, (byte) 0xC1, (byte) 0xA5, (byte) 0x7C}, - { (byte) 0xE9, (byte) 0xE5, (byte) 0xED, 0x20, (byte) 0xE7, (byte) 0xEE, (byte) 0xE9, (byte) 0xF9, (byte) 0xE9, 0x20, 0x31, 0x30, 0x20, (byte) 0xEE, (byte) 0xE0, (byte) 0xE9, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { 0x32, 0x30, 0x30, 0x31, (byte) 0x94, 0x4E, 0x35, (byte) 0x8C, (byte) 0x8E, 0x31, 0x30, (byte) 0x93, (byte) 0xFA, }, + { (byte) 0xE9, (byte) 0xE5, (byte) 0xED, 0x20, (byte) 0xE7, (byte) 0xEE, (byte) 0xE9, (byte) 0xF9, (byte) 0xE9, 0x2C, 0x20, 0x31, 0x30, 0x20, (byte) 0xE1, (byte) 0xEE, (byte) 0xE0, (byte) 0xE9, 0x20, 0x32, 0x30, 0x30, 0x31, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0x94, 0x4E, 0x35, (byte) 0x8C, (byte) 0x8E, 0x31, 0x30, (byte) 0x93, (byte) 0xFA, (byte) 0x96, (byte) 0xD8, (byte) 0x97, 0x6A, (byte) 0x93, (byte) 0xFA, }, { 0x32, 0x30, 0x30, 0x31, (byte) 0xB3, (byte) 0xE2, 0x20, 0x35, (byte) 0xBF, (byte) 0xF9, 0x20, 0x31, 0x30, (byte) 0xC0, (byte) 0xCF, 0x20, (byte) 0xB8, (byte) 0xF1, (byte) 0xBF, (byte) 0xE4, (byte) 0xC0, (byte) 0xCF, }, { 0x67, 0x69, 0x6F, 0x76, 0x65, 0x64, (byte) 0xEC, 0x20, 0x31, 0x30, 0x20, 0x6D, 0x61, 0x67, 0x67, 0x69, 0x6F, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { (byte) 0xC7, (byte) 0xD1, (byte) 0xB9, (byte) 0xBE, (byte) 0xC4, (byte) 0xCB, (byte) 0xD1, (byte) 0xCA, (byte) 0xBA, (byte) 0xB4, (byte) 0xD5, (byte) 0xB7, (byte) 0xD5, (byte) 0xE8, 0x20, 0x31, 0x30, 0x20, (byte) 0xBE, (byte) 0xC4, (byte) 0xC9, (byte) 0xC0, (byte) 0xD2, (byte) 0xA4, (byte) 0xC1, 0x20, (byte) 0xBE, 0x2E, (byte) 0xC8, 0x2E, 0x20, 0x32, 0x35, 0x34, 0x34, }, - { 0x31, 0x30, 0x20, (byte) 0xE5, (byte) 0xC7, (byte) 0xEA, (byte) 0xE8, 0x2C, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, 0x20, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4}, - { 0x32, 0x30, 0x30, 0x31, (byte) 0xE5, (byte) 0xB9, (byte) 0xB4, 0x35, (byte) 0xE6, (byte) 0x9C, (byte) 0x88, 0x31, 0x30, (byte) 0xE6, (byte) 0x97, (byte) 0xA5, 0x20, (byte) 0xE6, (byte)0x98, (byte) 0x9F, (byte) 0xE6, (byte) 0x9C, (byte) 0x9F, (byte) 0xE5, (byte) 0x9B, (byte) 0x9B}, - { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, 0x20, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4}, + { (byte) 0xC7, (byte) 0xD1, (byte) 0xB9, (byte) 0xBE, (byte) 0xC4, (byte) 0xCB, (byte) 0xD1, (byte) 0xCA, (byte) 0xBA, (byte) 0xB4, (byte) 0xD5, (byte) 0xB7, (byte) 0xD5, (byte) 0xE8, 0x20, 0x31, 0x30, 0x20, (byte) 0xBE, (byte) 0xC4, (byte) 0xC9, (byte) 0xC0, (byte) 0xD2, (byte) 0xA4, (byte) 0xC1, 0x20, (byte) 0xBE, (byte) 0xD8, (byte) 0xB7, (byte) 0xB8, (byte) 0xC8, (byte) 0xD1, (byte) 0xA1, (byte) 0xC3, (byte) 0xD2, (byte) 0xAA, 0x20, 0x32, 0x35, 0x34, 0x34, }, + { (byte) 0xC7, (byte) 0xE4, (byte) 0xCE, (byte) 0xE5, (byte) 0xEA, (byte) 0xD3, (byte) 0xAC, 0x20, 0x3F, 0x3F, 0x20, (byte) 0xE5, (byte) 0xC7, (byte) 0xEA, (byte) 0xE8, 0x20, 0x3F, 0x3F, 0x3F, 0x3F, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0xE5, (byte) 0xB9, (byte) 0xB4, 0x35, (byte) 0xE6, (byte) 0x9C, (byte) 0x88, 0x31, 0x30, (byte) 0xE6, (byte) 0x97, (byte) 0xA5, (byte) 0xE6, (byte) 0x98, (byte) 0x9F, (byte) 0xE6, (byte) 0x9C, (byte) 0x9F, (byte) 0xE5, (byte) 0x9B, (byte) 0x9B, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0xC4, (byte) 0xEA, 0x35, (byte) 0xD4, (byte) 0xC2, 0x31, 0x30, (byte) 0xC8, (byte) 0xD5, (byte) 0xD0, (byte) 0xC7, (byte) 0xC6, (byte) 0xDA, (byte) 0xCB, (byte) 0xC4, }, { 0x32, 0x30, 0x30, 0x31, (byte) 0xC8, (byte) 0xA1, 0x35, (byte) 0xC5, (byte) 0xCC, 0x31, 0x30, (byte) 0xC5, (byte) 0xCA, 0x20, (byte) 0xD1, (byte) 0xD3, (byte) 0xDF, (byte) 0xE6, (byte) 0xC6, (byte) 0xBE}, - { (byte) 0xE9, (byte) 0xE5, (byte) 0xED, 0x20, (byte) 0xE7, (byte) 0xEE, (byte) 0xE9, (byte) 0xF9, (byte) 0xE9, 0x20, 0x31, 0x30, 0x20, (byte) 0xEE, (byte) 0xE0, (byte) 0xE9, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { 0x32, 0x30, 0x30, 0x31, (byte) 0xC7, (byte) 0xAF, 0x35, (byte) 0xB7, (byte) 0xEE, 0x31, 0x30, (byte) 0xC6, (byte) 0xFC, }, - { 0x32, 0x30, 0x30, 0x31, (byte) 0x94, 0x4E, 0x35, (byte) 0x8C, (byte) 0x8E, 0x31, 0x30, (byte) 0x93, (byte) 0xFA, }, + { (byte) 0xE9, (byte) 0xE5, (byte) 0xED, 0x20, (byte) 0xE7, (byte) 0xEE, (byte) 0xE9, (byte) 0xF9, (byte) 0xE9, 0x2C, 0x20, 0x31, 0x30, 0x20, (byte) 0xE1, (byte) 0xEE, (byte) 0xE0, (byte) 0xE9, 0x20, 0x32, 0x30, 0x30, 0x31, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0xC7, (byte) 0xAF, 0x35, (byte) 0xB7, (byte) 0xEE, 0x31, 0x30, (byte) 0xC6, (byte) 0xFC, (byte) 0xCC, (byte) 0xDA, (byte) 0xCD, (byte) 0xCB, (byte) 0xC6, (byte) 0xFC, }, + { 0x32, 0x30, 0x30, 0x31, (byte) 0x94, 0x4E, 0x35, (byte) 0x8C, (byte) 0x8E, 0x31, 0x30, (byte) 0x93, (byte) 0xFA, (byte) 0x96, (byte) 0xD8, (byte) 0x97, 0x6A, (byte) 0x93, (byte) 0xFA, }, { 0x32, 0x30, 0x30, 0x31, (byte) 0xB3, (byte) 0xE2, 0x20, 0x35, (byte) 0xBF, (byte) 0xF9, 0x20, 0x31, 0x30, (byte) 0xC0, (byte) 0xCF, 0x20, (byte) 0xB8, (byte) 0xF1, (byte) 0xBF, (byte) 0xE4, (byte) 0xC0, (byte) 0xCF, }, { 0x67, 0x69, 0x6F, 0x76, 0x65, 0x64, (byte) 0xEC, 0x20, 0x31, 0x30, 0x20, 0x6D, 0x61, 0x67, 0x67, 0x69, 0x6F, 0x20, 0x32, 0x30, 0x30, 0x31, }, { 0x67, 0x69, 0x6F, 0x76, 0x65, 0x64, (byte) 0xEC, 0x20, 0x31, 0x30, 0x20, 0x6D, 0x61, 0x67, 0x67, 0x69, 0x6F, 0x20, 0x32, 0x30, 0x30, 0x31, }, - { (byte) 0xC7, (byte) 0xD1, (byte) 0xB9, (byte) 0xBE, (byte) 0xC4, (byte) 0xCB, (byte) 0xD1, (byte) 0xCA, (byte) 0xBA, (byte) 0xB4, (byte) 0xD5, (byte) 0xB7, (byte) 0xD5, (byte) 0xE8, 0x20, 0x31, 0x30, 0x20, (byte) 0xBE, (byte) 0xC4, (byte) 0xC9, (byte) 0xC0, (byte) 0xD2, (byte) 0xA4, (byte) 0xC1, 0x20, (byte) 0xBE, 0x2E, (byte) 0xC8, 0x2E, 0x20, 0x32, 0x35, 0x34, 0x34, }, + { (byte) 0xC7, (byte) 0xD1, (byte) 0xB9, (byte) 0xBE, (byte) 0xC4, (byte) 0xCB, (byte) 0xD1, (byte) 0xCA, (byte) 0xBA, (byte) 0xB4, (byte) 0xD5, (byte) 0xB7, (byte) 0xD5, (byte) 0xE8, 0x20, 0x31, 0x30, 0x20, (byte) 0xBE, (byte) 0xC4, (byte) 0xC9, (byte) 0xC0, (byte) 0xD2, (byte) 0xA4, (byte) 0xC1, 0x20, (byte) 0xBE, (byte) 0xD8, (byte) 0xB7, (byte) 0xB8, (byte) 0xC8, (byte) 0xD1, (byte) 0xA1, (byte) 0xC3, (byte) 0xD2, (byte) 0xAA, 0x20, 0x32, 0x35, 0x34, 0x34, }, }; diff --git a/test/jdk/java/util/Locale/LocaleEnhanceTest.java b/test/jdk/java/util/Locale/LocaleEnhanceTest.java index ae796300231..b64bbab7ac9 100644 --- a/test/jdk/java/util/Locale/LocaleEnhanceTest.java +++ b/test/jdk/java/util/Locale/LocaleEnhanceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2024, 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 @@ -48,11 +48,11 @@ /** * @test * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 - * 7044019 8008577 8176853 8255086 8263202 8287868 + * 7044019 8008577 8176853 8255086 8263202 8287868 8174269 * @summary test API changes to Locale * @modules jdk.localedata * @compile LocaleEnhanceTest.java - * @run junit/othervm -Djava.locale.providers=JRE,SPI -esa LocaleEnhanceTest + * @run junit/othervm -esa LocaleEnhanceTest */ public class LocaleEnhanceTest { @@ -668,11 +668,11 @@ public void testGetDisplayName() { "English", "English (United States)", "United States", - "Norwegian (Norway,Nynorsk)", + "Norwegian (Norway, Nynorsk)", "Nynorsk", "Chinese (Simplified)", "Chinese (Traditional)", - "Chinese (Simplified,China)", + "Chinese (Simplified, China)", "Simplified", }; @@ -681,11 +681,11 @@ public void testGetDisplayName() { "\u82f1\u8bed", "\u82f1\u8bed (\u7f8e\u56fd)", "\u7f8e\u56fd", - "\u632a\u5a01\u8bed (\u632a\u5a01,Nynorsk)", + "\u632a\u5a01\u8bed (\u632a\u5a01\uff0cNynorsk)", "Nynorsk", "\u4e2d\u6587 (\u7b80\u4f53)", "\u4e2d\u6587 (\u7e41\u4f53)", - "\u4e2d\u6587 (\u7b80\u4f53,\u4e2d\u56fd)", + "\u4e2d\u6587 (\u7b80\u4f53\uff0c\u4e2d\u56fd)", "\u7b80\u4f53", }; diff --git a/test/jdk/java/util/Locale/LocaleProviders.java b/test/jdk/java/util/Locale/LocaleProviders.java index 556409fb650..c96718f0fba 100644 --- a/test/jdk/java/util/Locale/LocaleProviders.java +++ b/test/jdk/java/util/Locale/LocaleProviders.java @@ -267,18 +267,10 @@ static void bug8013903Test() { sdf.setTimeZone(TimeZone.getTimeZone("America/Los_Angeles")); String result = sdf.format(sampleDate); System.out.println(result); - if (LocaleProviderAdapter.getAdapterPreference() - .contains(LocaleProviderAdapter.Type.JRE)) { - if (!expected.equals(result)) { - throw new RuntimeException("Format failed. result: \"" + - result + "\", expected: \"" + expected); - } - } else { - // Windows display names. Subject to change if Windows changes its format. - if (!expected.equals(result)) { - throw new RuntimeException("Format failed. result: \"" + - result + "\", expected: \"" + expected); - } + // Windows display names. Subject to change if Windows changes its format. + if (!expected.equals(result)) { + throw new RuntimeException("Format failed. result: \"" + + result + "\", expected: \"" + expected); } } } diff --git a/test/jdk/java/util/Locale/LocaleProvidersFormat.java b/test/jdk/java/util/Locale/LocaleProvidersFormat.java index 0584b82b318..5d3f1fc2e2e 100644 --- a/test/jdk/java/util/Locale/LocaleProvidersFormat.java +++ b/test/jdk/java/util/Locale/LocaleProvidersFormat.java @@ -23,7 +23,7 @@ /* * @test - * @bug 7198834 8001440 8013086 8013903 8027289 8232860 + * @bug 7198834 8001440 8013086 8013903 8027289 8232860 8174269 * @summary Test any java.text.Format Locale provider related issues * @library /test/lib * @build LocaleProviders @@ -68,8 +68,7 @@ public void formatWithInvalidLocaleExtension() throws Throwable { */ @Test public void simpleDateFormatWithTZNProvider() throws Throwable { - LocaleProviders.test("JRE,SPI", "bug8013086Test", "ja", "JP"); - LocaleProviders.test("COMPAT,SPI", "bug8013086Test", "ja", "JP"); + LocaleProviders.test("FALLBACK,SPI", "bug8013086Test", "ja", "JP"); } /* @@ -78,10 +77,10 @@ public void simpleDateFormatWithTZNProvider() throws Throwable { */ @Test @EnabledOnOs(WINDOWS) + @EnabledIfSystemProperty(named = "user.language", matches = "ja") + @EnabledIfSystemProperty(named = "user.country", matches = "JP") public void windowsJapaneseDateFields() throws Throwable { - LocaleProviders.test("HOST,JRE", "bug8013903Test"); LocaleProviders.test("HOST", "bug8013903Test"); - LocaleProviders.test("HOST,COMPAT", "bug8013903Test"); } /* @@ -93,8 +92,7 @@ public void windowsJapaneseDateFields() throws Throwable { @EnabledIfSystemProperty(named = "user.language", matches = "zh") @EnabledIfSystemProperty(named = "user.country", matches = "CN") public void windowsChineseCurrencySymbol() throws Throwable { - LocaleProviders.test("JRE,HOST", "bug8027289Test", "FFE5"); - LocaleProviders.test("COMPAT,HOST", "bug8027289Test", "FFE5"); + LocaleProviders.test("FALLBACK,HOST", "bug8027289Test", "FFE5"); LocaleProviders.test("HOST", "bug8027289Test", "00A5"); } diff --git a/test/jdk/java/util/Locale/LocaleProvidersRun.java b/test/jdk/java/util/Locale/LocaleProvidersRun.java index 7b6e87247a0..4d7331f5d15 100644 --- a/test/jdk/java/util/Locale/LocaleProvidersRun.java +++ b/test/jdk/java/util/Locale/LocaleProvidersRun.java @@ -24,13 +24,14 @@ /* * @test * @bug 6336885 7196799 7197573 8008577 8010666 8013233 8015960 8028771 - * 8054482 8062006 8150432 8215913 8220227 8236495 + * 8054482 8062006 8150432 8215913 8220227 8236495 8174269 * @summary General Locale provider test (ex: adapter loading). See the * other LocaleProviders* test classes for more specific tests (ex: * java.text.Format related bugs). * @library /test/lib * @build LocaleProviders * @modules java.base/sun.util.locale.provider + * jdk.localedata * @run junit/othervm LocaleProvidersRun */ @@ -94,13 +95,13 @@ public void adapterTest(String prefList, String param1, private static Stream adapterTest() { // Testing HOST is selected for the default locale if specified on Windows or MacOSX String osName = System.getProperty("os.name"); - String param1 = "JRE"; + String param1 = "FALLBACK"; if (osName.startsWith("Windows") || osName.startsWith("Mac")) { param1 = "HOST"; } // Testing HOST is NOT selected for the non-default locale, if specified - // try to find the locale JRE supports which is not the platform default + // try to find the locale CLDR supports which is not the platform default // (HOST supports that one) String param2; String param3; @@ -116,27 +117,25 @@ private static Stream adapterTest() { } return Stream.of( - Arguments.of("HOST,JRE", param1, defLang, defCtry), - Arguments.of("HOST,JRE", "JRE", param2, param3), + Arguments.of("HOST", param1, defLang, defCtry), + Arguments.of("HOST", "FALLBACK", param2, param3), // Testing SPI is NOT selected, as there is none. - Arguments.of("SPI,JRE", "JRE", "en", "US"), - Arguments.of("SPI,COMPAT", "JRE", "en", "US"), - - // Testing the order, variant #1. This assumes en_GB DateFormat data are - // available both in JRE & CLDR - Arguments.of("CLDR,JRE", "CLDR", "en", "GB"), - Arguments.of("CLDR,COMPAT", "CLDR", "en", "GB"), - - // Testing the order, variant #2. This assumes en_GB DateFormat data are - // available both in JRE & CLDR - Arguments.of("JRE,CLDR", "JRE", "en", "GB"), - Arguments.of("COMPAT,CLDR", "JRE", "en", "GB"), - - // Testing the order, variant #3 for non-existent locale in JRE - // assuming "haw" is not in JRE. - Arguments.of("JRE,CLDR", "CLDR", "haw", ""), - Arguments.of("COMPAT,CLDR", "CLDR", "haw", ""), + Arguments.of("SPI,FALLBACK", "FALLBACK", "en", "US"), + Arguments.of("SPI", "FALLBACK", "en", "US"), + + // Testing the order, variant #1. This assumes root DateFormat data are + // available both in FALLBACK & CLDR + Arguments.of("CLDR,FALLBACK", "CLDR", "", ""), + Arguments.of("CLDR", "CLDR", "", ""), + + // Testing the order, variant #2. This assumes root DateFormat data are + // available both in FALLBACK & CLDR + Arguments.of("FALLBACK,CLDR", "FALLBACK", "", ""), + + // Testing the order, variant #3 for non-existent locale in FALLBACK + // assuming "haw" is not in FALLBACK. + Arguments.of("FALLBACK,CLDR", "CLDR", "haw", ""), // Testing the order, variant #4 for the bug 7196799. CLDR's "zh" data // should be used in "zh_CN" diff --git a/test/jdk/java/util/Locale/LocaleTest.java b/test/jdk/java/util/Locale/LocaleTest.java index 7cbda6dc70d..c6afbc099ae 100644 --- a/test/jdk/java/util/Locale/LocaleTest.java +++ b/test/jdk/java/util/Locale/LocaleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,11 +25,11 @@ * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613 * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951 * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549 - * 6786276 7066203 7085757 8008577 8030696 8170840 8255086 8263202 8287868 + * 6786276 7066203 7085757 8008577 8030696 8170840 8174269 8255086 8263202 8287868 * @summary test Locales * @modules jdk.localedata - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI LocaleTest - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI -Djava.locale.useOldISOCodes=true LocaleTest + * @run junit LocaleTest + * @run junit/othervm -Djava.locale.useOldISOCodes=true LocaleTest */ /* * This file is available under and governed by the GNU General Public @@ -155,43 +155,43 @@ public LocaleTest() { // display name (English) // Updated no_NO_NY English display name for new pattern-based algorithm // (part of Euro support). - { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,Nynorsk)", "Italian", "xx (YY)" }, + { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Italian", "xx (YY)" }, - // display langage (French) + // display language (French) { "anglais", "fran\u00e7ais", "croate", "grec", "norv\u00e9gien", "italien", "xx" }, // display country (French) { "\u00c9tats-Unis", "France", "Croatie", "Gr\u00e8ce", "Norv\u00e8ge", "", "YY" }, // display variant (French) { "", "", "", "", "", "", "" }, // display name (French) - { "anglais (\u00c9tats-Unis)", "fran\u00e7ais (France)", "croate (Croatie)", "grec (Gr\u00e8ce)", "norv\u00e9gien (Norv\u00e8ge,Nynorsk)", "italien", "xx (YY)" }, + { "anglais (\u00c9tats-Unis)", "fran\u00e7ais (France)", "croate (Croatie)", "grec (Gr\u00e8ce)", "norv\u00e9gien (Norv\u00e8ge, Nynorsk)", "italien", "xx (YY)" }, - // display langage (Croatian) - { "", "", "hrvatski", "", "", "", "xx" }, + // display language (Croatian) + { "engleski", "francuski", "hrvatski", "gr\u010dki", "norve\u0161ki", "talijanski", "xx" }, // display country (Croatian) - { "", "", "Hrvatska", "", "", "", "YY" }, + { "Sjedinjene Ameri\u010dke Dr\u017eave", "Francuska", "Hrvatska", "Gr\u010dka", "Norve\u0161ka", "", "YY" }, // display variant (Croatian) { "", "", "", "", "", "", ""}, // display name (Croatian) - { "", "", "hrvatski (Hrvatska)", "", "", "", "xx (YY)" }, + { "engleski (Sjedinjene Ameri\u010dke Dr\u017eave)", "francuski (Francuska)", "hrvatski (Hrvatska)", "gr\u010dki (Gr\u010dka)", "norve\u0161ki (Norve\u0161ka, Nynorsk)", "talijanski", "xx (YY)" }, - // display langage (Greek) + // display language (Greek) { "\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac", "\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac", "\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac", "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac", "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac", "\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac", "xx" }, // display country (Greek) { "\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2", "\u0393\u03b1\u03bb\u03bb\u03af\u03b1", "\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1", "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1", "", "YY" }, // display variant (Greek) { "", "", "", "", "", "", "" }, // display name (Greek) - { "\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac (\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2)", "\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac (\u0393\u03b1\u03bb\u03bb\u03af\u03b1)", "\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac (\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1)", "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac (\u0395\u03bb\u03bb\u03ac\u03b4\u03b1)", "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac (\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1,Nynorsk)", "\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac", "xx (YY)" }, + { "\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac (\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2)", "\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac (\u0393\u03b1\u03bb\u03bb\u03af\u03b1)", "\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac (\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1)", "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac (\u0395\u03bb\u03bb\u03ac\u03b4\u03b1)", "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac (\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1, Nynorsk)", "\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac", "xx (YY)" }, - // display langage () + // display language () { "English", "French", "Croatian", "Greek", "Norwegian", "Italian", "xx" }, // display country () { "United States", "France", "Croatia", "Greece", "Norway", "", "YY" }, // display variant () { "", "", "", "", "Nynorsk", "", ""}, // display name () - { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,Nynorsk)", "Italian", "xx (YY)" }, + { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Italian", "xx (YY)" }, }; @Test @@ -984,7 +984,7 @@ public void Test4139940() { */ @Test public void Test4143951() { - Calendar cal = Calendar.getInstance(Locale.of("ru")); + Calendar cal = Calendar.getInstance(Locale.of("ru", "RU")); if (cal.getFirstDayOfWeek() != Calendar.MONDAY) { fail("Fail: First day of week in Russia should be Monday"); } @@ -1050,12 +1050,12 @@ public void Test4147552() { Locale.of("no", "NO", "NY"), Locale.of("nb", "NO"), Locale.of("nn", "NO")}; String[] englishDisplayNames = {"Norwegian (Norway)", - "Norwegian (Norway,Bokm\u00e5l)", - "Norwegian (Norway,Nynorsk)", + "Norwegian (Norway, Bokm\u00e5l)", + "Norwegian (Norway, Nynorsk)", "Norwegian Bokm\u00e5l (Norway)", "Norwegian Nynorsk (Norway)"}; String[] norwegianDisplayNames = {"norsk (Norge)", - "norsk (Norge,bokm\u00e5l)", "norsk (Noreg,nynorsk)", + "norsk (Norge, Bokm\u00e5l)", "norsk (Noreg, Nynorsk)", "norsk bokm\u00e5l (Norge)", "norsk nynorsk (Noreg)"}; for (int i = 0; i < locales.length; i++) { diff --git a/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java b/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java index 2fcba9b9366..a1d6edd5d70 100644 --- a/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java +++ b/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, 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 @@ -22,10 +22,9 @@ */ /** * @test - * @bug 8276186 + * @bug 8276186 8174269 * @summary Checks whether getAvailableLocales() returns at least Locale.ROOT and * Locale.US instances. - * @run testng/othervm -Djava.locale.providers=COMPAT RequiredAvailableLocalesTest * @run testng/othervm -Djava.locale.providers=CLDR RequiredAvailableLocalesTest */ diff --git a/test/jdk/java/util/Locale/ThaiGov.java b/test/jdk/java/util/Locale/ThaiGov.java index ce6ea003068..6a2f2a5de01 100644 --- a/test/jdk/java/util/Locale/ThaiGov.java +++ b/test/jdk/java/util/Locale/ThaiGov.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,11 +23,11 @@ /* * @test - * @bug 4474409 + * @bug 4474409 8174269 * @summary Tests some localized methods with Thai locale * @author John O'Conner * @modules jdk.localedata - * @run junit/othervm -Djava.locale.providers=COMPAT ThaiGov + * @run junit ThaiGov */ import java.text.DateFormat; @@ -58,7 +58,7 @@ public void numberTest() { // Test currency formatting for Thai @Test public void currencyTest() { - final String strExpected = "\u0E3F\u0E51\u0E52\u002C\u0E53\u0E54\u0E55\u002C\u0E56\u0E57\u0E58\u002E\u0E52\u0E53"; + final String strExpected = "\u0e3f\u00a0\u0e51\u0e52,\u0e53\u0e54\u0e55,\u0e56\u0e57\u0e58.\u0e52\u0e53"; NumberFormat nf = NumberFormat.getCurrencyInstance(TH); String str = nf.format(VALUE); assertEquals(strExpected, str); @@ -77,7 +77,7 @@ public void dateTest() { cal.setTime(date); - final String strExpected = "\u0E27\u0E31\u0E19\u0E1E\u0E38\u0E18\u0E17\u0E35\u0E48\u0020\u0E51\u0020\u0E1E\u0E24\u0E29\u0E20\u0E32\u0E04\u0E21\u0020\u0E1E\u002E\u0E28\u002E\u0020\u0E52\u0E55\u0E54\u0E55\u002C\u0020\u0E58\u0020\u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32\u0020\u0E53\u0E50\u0020\u0E19\u0E32\u0E17\u0E35\u0020\u0E50\u0E50\u0020\u0E27\u0E34\u0E19\u0E32\u0E17\u0E35"; + final String strExpected = "\u0e27\u0e31\u0e19\u0e1e\u0e38\u0e18\u0e17\u0e35\u0e48 \u0e51 \u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21 \u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a \u0e52\u0e55\u0e54\u0e55 \u0e58 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 \u0e53\u0e50 \u0e19\u0e32\u0e17\u0e35 \u0e50\u0e50 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 \u0e40\u0e27\u0e25\u0e32\u0e2d\u0e2d\u0e21\u0e41\u0e2a\u0e07\u0e41\u0e1b\u0e0b\u0e34\u0e1f\u0e34\u0e01\u0e43\u0e19\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32\u0e40\u0e2b\u0e19\u0e37\u0e2d"; Date value = cal.getTime(); // th_TH_TH test diff --git a/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java b/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java index c4674c3d49b..6b1fce6f6b4 100644 --- a/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 8062588 8165804 8210406 8291660 + * @bug 4052440 8062588 8165804 8210406 8291660 8174269 * @summary BreakIteratorProvider tests * @library providersrc/foobarutils * providersrc/fooprovider @@ -31,10 +31,11 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI BreakIteratorProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI BreakIteratorProviderTest */ import java.text.BreakIterator; +import java.text.Collator; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -52,8 +53,8 @@ public class BreakIteratorProviderTest extends ProviderTest { BreakIteratorProviderImpl bip = new BreakIteratorProviderImpl(); List availloc = Arrays.asList(BreakIterator.getAvailableLocales()); List providerloc = Arrays.asList(bip.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getBreakIteratorProvider().getAvailableLocales()); + List fallbackloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales()); + List fallbackimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getCollatorProvider().getAvailableLocales()); public static void main(String[] s) { new BreakIteratorProviderTest(); @@ -66,7 +67,7 @@ public static void main(String[] s) { void availableLocalesTest() { Set localesFromAPI = new HashSet<>(availloc); - Set localesExpected = new HashSet<>(jreloc); + Set localesExpected = new HashSet<>(fallbackloc); localesExpected.addAll(providerloc); if (localesFromAPI.equals(localesExpected)) { System.out.println("availableLocalesTest passed."); @@ -78,10 +79,10 @@ void availableLocalesTest() { void objectValidityTest() { for (Locale target: availloc) { - // pure JRE implementation - ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getBreakIteratorInfo(target); + // pure FALLBACK implementation + ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK)).getLocaleData().getBreakIteratorInfo(target); String[] classNames = rb.getStringArray("BreakIteratorClasses"); - boolean jreSupportsLocale = jreimplloc.contains(target); + boolean fbSupportsLocale = fallbackimplloc.contains(target); // result object String[] result = new String[4]; @@ -101,7 +102,7 @@ void objectValidityTest() { // JRE String[] jresResult = new String[4]; - if (jreSupportsLocale) { + if (fbSupportsLocale) { jresResult[0] = "sun.util.locale.provider.BreakIteratorProviderImpl$GraphemeBreakIterator"; for (int i = 1; i < 4; i++) { jresResult[i] = "sun.text." + classNames[i - 1]; @@ -109,7 +110,7 @@ void objectValidityTest() { } for (int i = 0; i < 4; i++) { - checkValidity(target, jresResult[i], providersResult[i], result[i], jreSupportsLocale); + checkValidity(target, jresResult[i], providersResult[i], result[i], fbSupportsLocale); } } } diff --git a/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java b/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java index 11e5514f476..1d43543970b 100644 --- a/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,13 +23,13 @@ /* * @test - * @bug 7058207 8000986 8062588 8210406 + * @bug 7058207 8000986 8062588 8210406 8174269 * @summary CalendarDataProvider tests * @library providersrc/foobarutils * providersrc/barprovider * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI CalendarDataProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI CalendarDataProviderTest */ import java.util.Calendar; diff --git a/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java b/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java index 3a1527a8eb4..991fceabcb0 100644 --- a/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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,13 +23,13 @@ /* * @test - * @bug 8000986 8062588 8210406 + * @bug 8000986 8062588 8210406 8174269 * @summary CalendarNameProvider tests * @library providersrc/foobarutils * providersrc/barprovider * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI CalendarNameProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI CalendarNameProviderTest */ import java.util.Calendar; diff --git a/test/jdk/java/util/PluggableLocale/ClasspathTest.java b/test/jdk/java/util/PluggableLocale/ClasspathTest.java index e84d0bf3c16..460db1f580c 100644 --- a/test/jdk/java/util/PluggableLocale/ClasspathTest.java +++ b/test/jdk/java/util/PluggableLocale/ClasspathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,13 +23,13 @@ /* * @test - * @bug 6388652 8062588 8210406 + * @bug 6388652 8062588 8210406 8174269 * @summary Checks whether providers can be loaded from classpath. * @library providersrc/foobarutils * providersrc/barprovider * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI ClasspathTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI ClasspathTest */ import java.util.Arrays; diff --git a/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java b/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java index 16f0ddb4bec..b0ebc6be4aa 100644 --- a/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 8062588 8210406 + * @bug 4052440 8062588 8210406 8174269 * @summary CollatorProvider tests * @library providersrc/foobarutils * providersrc/fooprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI CollatorProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI CollatorProviderTest */ import java.text.Collator; @@ -56,8 +56,8 @@ public class CollatorProviderTest extends ProviderTest { CollatorProviderImpl cp = new CollatorProviderImpl(); List availloc = Arrays.asList(Collator.getAvailableLocales()); List providerloc = Arrays.asList(cp.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getCollatorProvider().getAvailableLocales()); + List fallbackloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales()); + List fallbackimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getCollatorProvider().getAvailableLocales()); public static void main(String[] s) { new CollatorProviderTest(); @@ -70,12 +70,13 @@ public static void main(String[] s) { void availableLocalesTest() { Set localesFromAPI = new HashSet<>(availloc); - Set localesExpected = new HashSet<>(jreloc); + Set localesExpected = new HashSet<>(fallbackloc); localesExpected.addAll(providerloc); if (localesFromAPI.equals(localesExpected)) { System.out.println("availableLocalesTest passed."); } else { - throw new RuntimeException("availableLocalesTest failed"); + localesFromAPI.removeAll(localesExpected); + throw new RuntimeException("availableLocalesTest failed"+ localesFromAPI); } } @@ -85,12 +86,12 @@ void objectValidityTest() { for (Locale target: availloc) { // pure JRE implementation - Set jreimplloc = new HashSet<>(); - for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forJRE().getCollatorProvider()).getAvailableLanguageTags()) { - jreimplloc.add(Locale.forLanguageTag(tag)); + Set fbil = new HashSet<>(); + for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getCollatorProvider()).getAvailableLanguageTags()) { + fbil.add(Locale.forLanguageTag(tag)); } - ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getCollationData(target); - boolean jreSupportsLocale = jreimplloc.contains(target); + ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK)).getLocaleData().getCollationData(target); + boolean fbSupportsLocale = fbil.contains(target); // result object Collator result = Collator.getInstance(target); @@ -101,19 +102,19 @@ void objectValidityTest() { providersResult = cp.getInstance(target); } - // JRE rule - Collator jresResult = null; - if (jreSupportsLocale) { + // Fallback rule + Collator fbResult = null; + if (fbSupportsLocale) { try { String rules = rb.getString("Rule"); - jresResult = new RuleBasedCollator(defrules+rules); - jresResult.setDecomposition(Collator.NO_DECOMPOSITION); + fbResult = new RuleBasedCollator(defrules+rules); + fbResult.setDecomposition(Collator.NO_DECOMPOSITION); } catch (MissingResourceException mre) { } catch (ParseException pe) { } } - checkValidity(target, jresResult, providersResult, result, jreSupportsLocale); + checkValidity(target, fbResult, providersResult, result, fbSupportsLocale); } } } diff --git a/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java index 35d8258aaca..bc1df961a57 100644 --- a/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 7199750 8000997 8062588 8210406 + * @bug 4052440 7199750 8000997 8062588 8210406 8174269 * @summary CurrencyNameProvider tests * @library providersrc/foobarutils * providersrc/barprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI CurrencyNameProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI CurrencyNameProviderTest */ import java.text.DecimalFormat; @@ -73,15 +73,15 @@ void test1() { CurrencyNameProviderImpl2 cnp2 = new CurrencyNameProviderImpl2(); Locale[] availloc = Locale.getAvailableLocales(); Locale[] testloc = availloc.clone(); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getCurrencyNameProvider().getAvailableLocales()); + List implloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getCurrencyNameProvider().getAvailableLocales()); List providerloc = new ArrayList(); providerloc.addAll(Arrays.asList(cnp.getAvailableLocales())); providerloc.addAll(Arrays.asList(cnp2.getAvailableLocales())); for (Locale target: availloc) { - // pure JRE implementation - OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getCurrencyNames(target); - boolean jreSupportsTarget = jreimplloc.contains(target); + // pure CLDR implementation + OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getCurrencyNames(target); + boolean jreSupportsTarget = implloc.contains(target); for (Locale test: testloc) { // get a Currency instance diff --git a/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java index 8db6bfefcd8..876fe3526cf 100644 --- a/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 7003643 8062588 8210406 + * @bug 4052440 7003643 8062588 8210406 8174269 * @summary DateFormatProvider tests * @library providersrc/foobarutils * providersrc/fooprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI DateFormatProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI DateFormatProviderTest */ import java.text.DateFormat; @@ -46,6 +46,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.Set; +import java.util.stream.Stream; import com.foo.DateFormatProviderImpl; @@ -57,8 +58,12 @@ public class DateFormatProviderTest extends ProviderTest { DateFormatProviderImpl dfp = new DateFormatProviderImpl(); List availloc = Arrays.asList(DateFormat.getAvailableLocales()); List providerloc = Arrays.asList(dfp.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getDateFormatProvider().getAvailableLocales()); + List jreloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales())).toList(); + List jreimplloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getDateFormatProvider().getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getDateFormatProvider().getAvailableLocales())).toList(); public static void main(String[] s) { new DateFormatProviderTest(); @@ -91,23 +96,16 @@ void objectValidityTest() { String dkey = "DatePatterns"; String tkey = "TimePatterns"; String dtkey = "DateTimePatterns"; - switch (cal.getCalendarType()) { - case "java.util.JapaneseImperialCalendar": - dkey = "japanese"+ "." + dkey; - tkey = "japanese"+ "." + tkey; - dtkey = "japanese"+ "." + dtkey; - break; - case "sun.util.BuddhistCalendar": - dkey = "buddhist"+ "." + dkey; - tkey = "buddhist"+ "." + tkey; - dtkey = "buddhist"+ "." + dtkey; - break; - case "java.util.GregorianCalendar": - default: + var calType = cal.getCalendarType(); + switch (calType) { + case "buddhist": + case "japanese": + dkey = calType + "." + dkey; + tkey = calType + "." + tkey; break; } // pure JRE implementation - ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getDateFormatData(target); + ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getDateFormatData(target); boolean jreSupportsLocale = jreimplloc.contains(target); // JRE string arrays @@ -137,7 +135,7 @@ void objectValidityTest() { if (jreSupportsLocale) { Object[] dateTimeArgs = {jreTimePatterns[style], jreDatePatterns[style]}; - String pattern = MessageFormat.format(jreDateTimePatterns[0], dateTimeArgs); + String pattern = MessageFormat.format(jreDateTimePatterns[style].replaceAll("'", "''"), dateTimeArgs); jresResult = new SimpleDateFormat(pattern, target); } diff --git a/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java b/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java index a7803b01d28..ab6fd30378b 100644 --- a/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 7200341 8062588 8210406 + * @bug 4052440 7200341 8062588 8210406 8174269 * @summary DateFormatSymbolsProvider tests * @library providersrc/foobarutils * providersrc/fooprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI DateFormatSymbolsProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI DateFormatSymbolsProviderTest */ import java.text.DateFormatSymbols; @@ -42,6 +42,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.Set; +import java.util.stream.Stream; import com.foo.DateFormatSymbolsProviderImpl; @@ -53,8 +54,12 @@ public class DateFormatSymbolsProviderTest extends ProviderTest { DateFormatSymbolsProviderImpl dfsp = new DateFormatSymbolsProviderImpl(); List availloc = Arrays.asList(DateFormatSymbols.getAvailableLocales()); List providerloc = Arrays.asList(dfsp.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getDateFormatSymbolsProvider().getAvailableLocales()); + List jreloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales())).toList(); + List jreimplloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getDateFormatSymbolsProvider().getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getDateFormatSymbolsProvider().getAvailableLocales())).toList(); public static void main(String[] s) { new DateFormatSymbolsProviderTest(); @@ -81,7 +86,7 @@ void objectValidityTest() { for (Locale target: availloc) { // pure JRE implementation - ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getDateFormatData(target); + ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getDateFormatData(target); boolean jreSupportsLocale = jreimplloc.contains(target); // JRE string arrays diff --git a/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java b/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java index 8e51f025acd..142ef94b187 100644 --- a/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,14 +23,14 @@ /* * @test - * @bug 4052440 8062588 8210406 + * @bug 4052440 8062588 8210406 8174269 * @summary DecimalFormatSymbolsProvider tests * @library providersrc/foobarutils * providersrc/fooprovider * @modules java.base/sun.util.locale.provider * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI DecimalFormatSymbolsProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI DecimalFormatSymbolsProviderTest */ import java.text.DecimalFormatSymbols; @@ -39,6 +39,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.stream.Stream; import com.foo.DecimalFormatSymbolsProviderImpl; @@ -49,8 +50,12 @@ public class DecimalFormatSymbolsProviderTest extends ProviderTest { DecimalFormatSymbolsProviderImpl dfsp = new DecimalFormatSymbolsProviderImpl(); List availloc = Arrays.asList(DecimalFormatSymbols.getAvailableLocales()); List providerloc = Arrays.asList(dfsp.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getDecimalFormatSymbolsProvider().getAvailableLocales()); + List jreloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales())).toList(); + List jreimplloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getDateFormatSymbolsProvider().getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getDecimalFormatSymbolsProvider().getAvailableLocales())).toList(); public static void main(String[] s) { new DecimalFormatSymbolsProviderTest(); @@ -76,7 +81,7 @@ void objectValidityTest() { for (Locale target: availloc) { // pure JRE implementation - Object[] data = LocaleProviderAdapter.forJRE().getLocaleResources(target).getDecimalFormatSymbolsData(); + Object[] data = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getLocaleResources(target).getDecimalFormatSymbolsData(); boolean jreSupportsLocale = jreimplloc.contains(target); // JRE string arrays diff --git a/test/jdk/java/util/PluggableLocale/GenericTest.java b/test/jdk/java/util/PluggableLocale/GenericTest.java index 5d2557d016b..8ac202a1b60 100644 --- a/test/jdk/java/util/PluggableLocale/GenericTest.java +++ b/test/jdk/java/util/PluggableLocale/GenericTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 8062588 8210406 + * @bug 4052440 8062588 8210406 8174269 * @summary Generic tests for the pluggable locales feature * @library providersrc/foobarutils * providersrc/barprovider @@ -32,7 +32,7 @@ * @build com.foobar.Utils * com.bar.* * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI GenericTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI GenericTest */ import java.util.Arrays; @@ -86,12 +86,13 @@ public static void main(String[] s) { * Make sure that all the locales are available from the existing providers */ void availableLocalesTest() { - // Check that Locale.getAvailableLocales() returns the union of the JRE supported + // Check that Locale.getAvailableLocales() returns the union of the CLDR/FALLBACK supported // locales and providers' locales HashSet result = new HashSet<>(Arrays.asList(Locale.getAvailableLocales())); HashSet expected = - new HashSet<>(Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales())); + new HashSet<>(Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getAvailableLocales())); + expected.addAll(Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales())); expected.addAll(Arrays.asList(breakIP.getAvailableLocales())); expected.addAll(Arrays.asList(collatorP.getAvailableLocales())); expected.addAll(Arrays.asList(dateFP.getAvailableLocales())); diff --git a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java index 6e9badede8a..5d5355a9755 100644 --- a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 8000273 8062588 8210406 + * @bug 4052440 8000273 8062588 8210406 8174269 * @summary LocaleNameProvider tests * @library providersrc/foobarutils * providersrc/barprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI LocaleNameProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest */ import java.util.Arrays; @@ -60,12 +60,12 @@ void checkAvailLocValidityTest() { LocaleNameProviderImpl lnp = new LocaleNameProviderImpl(); Locale[] availloc = Locale.getAvailableLocales(); Locale[] testloc = availloc.clone(); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getLocaleNameProvider().getAvailableLocales()); + List jreimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getLocaleNameProvider().getAvailableLocales()); List providerloc = Arrays.asList(lnp.getAvailableLocales()); for (Locale target: availloc) { // pure JRE implementation - OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getLocaleNames(target); + OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getLocaleNames(target); boolean jreSupportsTarget = jreimplloc.contains(target); for (Locale test: testloc) { diff --git a/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java b/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java index 12f60e5b2f9..78527056a20 100644 --- a/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,14 +23,14 @@ /* * @test - * @bug 4052440 7003643 8062588 8210406 + * @bug 4052440 7003643 8062588 8210406 8174269 * @summary NumberFormatProvider tests * @library providersrc/foobarutils * providersrc/fooprovider * @modules java.base/sun.util.locale.provider * @build com.foobar.Utils * com.foo.* - * @run main/othervm -Djava.locale.providers=JRE,SPI NumberFormatProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI NumberFormatProviderTest */ import java.text.DecimalFormat; @@ -43,6 +43,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.stream.Stream; import com.foo.FooNumberFormat; import com.foo.NumberFormatProviderImpl; @@ -54,8 +55,12 @@ public class NumberFormatProviderTest extends ProviderTest { NumberFormatProviderImpl nfp = new NumberFormatProviderImpl(); List availloc = Arrays.asList(NumberFormat.getAvailableLocales()); List providerloc = Arrays.asList(nfp.getAvailableLocales()); - List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getNumberFormatProvider().getAvailableLocales()); + List jreloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales())).toList(); + List jreimplloc = Stream.concat( + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getNumberFormatProvider().getAvailableLocales()), + Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getNumberFormatProvider().getAvailableLocales())).toList(); public static void main(String[] s) { new NumberFormatProviderTest(); @@ -86,7 +91,7 @@ void objectValidityTest() { // JRE string arrays String[] jreNumberPatterns = null; if (jreSupportsLocale) { - jreNumberPatterns = LocaleProviderAdapter.forJRE().getLocaleResources(target).getNumberPatterns(); + jreNumberPatterns = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getLocaleResources(target).getNumberPatterns(); } // result object diff --git a/test/jdk/java/util/PluggableLocale/PermissionTest.java b/test/jdk/java/util/PluggableLocale/PermissionTest.java index 33231f16861..8d600b40912 100644 --- a/test/jdk/java/util/PluggableLocale/PermissionTest.java +++ b/test/jdk/java/util/PluggableLocale/PermissionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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,7 +23,7 @@ /* * @test - * @bug 8075545 8210406 + * @bug 8075545 8210406 8174269 * @summary Check whether RuntimePermission("localeServiceProvider") is * handled correctly. * @library providersrc/foobarutils @@ -35,11 +35,11 @@ * @run main/othervm PermissionTest * @run main/othervm/fail/java.security.policy=dummy.policy * -Djava.security.manager - * -Djava.locale.providers=JRE,SPI + * -Djava.locale.providers=CLDR,SPI * PermissionTest * @run main/othervm/java.security.policy=localeServiceProvider.policy * -Djava.security.manager - * -Djava.locale.providers=JRE,SPI + * -Djava.locale.providers=CLDR,SPI * PermissionTest */ diff --git a/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java index 48de90b4a16..399fd440fa5 100644 --- a/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4052440 8003267 8062588 8210406 + * @bug 4052440 8003267 8062588 8210406 8174269 * @summary TimeZoneNameProvider tests * @library providersrc/foobarutils * providersrc/barprovider @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=JRE,SPI TimeZoneNameProviderTest + * @run main/othervm -Djava.locale.providers=CLDR,SPI TimeZoneNameProviderTest */ import java.text.DateFormatSymbols; @@ -70,13 +70,13 @@ public static void main(String[] s) { void test1() { Locale[] available = Locale.getAvailableLocales(); - List jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getTimeZoneNameProvider().getAvailableLocales()); + List jreimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getTimeZoneNameProvider().getAvailableLocales()); List providerLocales = Arrays.asList(tznp.getAvailableLocales()); String[] ids = TimeZone.getAvailableIDs(); for (Locale target: available) { // pure JRE implementation - OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getTimeZoneNames(target); + OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getTimeZoneNames(target); boolean jreSupportsTarget = jreimplloc.contains(target); for (String id: ids) { @@ -103,7 +103,7 @@ void test1() { // JRE's name String jresname = null; - if (jrearray != null) { + if (jrearray != null && !jrearray[i].isEmpty() && !jrearray[i].equals("\u2205\u2205\u2205")) { jresname = jrearray[i]; } diff --git a/test/jdk/java/util/Scanner/spi/UseLocaleWithProvider.java b/test/jdk/java/util/Scanner/spi/UseLocaleWithProvider.java index 833d8c22de1..4e316c461c4 100644 --- a/test/jdk/java/util/Scanner/spi/UseLocaleWithProvider.java +++ b/test/jdk/java/util/Scanner/spi/UseLocaleWithProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024, 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 @@ -22,9 +22,9 @@ */ /* * @test - * @bug 8190278 + * @bug 8190278 8174269 * @summary checks the Scanner.useLocale() with java.locale.providers=SPI, - * COMPAT. It should not throw ClassCastException if any SPI is + * CLDR. It should not throw ClassCastException if any SPI is * used and NumberFormat.getInstance() does not return a * DecimalFormat object. Also, to test the behaviour of Scanner * while scanning numbers in the format of Scanner's locale. @@ -32,7 +32,7 @@ * @library provider * @build provider/module-info provider/test.NumberFormatProviderImpl * provider/test.NumberFormatImpl - * @run main/othervm -Djava.locale.providers=SPI,COMPAT UseLocaleWithProvider + * @run main/othervm -Djava.locale.providers=SPI,CLDR UseLocaleWithProvider */ import java.util.Locale; @@ -49,7 +49,7 @@ public static void main(String[] args) { testScannerUseLocale("4.334,65", Locale.GERMAN, 4334.65); } catch (ClassCastException ex) { throw new RuntimeException("[FAILED: With" + - " java.locale.providers=SPI,COMPAT, Scanner.useLocale()" + + " java.locale.providers=SPI,CLDR, Scanner.useLocale()" + " shouldn't throw ClassCastException]"); } } @@ -59,7 +59,7 @@ private static void testScannerUseLocale(String number, Locale locale, Scanner sc = new Scanner(number).useLocale(locale); if (!sc.hasNextFloat() || sc.nextFloat() != actual.floatValue()) { throw new RuntimeException("[FAILED: With" + - " java.locale.providers=SPI,COMPAT, Scanner" + + " java.locale.providers=SPI,CLDR, Scanner" + ".hasNextFloat() or Scanner.nextFloat() is unable to" + " scan the given number: " + number + ", in the given" + " locale:" + locale + "]"); diff --git a/test/jdk/java/util/TimeZone/Bug6329116.java b/test/jdk/java/util/TimeZone/Bug6329116.java index 6e85fe8cb5b..a79400990b2 100644 --- a/test/jdk/java/util/TimeZone/Bug6329116.java +++ b/test/jdk/java/util/TimeZone/Bug6329116.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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,12 @@ * @test * @bug 6329116 6756569 6757131 6758988 6764308 6796489 6834474 6609737 6507067 * 7039469 7090843 7103108 7103405 7158483 8008577 8059206 8064560 8072042 - * 8077685 8151876 8166875 8169191 8170316 8176044 - * @summary Make sure that timezone short display names are idenical to Olson's data. - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI Bug6329116 + * 8077685 8151876 8166875 8169191 8170316 8176044 8174269 + * @summary Make sure that timezone short display names are identical to Olson's data. + * @run junit Bug6329116 */ import java.io.*; -import java.text.*; import java.util.*; import org.junit.jupiter.api.Test; @@ -40,7 +39,11 @@ public class Bug6329116 { - static Locale[] locales = Locale.getAvailableLocales(); + // Do not test all locales, as some locales have localized + // short names in CLDR. Test only for the US locale + + // static Locale[] locales = Locale.getAvailableLocales(); + static Locale[] locales = {Locale.US}; static String[] timezones = TimeZone.getAvailableIDs(); @Test @@ -112,7 +115,7 @@ public void bug6329116() throws IOException { if (!expected.equals(got) && !expected.startsWith(got + "/") && !expected.endsWith("/" + got)) { - if (useLocalzedShortDisplayName(tz, locales[i], got, false)) { + if (useLocalizedShortDisplayName(tz, locales[i], got, false)) { /* System.out.println(tzs[j] + ((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + @@ -139,7 +142,7 @@ public void bug6329116() throws IOException { if (tzs[j].equals("Europe/London") && locales[i].equals(new Locale("en", "IE"))) { continue; - } else if (useLocalzedShortDisplayName(tz, locales[i], got, true)) { + } else if (useLocalizedShortDisplayName(tz, locales[i], got, true)) { /* System.out.println(tzs[j] + ((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + @@ -202,38 +205,39 @@ public void bug6329116() throws IOException { } } - static boolean useLocalzedShortDisplayName(TimeZone tz, + static boolean useLocalizedShortDisplayName(TimeZone tz, Locale locale, String got, boolean inDST) { - if (locale.getLanguage().equals("de")) { - String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); - if (inDST) { - if (("Mitteleurop\u00e4ische Sommerzeit".equals(name) && "MESZ".equals(got)) || - ("Osteurop\u00e4ische Sommerzeit".equals(name) && "OESZ".equals(got)) || - ("Westeurop\u00e4ische Sommerzeit".equals(name) && "WESZ".equals(got))) { - return true; - } - } else { - if (("Mitteleurop\u00e4ische Zeit".equals(name) && "MEZ".equals(got)) || - ("Osteurop\u00e4ische Zeit".equals(name) && "OEZ".equals(got)) || - ("Westeurop\u00e4ische Zeit".equals(name) && "WEZ".equals(got))) { - return true; - } - } - } else if (locale.getLanguage().equals("zh") && - (locale.getCountry().equals("TW") || locale.getCountry().equals("HK"))) { - String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); - if (inDST) { - if (("\u53f0\u7063\u590f\u4ee4\u6642\u9593".equals(name) && "TDT".equals(got))) { - return true; - } - } else { - if (("\u53f0\u7063\u6a19\u6e96\u6642\u9593".equals(name) && "TST".equals(got))) { - return true; - } - } - } +// if (locale.getLanguage().equals("de")) { +// String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); +// if (inDST) { +// if (("Mitteleurop\u00e4ische Sommerzeit".equals(name) && "MESZ".equals(got)) || +// ("Osteurop\u00e4ische Sommerzeit".equals(name) && "OESZ".equals(got)) || +// ("Westeurop\u00e4ische Sommerzeit".equals(name) && "WESZ".equals(got))) { +// return true; +// } +// } else { +// if (("Mitteleurop\u00e4ische Zeit".equals(name) && "MEZ".equals(got)) || +// ("Osteurop\u00e4ische Zeit".equals(name) && "OEZ".equals(got)) || +// ("Westeurop\u00e4ische Zeit".equals(name) && "WEZ".equals(got))) { +// return true; +// } +// } +// } else if (locale.getLanguage().equals("zh") && +// (locale.getCountry().equals("TW") || locale.getCountry().equals("HK"))) { +// String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); +// if (inDST) { +// if (("\u53f0\u7063\u590f\u4ee4\u6642\u9593".equals(name) && "TDT".equals(got))) { +// return true; +// } +// } else { +// if (("\u53f0\u7063\u6a19\u6e96\u6642\u9593".equals(name) && "TST".equals(got))) { +// return true; +// } +// } +// } + // If we get a TimeZone with GMT+hh:mm format, we can ignore the offset value if (tz.getDisplayName(Locale.ENGLISH).startsWith("GMT+") || tz.getDisplayName(Locale.ENGLISH).startsWith("GMT-")) { return tz.getDisplayName().substring(0, 3).equals(got.substring(0, 3)); diff --git a/test/jdk/java/util/TimeZone/Bug8167143.java b/test/jdk/java/util/TimeZone/Bug8167143.java index 463452b5c81..b8ce459a5de 100644 --- a/test/jdk/java/util/TimeZone/Bug8167143.java +++ b/test/jdk/java/util/TimeZone/Bug8167143.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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,25 +23,21 @@ /* * @test - * @bug 8167143 + * @bug 8167143 8174269 * @summary Test - * Timezone parsing works for all locales for default providers prefernce - * as well as when prefernce list is [COMPAT, CLDR], - * CLDR implict locales are correctly reflected, + * Timezone parsing works for all locales for default providers preference + * CLDR implicit locales are correctly reflected, * th_TH bundle is not wrongly cached in DateFormatSymbols, * correct candidate locale list is retrieved for * zh_Hant and zh_Hans and - * Implict COMPAT Locales nn-NO, nb-NO are reflected in available locales - * for all Providers for COMPAT. + * Implicit COMPAT Locales nn-NO, nb-NO are reflected in available locales * @modules java.base/sun.util.locale.provider * java.base/sun.util.spi * jdk.localedata - * @run main/othervm -Djava.locale.providers=COMPAT,CLDR Bug8167143 testTimeZone - * @run main/othervm Bug8167143 testTimeZone + * @run main Bug8167143 testTimeZone * @run main/othervm -Djava.locale.providers=CLDR Bug8167143 testCldr - * @run main/othervm Bug8167143 testCache - * @run main/othervm Bug8167143 testCandidateLocales - * @run main/othervm -Djava.locale.providers=COMPAT Bug8167143 testCompat + * @run main Bug8167143 testCache + * @run main Bug8167143 testCandidateLocales */ import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/test/jdk/java/util/TimeZone/HongKong.java b/test/jdk/java/util/TimeZone/HongKong.java index 14f5b1b9d9e..e867957803b 100644 --- a/test/jdk/java/util/TimeZone/HongKong.java +++ b/test/jdk/java/util/TimeZone/HongKong.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4487276 8008577 + * @bug 4487276 8008577 8174269 * @modules jdk.localedata * @summary Verify that Hong Kong locale uses traditional Chinese names. - * @run main/othervm -Djava.locale.providers=COMPAT,SPI HongKong + * @run main/othervm HongKong */ import java.util.Locale; @@ -39,7 +39,7 @@ public static void main(String[] args) { Locale.setDefault(Locale.of("zh", "HK")); checkCountry(Locale.GERMANY, "\u5fb7\u570b"); checkCountry(Locale.FRANCE, "\u6cd5\u570b"); - checkCountry(Locale.ITALY, "\u7fa9\u5927\u5229"); + checkCountry(Locale.ITALY, "\u610f\u5927\u5229"); checkTimeZone("Asia/Shanghai", "\u4e2d\u570b\u6a19\u6e96\u6642\u9593"); } finally { @@ -51,7 +51,8 @@ public static void main(String[] args) { private static void checkCountry(Locale country, String expected) { String actual = country.getDisplayCountry(); if (!expected.equals(actual)) { - throw new RuntimeException(); + throw new RuntimeException("Failed. actual: %s, expected: %s" + .formatted(actual, expected)); } } @@ -59,7 +60,8 @@ private static void checkTimeZone(String timeZoneID, String expected) { TimeZone timeZone = TimeZone.getTimeZone(timeZoneID); String actual = timeZone.getDisplayName(); if (!expected.equals(actual)) { - throw new RuntimeException(); + throw new RuntimeException("Failed. actual: %s, expected: %s" + .formatted(actual, expected)); } } } diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt index 03f5305e65e..2bcccf8f880 100644 --- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt +++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt @@ -14,8 +14,6 @@ Africa/Ndjamena WAT Africa/Sao_Tome GMT Africa/Tripoli EET Africa/Tunis CET CEST -Africa/Windhoek CAT WAT -America/Adak HST HDT America/Anchorage AKST AKDT America/Bahia_Banderas CST CDT America/Barbados AST ADT @@ -108,8 +106,6 @@ Asia/Makassar WITA Asia/Manila PST PDT Asia/Nicosia EET EEST Asia/Pontianak WIB -Asia/Pyongyang KST -Asia/Seoul KST KDT Asia/Shanghai CST CDT Asia/Taipei CST CDT Asia/Tokyo JST JDT diff --git a/test/jdk/java/util/TimeZone/TimeZoneRegression.java b/test/jdk/java/util/TimeZone/TimeZoneRegression.java index 6343279689f..ca539336dae 100644 --- a/test/jdk/java/util/TimeZone/TimeZoneRegression.java +++ b/test/jdk/java/util/TimeZone/TimeZoneRegression.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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,9 +25,9 @@ * @test * @bug 4052967 4073209 4073215 4084933 4096952 4109314 4126678 4151406 4151429 * 4154525 4154537 4154542 4154650 4159922 4162593 4173604 4176686 4184229 4208960 - * 4966229 6433179 6851214 8007520 8008577 + * 4966229 6433179 6851214 8007520 8008577 8174269 * @library /java/text/testlib - * @run junit/othervm -Djava.locale.providers=COMPAT,SPI TimeZoneRegression + * @run junit TimeZoneRegression */ import java.util.*; diff --git a/test/jdk/java/util/TimeZone/TimeZoneTest.java b/test/jdk/java/util/TimeZone/TimeZoneTest.java index 1973a782e0e..3c93245e8a0 100644 --- a/test/jdk/java/util/TimeZone/TimeZoneTest.java +++ b/test/jdk/java/util/TimeZone/TimeZoneTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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,7 +25,7 @@ * @test * @bug 4028006 4044013 4096694 4107276 4107570 4112869 4130885 7039469 7126465 7158483 * 8008577 8077685 8098547 8133321 8138716 8148446 8151876 8159684 8166875 8181157 - * 8228469 8274407 8285844 8305113 + * 8228469 8274407 8285844 8305113 8174269 * @modules java.base/sun.util.resources * @summary test TimeZone * @run junit TimeZoneTest @@ -363,9 +363,9 @@ public void TestDisplayName() { // Now be smart -- check to see if zh resource is even present. // If not, we expect the en fallback behavior. - ResourceBundle enRB = LocaleData.getBundle("sun.util.resources.TimeZoneNames", + ResourceBundle enRB = LocaleData.getBundle("sun.util.resources.cldr.TimeZoneNames", Locale.ENGLISH); - ResourceBundle zhRB = LocaleData.getBundle("sun.util.resources.TimeZoneNames", + ResourceBundle zhRB = LocaleData.getBundle("sun.util.resources.cldr.TimeZoneNames", zh_CN); boolean noZH = enRB == zhRB; diff --git a/test/jdk/java/util/TimeZone/tools/share/makeZoneData.pl b/test/jdk/java/util/TimeZone/tools/share/makeZoneData.pl index 2df25a58582..ae60c683ea6 100644 --- a/test/jdk/java/util/TimeZone/tools/share/makeZoneData.pl +++ b/test/jdk/java/util/TimeZone/tools/share/makeZoneData.pl @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2024, 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 @@ -157,9 +157,14 @@ foreach $z (@javatzids) { # - # skip any Riyadh zones; ZoneData.java can't handle Riyada zones + # skip any Riyadh zones; ZoneData.java can't handle Riyadh zones # - next if ($z =~ /Riyadh/); + # Skip these zones for CLDR + # Africa/Windhoek: Negative DST (throughout year) + # Korea zones: CLDR metazone shares Seoul/Pyongyang, where TZDB doesn't + # Adak: CLDR's short names (Hawaii_Aleutian) differ from TZDB, HAST/HADT vs. HST/HDT + # + next if ($z =~ /Riyadh|Windhoek|Seoul|Pyongyang|Adak/); for ($i = 0, $fd = 0; $i < $count; $i++, $fd++) { if (!defined($zones{$z})) { diff --git a/test/jdk/sun/text/resources/Format/Bug4395196.java b/test/jdk/sun/text/resources/Format/Bug4395196.java index 5358dfd09dd..2377500eef7 100644 --- a/test/jdk/sun/text/resources/Format/Bug4395196.java +++ b/test/jdk/sun/text/resources/Format/Bug4395196.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4395196 4930708 4900884 4890240 8008577 + * @bug 4395196 4930708 4900884 4890240 8008577 8174269 * @modules jdk.localedata * @summary verify the ko DateFormat - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4395196 + * @run main Bug4395196 */ import java.text.DateFormat; @@ -46,25 +46,25 @@ public static void main(String[] arg) DateFormat df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.SHORT,loc); SimpleDateFormat sdf = new SimpleDateFormat("",loc); - sdf.applyPattern("yyyy. M. d a h:mm"); + sdf.applyPattern("y. M. d. a h:mm"); if( !sdf.format(now).equals(df.format(now))){ result++; System.out.println("error at " + sdf.format(now)); } df = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM,loc); - sdf.applyPattern("yyyy'\ub144' M'\uc6d4' d'\uc77c' '('EE')' a h:mm:ss"); + sdf.applyPattern("y\ub144 M\uc6d4 d\uc77c a h:mm:ss"); if( !sdf.format(now).equals(df.format(now))){ result++; System.out.println("error at " + sdf.format(now)); } df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG,loc); - sdf.applyPattern("yyyy. M. d a h'\uc2dc' mm'\ubd84' ss'\ucd08'"); + sdf.applyPattern("y. M. d. a h\uc2dc m\ubd84 s\ucd08 z"); if( !sdf.format(now).equals(df.format(now))){ result++; System.out.println("error at " + sdf.format(now)); } df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.FULL,loc); - sdf.applyPattern("yy. M. d a h'\uc2dc' mm'\ubd84' ss'\ucd08' z"); + sdf.applyPattern("yy. M. d. a h\uc2dc m\ubd84 s\ucd08 zzzz"); if( !sdf.format(now).equals(df.format(now))){ result++; System.out.println("error at " + sdf.format(now)); diff --git a/test/jdk/sun/text/resources/Format/Bug4651568.java b/test/jdk/sun/text/resources/Format/Bug4651568.java index 354e3926e28..cafa847efae 100644 --- a/test/jdk/sun/text/resources/Format/Bug4651568.java +++ b/test/jdk/sun/text/resources/Format/Bug4651568.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4651568 8008577 + * @bug 4651568 8008577 8174269 * @modules jdk.localedata * @summary Verifies the currency pattern for pt_BR locale - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4651568 + * @run main Bug4651568 */ import java.text.DecimalFormat; @@ -38,7 +38,7 @@ public class Bug4651568 { public static void main (String argv[] ) { Locale reservedLocale = Locale.getDefault(); try { - String expectedCurrencyPattern = "\u00A4 #.##0,00"; + String expectedCurrencyPattern = "\u00a4\u00a0#.##0,00"; Locale locale = new Locale ("pt", "BR"); Locale.setDefault(locale); diff --git a/test/jdk/sun/text/resources/Format/Bug4762201.java b/test/jdk/sun/text/resources/Format/Bug4762201.java index 920a0cafb2b..1eb38790a5e 100644 --- a/test/jdk/sun/text/resources/Format/Bug4762201.java +++ b/test/jdk/sun/text/resources/Format/Bug4762201.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,9 @@ /* * @test - * @bug 4762201 + * @bug 4762201 8174269 * @modules jdk.localedata * @summary verify the zh_CN full time pattern (and other time patterns) - * @run main/othervm -Djava.locale.providers=COMPAT,SPI Bug4762201 */ import java.text.DateFormat; @@ -45,16 +44,16 @@ public static void main(String[] arg) DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT,loc); SimpleDateFormat sdf = new SimpleDateFormat("",loc); - sdf.applyPattern("ah:mm"); // short time pattern + sdf.applyPattern("HH:mm"); // short time pattern if( !sdf.format(now).equals(df.format(now))) result++; df = DateFormat.getTimeInstance(DateFormat.MEDIUM,loc); - sdf.applyPattern("H:mm:ss"); // medium time pattern + sdf.applyPattern("HH:mm:ss"); // medium time pattern if( !sdf.format(now).equals(df.format(now))) result++; df = DateFormat.getTimeInstance(DateFormat.LONG,loc); - sdf.applyPattern("ahh'\u65f6'mm'\u5206'ss'\u79d2'"); // long time pattern + sdf.applyPattern("z HH:mm:ss"); // long time pattern if( !sdf.format(now).equals(df.format(now))) result++; df = DateFormat.getTimeInstance(DateFormat.FULL,loc); - sdf.applyPattern("ahh'\u65f6'mm'\u5206'ss'\u79d2' z"); // full time pattern + sdf.applyPattern("zzzz HH:mm:ss"); // full time pattern if( !sdf.format(now).equals(df.format(now))) result++; if(result > 0) throw new RuntimeException(); diff --git a/test/jdk/sun/text/resources/Format/Bug4807540.java b/test/jdk/sun/text/resources/Format/Bug4807540.java index f13adf9b01f..cfb52e478d2 100644 --- a/test/jdk/sun/text/resources/Format/Bug4807540.java +++ b/test/jdk/sun/text/resources/Format/Bug4807540.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test %i% - * @bug 4807540 8008577 + * @bug 4807540 8008577 8174269 * @modules jdk.localedata * @summary updating dateformat for sl_SI - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4807540 + * @run main Bug4807540 */ import java.text.DateFormat; @@ -39,7 +39,7 @@ public class Bug4807540 { public static void main(String[] args) { Locale si = Locale.of("sl", "si"); - String expected = "30.4.2008"; + String expected = "30. apr. 2008"; DateFormat dfSi = DateFormat.getDateInstance (DateFormat.MEDIUM, si); String siString = new String (dfSi.format(new Date(108, Calendar.APRIL, 30))); diff --git a/test/jdk/sun/text/resources/Format/Bug4810032.java b/test/jdk/sun/text/resources/Format/Bug4810032.java index 2da7742abc8..475c8b6a366 100644 --- a/test/jdk/sun/text/resources/Format/Bug4810032.java +++ b/test/jdk/sun/text/resources/Format/Bug4810032.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4810032 8008577 + * @bug 4810032 8008577 8174269 * @modules jdk.localedata * @summary verify the ja full time pattern parsing - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4810032 + * @run main Bug4810032 */ import java.text.DateFormat; @@ -37,7 +37,7 @@ public class Bug4810032 { public static void main(String[] arg) { - String s = "2003\u5e749\u670826\u65e5"; // "2003y9m26d" + String s = "2003\u5e749\u670826\u65e5\u91d1\u66dc\u65e5"; // "2003y9m26dEEEE" DateFormat df = DateFormat.getDateInstance(DateFormat.FULL,Locale.JAPANESE); diff --git a/test/jdk/sun/text/resources/Format/Bug4994312.java b/test/jdk/sun/text/resources/Format/Bug4994312.java deleted file mode 100644 index 691923e914b..00000000000 --- a/test/jdk/sun/text/resources/Format/Bug4994312.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2007, 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. - * - * 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. - */ - -/* - * @test - * @bug 4994312 8008577 - * @modules jdk.localedata - * @summary verify the German locale will accept localized pattern chars 't' and 'u'. - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4994312 - */ - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -public class Bug4994312 { - public static void main(String args[]) { - SimpleDateFormat df = (SimpleDateFormat) - DateFormat.getDateInstance(DateFormat.DEFAULT, Locale.GERMAN); - df.applyLocalizedPattern("tt.MM.uuuu"); - System.out.println(df.format(new Date())); - } -} diff --git a/test/jdk/sun/text/resources/Format/Bug5096553.java b/test/jdk/sun/text/resources/Format/Bug5096553.java index 7eabd10fbd7..ec7cd25682b 100644 --- a/test/jdk/sun/text/resources/Format/Bug5096553.java +++ b/test/jdk/sun/text/resources/Format/Bug5096553.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,14 +23,14 @@ /* * @test - * @bug 5096553 8008577 + * @bug 5096553 8008577 8174269 * @modules jdk.localedata * @summary updating dateformat for da_DK * following resources: * http://oss.software.ibm.com/cvs/icu/~checkout~/locale/common/main/da.xml * http://www.microsoft.com/globaldev/nlsweb/default.asp?submitted=406 * see bug evaluation for more details - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug5096553 + * @run main Bug5096553 */ import java.util.Date; @@ -42,8 +42,8 @@ public class Bug5096553 { public static void main(String[] args) { - String expectedMed = "30-04-2008"; - String expectedShort="30-04-08"; + String expectedMed = "30. apr. 2008"; + String expectedShort="30.04.2008"; Locale dk = Locale.of("da", "DK"); DateFormat df1 = DateFormat.getDateInstance(DateFormat.MEDIUM, dk); diff --git a/test/jdk/sun/text/resources/Format/Bug8037343.java b/test/jdk/sun/text/resources/Format/Bug8037343.java index 8f1889627c4..34ccf49f560 100644 --- a/test/jdk/sun/text/resources/Format/Bug8037343.java +++ b/test/jdk/sun/text/resources/Format/Bug8037343.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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,10 +23,10 @@ /* * @test - * @bug 8008577 8037343 + * @bug 8008577 8037343 8174269 * @modules jdk.localedata * @summary updating dateformat for es_DO - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug8037343 + * @run main Bug8037343 */ import java.text.DateFormat; @@ -39,8 +39,8 @@ public class Bug8037343 public static void main(String[] arg) { final Locale esDO = Locale.of("es", "DO"); - final String expectedShort = "31/03/12"; - final String expectedMedium = "31/03/2012"; + final String expectedShort = "31/3/12"; + final String expectedMedium = "31 mar 2012"; int errors = 0; DateFormat format; diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java index 1fbb5558885..5f428477cc0 100644 --- a/test/jdk/sun/text/resources/LocaleDataTest.java +++ b/test/jdk/sun/text/resources/LocaleDataTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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 @@ -41,11 +41,10 @@ * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746 * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086 * 8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715 - * 8301206 8303472 8317979 8306116 + * 8301206 8303472 8317979 8306116 8174269 * @summary Verify locale data * @modules java.base/sun.util.resources * @modules jdk.localedata - * @run main LocaleDataTest * @run main LocaleDataTest -cldr * */ diff --git a/test/jdk/sun/util/locale/provider/Bug8024141.java b/test/jdk/sun/util/locale/provider/Bug8024141.java deleted file mode 100644 index 7518e1bcf32..00000000000 --- a/test/jdk/sun/util/locale/provider/Bug8024141.java +++ /dev/null @@ -1,60 +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. - * - * 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. - */ - -/* - * @test - * @bug 8008577 8024141 - * @summary Test for cache support of sun.util.locale.provider.LocaleResources.getTimeZoneNames - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug8024141 - */ - -import java.time.ZoneId; -import static java.util.Locale.ENGLISH; -import static java.time.format.TextStyle.FULL; -import static java.time.format.TextStyle.SHORT; - -public class Bug8024141 { - // This test assumes that the two time zones are in GMT. If - // they become different zones, need to pick up another zones. - private static final String[] ZONES = { - "Africa/Abidjan", - "Africa/Bamako" - }; - - public static void main(String[] args) { - ZoneId gmt = ZoneId.of("GMT"); - String gmtName = gmt.getDisplayName(FULL, ENGLISH); - String gmtAbbr = gmt.getDisplayName(SHORT, ENGLISH); - - for (String zone : ZONES) { - ZoneId id = ZoneId.of(zone); - String name = id.getDisplayName(FULL, ENGLISH); - String abbr = id.getDisplayName(SHORT, ENGLISH); - - if (!name.equals(gmtName) || !abbr.equals(gmtAbbr)) { - throw new RuntimeException("inconsistent name/abbr for " + zone + ":\n" - + "name=" + name + ", abbr=" + abbr); - } - } - } -} diff --git a/test/jdk/sun/util/locale/provider/Bug8038436.java b/test/jdk/sun/util/locale/provider/Bug8038436.java index 5b93aa959a7..21e84ea3b9e 100644 --- a/test/jdk/sun/util/locale/provider/Bug8038436.java +++ b/test/jdk/sun/util/locale/provider/Bug8038436.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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,13 +23,13 @@ /* * @test - * @bug 8038436 8158504 8065555 8167143 8167273 8189272 8287340 + * @bug 8038436 8158504 8065555 8167143 8167273 8189272 8287340 8174269 * @summary Test for changes in 8038436 * @modules java.base/sun.util.locale.provider * java.base/sun.util.spi * jdk.localedata * @compile -XDignore.symbol.file Bug8038436.java - * @run main/othervm -Djava.locale.providers=COMPAT Bug8038436 availlocs + * @run main Bug8038436 availlocs */ import java.util.Arrays; @@ -52,109 +52,26 @@ public static void main(String[] args) { } - static final String[] bipLocs = (", ar, ar_JO, ar_LB, ar_SY, be, be_BY, bg, " + - "bg_BG, ca, ca_ES, cs, cs_CZ, da, da_DK, de, de_AT, de_CH, de_DE, " + - "de_LU, el, el_CY, el_GR, en, en_AU, en_CA, en_GB, en_IE, en_IN, " + - "en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, es, es_AR, es_BO, es_CL, " + - "es_CO, es_CR, es_DO, es_EC, es_ES, es_GT, es_HN, es_MX, es_NI, " + - "es_PA, es_PE, es_PR, es_PY, es_SV, es_US, es_UY, es_VE, et, et_EE, " + - "fi, fi_FI, fr, fr_BE, fr_CA, fr_CH, fr_FR, ga, ga_IE, he, he_IL, " + - "hi_IN, hr, hr_HR, hu, hu_HU, id, id_ID, is, is_IS, it, it_CH, it_IT, " + - "ja, ja_JP, ko, ko_KR, lt, lt_LT, lv, lv_LV, mk, mk_MK, ms, ms_MY, mt, " + - "mt_MT, nb, nb_NO, nl, nl_BE, nl_NL, nn_NO, no, no_NO, no_NO_NY, pl, pl_PL, pt, pt_BR, " + - "pt_PT, ro, ro_RO, ru, ru_RU, sk, sk_SK, sl, sl_SI, sq, sq_AL, sr, " + - "sr_BA, sr_CS, sr_ME, sr_ME_#Latn, sr_RS, sr__#Latn, sv, sv_SE, th, th_TH, " + - "tr, tr_TR, uk, uk_UA, vi, vi_VN, zh, zh_CN, zh_CN_#Hans, zh_HK, " + - "zh_HK_#Hant, zh_SG, zh_SG_#Hans, zh_TW, zh_TW_#Hant, ").split(",\\s*"); + static final String[] bipLocs = (", en, en_US, nb, nb_NO, nn_NO, th, ").split(",\\s*"); - static final String[] dfpLocs = bipLocs; - static final String[] datefspLocs = bipLocs; - static final String[] decimalfspLocs = bipLocs; - static final String[] calnpLocs = bipLocs; - static final String[] cpLocs = (", ar, be, bg, ca, cs, da, el, es, et, fi, " + + static final String[] cpLocs = (", ar, be, bg, ca, cs, da, el, en, en_US, es, et, fi, " + "fr, he, hi, hr, hu, is, ja, ko, lt, lv, mk, nb, nb_NO, nn_NO, no, pl, ro, ru, sk, sl, " + "sq, sr, sr__#Latn, sv, th, tr, uk, vi, zh, zh_HK, zh_HK_#Hant, " + "zh_TW, zh_TW_#Hant, ").split(",\\s*"); - static final String[] nfpLocs = (", ar, ar_AE, ar_BH, ar_DZ, ar_EG, ar_IQ, " + - "ar_JO, ar_KW, ar_LB, ar_LY, ar_MA, ar_OM, ar_QA, ar_SA, ar_SD, ar_SY, " + - "ar_TN, ar_YE, be, be_BY, bg, bg_BG, ca, ca_ES, cs, cs_CZ, da, da_DK, " + - "de, de_AT, de_CH, de_DE, de_LU, el, el_CY, el_GR, en, en_AU, " + - "en_CA, en_GB, en_IE, en_IN, en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, " + - "es, es_AR, es_BO, es_CL, es_CO, es_CR, es_CU, es_DO, es_EC, es_ES, " + - "es_GT, es_HN, es_MX, es_NI, es_PA, es_PE, es_PR, es_PY, es_SV, es_US, " + - "es_UY, es_VE, et, et_EE, fi, fi_FI, fr, fr_BE, fr_CA, fr_CH, fr_FR, " + - "fr_LU, ga, ga_IE, he, he_IL, hi, hi_IN, hr, hr_HR, hu, hu_HU, id, " + - "id_ID, is, is_IS, it, it_CH, it_IT, ja, ja_JP, " + - "ja_JP_JP_#u-ca-japanese, ko, ko_KR, lt, lt_LT, lv, lv_LV, " + - "mk, mk_MK, ms, ms_MY, mt, mt_MT, nb, nb_NO, nl, nl_BE, nl_NL, nn_NO, " + - "no, no_NO, no_NO_NY, pl, pl_PL, pt, pt_BR, pt_PT, ro, ro_RO, ru, ru_RU, " + - "sk, sk_SK, sl, sl_SI, sq, sq_AL, sr, sr_BA, sr_BA_#Latn, sr_CS, sr_ME, " + - "sr_ME_#Latn, sr_RS, sr_RS_#Latn, sr__#Latn, sv, sv_SE, th, " + - "th_TH, th_TH_TH_#u-nu-thai, tr, tr_TR, uk, uk_UA, vi, " + - "vi_VN, zh, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, " + - "zh_TW, zh_TW_#Hant, ").split(",\\s*"); - static final String[] currencynpLocs = (", ar_AE, ar_BH, ar_DZ, ar_EG, ar_IQ, " + - "ar_JO, ar_KW, ar_LB, ar_LY, ar_MA, ar_OM, ar_QA, ar_SA, ar_SD, ar_SY, " + - "ar_TN, ar_YE, be_BY, bg_BG, ca_ES, cs_CZ, da_DK, de, de_AT, de_CH, " + - "de_DE, de_LU, el_CY, el_GR, en_AU, en_CA, en_GB, en_IE, en_IN, " + - "en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, es, es_AR, es_BO, es_CL, " + - "es_CO, es_CR, es_CU, es_DO, es_EC, es_ES, es_GT, es_HN, es_MX, es_NI, " + - "es_PA, es_PE, es_PR, es_PY, es_SV, es_US, es_UY, es_VE, et_EE, fi_FI, " + - "fr, fr_BE, fr_CA, fr_CH, fr_FR, fr_LU, ga_IE, he_IL, hi_IN, hr_HR, " + - "hu_HU, id_ID, is_IS, it, it_CH, it_IT, ja, ja_JP, ko, ko_KR, lt_LT, " + - "lv_LV, mk_MK, ms_MY, mt_MT, nb, nb_NO, nl_BE, nl_NL, nn_NO, no_NO, pl_PL, pt, pt_BR, " + - "pt_PT, ro_RO, ru_RU, sk_SK, sl_SI, sq_AL, sr_BA, sr_BA_#Latn, sr_CS, " + - "sr_ME, sr_ME_#Latn, sr_RS, sr_RS_#Latn, sv, sv_SE, th_TH, tr_TR, uk_UA, " + - "vi_VN, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, " + - "zh_TW, zh_TW_#Hant, ").split(",\\s*"); - static final String[] lnpLocs = (", ar, be, bg, ca, cs, da, de, el, el_CY, " + - "en, en_MT, en_PH, en_SG, es, es_US, et, fi, fr, ga, he, hi, hr, hu, " + - "id, is, it, ja, ko, lt, lv, mk, ms, mt, nb, nb_NO, nl, nn_NO, no, no_NO_NY, pl, pt, pt_BR, " + - "pt_PT, ro, ru, sk, sl, sq, sr, sr__#Latn, sv, th, tr, uk, vi, zh, " + - "zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, zh_TW, zh_TW_#Hant, ").split(",\\s*"); - static final String[] tznpLocs = (", de, en, en_CA, en_GB, en_IE, es, fr, hi, " + - "it, ja, ko, nb, nb_NO, nn_NO, pt_BR, sv, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, " + - "zh_TW, zh_TW_#Hant, ").split(",\\s*"); - static final String[] caldpLocs = (", ar, be, bg, ca, cs, da, de, el, el_CY, " + - "en, en_GB, en_IE, en_MT, es, es_ES, es_US, et, fi, fr, fr_CA, he, hi, " + - "hr, hu, id_ID, is, it, ja, ko, lt, lv, mk, ms_MY, mt, mt_MT, nb, nb_NO, nl, nn_NO, no, " + - "pl, pt, pt_BR, pt_PT, ro, ru, sk, sl, sq, sr, sr_BA_#Latn, sr_ME_#Latn, sr_RS_#Latn, " + - "sv, th, tr, uk, vi, zh, ").split(",\\s*"); - static final String[] calpLocs = caldpLocs; /* - * Validate whether JRE's *Providers return supported locales list based on - * their actual resource bundle exsistence. The above golden data + * Validate whether FALLBACK's *Providers return supported locales list based on + * their actual resource bundle existence. The above golden data * are manually extracted, so they need to be updated if new locale * data resource bundle were added. */ private static void availableLocalesTests() { - LocaleProviderAdapter jre = LocaleProviderAdapter.forJRE(); + LocaleProviderAdapter fallback = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK); checkAvailableLocales("BreakIteratorProvider", - jre.getBreakIteratorProvider().getAvailableLocales(), bipLocs); + fallback.getBreakIteratorProvider().getAvailableLocales(), bipLocs); checkAvailableLocales("CollatorProvider", - jre.getCollatorProvider().getAvailableLocales(), cpLocs); - checkAvailableLocales("DateFormatProvider", - jre.getDateFormatProvider().getAvailableLocales(), dfpLocs); - checkAvailableLocales("DateFormatSymbolsProvider", - jre.getDateFormatSymbolsProvider().getAvailableLocales(), datefspLocs); - checkAvailableLocales("DecimalFormatSymbolsProvider", - jre.getDecimalFormatSymbolsProvider().getAvailableLocales(), decimalfspLocs); - checkAvailableLocales("NumberFormatProvider", - jre.getNumberFormatProvider().getAvailableLocales(), nfpLocs); - checkAvailableLocales("CurrencyNameProvider", - jre.getCurrencyNameProvider().getAvailableLocales(), currencynpLocs); - checkAvailableLocales("LocaleNameProvider", - jre.getLocaleNameProvider().getAvailableLocales(), lnpLocs); - checkAvailableLocales("TimeZoneNameProvider", - jre.getTimeZoneNameProvider().getAvailableLocales(), tznpLocs); - checkAvailableLocales("CalendarDataProvider", - jre.getCalendarDataProvider().getAvailableLocales(), caldpLocs); - checkAvailableLocales("CalendarNameProvider", - jre.getCalendarNameProvider().getAvailableLocales(), calnpLocs); - checkAvailableLocales("CalendarProvider", - jre.getCalendarProvider().getAvailableLocales(), calpLocs); + fallback.getCollatorProvider().getAvailableLocales(), cpLocs); } private static void checkAvailableLocales(String testName, Locale[] got, String[] expected) { diff --git a/test/jdk/sun/util/locale/provider/Bug8152817.java b/test/jdk/sun/util/locale/provider/Bug8152817.java index d08d6717276..3f694e2425f 100644 --- a/test/jdk/sun/util/locale/provider/Bug8152817.java +++ b/test/jdk/sun/util/locale/provider/Bug8152817.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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,11 +23,11 @@ /* * @test - * @bug 8152817 + * @bug 8152817 8174269 * @summary Make sure that resource bundles in the jdk.localedata module are * loaded under a security manager. * @modules jdk.localedata - * @run main/othervm -Djava.security.manager=allow -Djava.locale.providers=COMPAT + * @run main/othervm -Djava.security.manager=allow * -Djava.security.debug=access,failure,codebase=jrt:/jdk.localedata Bug8152817 */ @@ -42,13 +42,14 @@ public static void main(String[] args) throws Exception { System.setSecurityManager(new SecurityManager()); DateFormatSymbols syms = DateFormatSymbols.getInstance(Locale.GERMAN); - if (!"Oktober".equals(syms.getMonths()[Calendar.OCTOBER])) { - throw new RuntimeException("Test failed (FormatData)"); + String s = syms.getMonths()[Calendar.OCTOBER]; + if (!"Oktober".equals(s)) { + throw new RuntimeException("Test failed: " + s); } - String s = HijrahChronology.INSTANCE.getDisplayName(TextStyle.FULL, Locale.GERMAN); - if (!s.contains("Islamischer Kalender")) { - throw new RuntimeException("Test failed (JavaTimeSupplementary)"); + s = HijrahChronology.INSTANCE.getDisplayName(TextStyle.FULL, Locale.GERMAN); + if (!s.contains("Hidschri-Kalender (Umm al-Qura)")) { + throw new RuntimeException("Test failed: " + s); } } } diff --git a/test/jdk/sun/util/locale/provider/Bug8163350.java b/test/jdk/sun/util/locale/provider/Bug8163350.java deleted file mode 100644 index 5cda3f16adc..00000000000 --- a/test/jdk/sun/util/locale/provider/Bug8163350.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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. - * - * 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. - */ - - /* - * @test - * @bug 8163350 - * @modules java.base/sun.util.locale.provider - * @summary Test FALLBACK provider is not in adapter preference list when - * COMPAT is specified with System Property java.locale.providers. - * @run main/othervm -Djava.locale.providers=COMPAT Bug8163350 - */ -import java.util.List; -import sun.util.locale.provider.LocaleProviderAdapter; -import sun.util.locale.provider.LocaleProviderAdapter.Type; - -public class Bug8163350 { - - public static void main(String[] args) { - List preferenceList = LocaleProviderAdapter.getAdapterPreference(); - if (preferenceList.contains(Type.FALLBACK)) { - throw new RuntimeException("FALLBACK Provider should not be returned in " - + "adapter list " + preferenceList); - } - } -} diff --git a/test/jdk/sun/util/resources/Locale/Bug4429024.java b/test/jdk/sun/util/resources/Locale/Bug4429024.java index 212edc2e61d..c03dfc7d39b 100644 --- a/test/jdk/sun/util/resources/Locale/Bug4429024.java +++ b/test/jdk/sun/util/resources/Locale/Bug4429024.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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 @@ -24,8 +24,8 @@ * @test * @summary checking localised language/country names in finnish * @modules jdk.localedata - * @bug 4429024 4964035 6558856 8008577 8287868 - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4429024 + * @bug 4429024 4964035 6558856 8008577 8287868 8174269 + * @run main Bug4429024 */ import java.util.Locale; diff --git a/test/jdk/sun/util/resources/Locale/Bug4965260.java b/test/jdk/sun/util/resources/Locale/Bug4965260.java index 4ad472e0adc..65c70551320 100644 --- a/test/jdk/sun/util/resources/Locale/Bug4965260.java +++ b/test/jdk/sun/util/resources/Locale/Bug4965260.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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 @@ -22,10 +22,10 @@ */ /* * @test - * @bug 4965260 8008577 8287868 + * @bug 4965260 8008577 8287868 8174269 * @modules jdk.localedata * @summary Verifies the language name of "nl" for supported locales - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4965260 + * @run main Bug4965260 */ import java.util.Locale; diff --git a/test/jdk/sun/util/resources/Locale/Bug6275682.java b/test/jdk/sun/util/resources/Locale/Bug6275682.java index cfc89d44660..87bdd9e8539 100644 --- a/test/jdk/sun/util/resources/Locale/Bug6275682.java +++ b/test/jdk/sun/util/resources/Locale/Bug6275682.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,7 +25,7 @@ * @test * @summary Verifying that the language names starts with lowercase in spanish * @modules jdk.localedata - * @bug 6275682 + * @bug 6275682 8174269 */ import java.util.Locale; @@ -38,6 +38,10 @@ public static void main (String[] args) throws Exception { String error = ""; for (int i = 0; i < isoLangs.length; i++) { + // CLDR does not seem to have "bh" and "mo" language name in Spanish + if (isoLangs[i].equals("bh") || isoLangs[i].equals("mo")) { + continue; + } Locale current = new Locale (isoLangs[i]); String localeString = current.getDisplayLanguage (es); String startLetter = localeString.substring (0,1); diff --git a/test/jdk/sun/util/resources/TimeZone/Bug4858517.java b/test/jdk/sun/util/resources/TimeZone/Bug4858517.java index 44d3627f63a..0c0de2cca1b 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug4858517.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug4858517.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,9 +23,9 @@ /* *@test - *@bug 4858517 6300580 8008577 + *@bug 4858517 6300580 8008577 8174269 *@summary Test case for tzdata2003a support for 9 locales - *@run main/othervm -Djava.locale.providers=JRE,SPI Bug4858517 + *@run main Bug4858517 */ import java.util.Locale; @@ -37,11 +37,11 @@ public class Bug4858517 { Locale.ENGLISH, Locale.GERMAN, Locale.of("es"), - Locale.FRENCH, +// Locale.FRENCH, "fr" returns "UTC\u221203:00" with CLDR Locale.ITALIAN, Locale.JAPANESE, Locale.KOREAN, - Locale.of("sv"), +// Locale.of("sv"), "sv" returns "GMT\u221203:00" with CLDR Locale.SIMPLIFIED_CHINESE, Locale.TRADITIONAL_CHINESE }; @@ -54,20 +54,19 @@ public static void main(String[] args) { tzLocale = locales2Test[i]; TimeZone Rothera = TimeZone.getTimeZone("Antarctica/Rothera"); + if (!Rothera.getDisplayName(false, TimeZone.SHORT, tzLocale).equals ("GMT-03:00")) + throw new RuntimeException("\n" + tzLocale + ": short name, non-daylight time for Rothera should be \"GMT-03:00\""); - if (!Rothera.getDisplayName(false, TimeZone.SHORT, tzLocale).equals ("ROTT")) - throw new RuntimeException("\n" + tzLocale + ": short name, non-daylight time for Rothera should be \"ROTT\""); - - if (!Rothera.getDisplayName(true, TimeZone.SHORT, tzLocale).equals ("ROTST")) - throw new RuntimeException("\n" + tzLocale + ": short name, daylight time for Rothera should be \"ROTST\""); + if (!Rothera.getDisplayName(true, TimeZone.SHORT, tzLocale).equals ("GMT-03:00")) + throw new RuntimeException("\n" + tzLocale + ": short name, daylight time for Rothera should be \"GMT-03:00\""); TimeZone IRT = TimeZone.getTimeZone("Iran"); - if (!IRT.getDisplayName(false, TimeZone.SHORT, tzLocale).equals ("IRST")) - throw new RuntimeException("\n" + tzLocale + ": short name, non-daylight time for IRT should be \"IRST\""); + if (!IRT.getDisplayName(false, TimeZone.SHORT, tzLocale).equals ("GMT+03:30")) + throw new RuntimeException("\n" + tzLocale + ": short name, non-daylight time for IRT should be \"GMT+03:30\""); - if (!IRT.getDisplayName(true, TimeZone.SHORT, tzLocale).equals ("IRDT")) - throw new RuntimeException("\n" + tzLocale + ": short name, daylight time for IRT should be \"IRDT\""); + if (!IRT.getDisplayName(true, TimeZone.SHORT, tzLocale).equals ("GMT+04:30")) + throw new RuntimeException("\n" + tzLocale + ": short name, daylight time for IRT should be \"GMT+04:30\""); } } diff --git a/test/jdk/sun/util/resources/TimeZone/Bug4938846.java b/test/jdk/sun/util/resources/TimeZone/Bug4938846.java index 46c450325ca..6eff0d450f6 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug4938846.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug4938846.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 4938846 8008577 + * @bug 4938846 8008577 8174269 * @modules jdk.localedata * @summary Test case for en_IE TimeZone info - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4938846 + * @run main Bug4938846 */ import java.util.Locale; @@ -35,13 +35,13 @@ public class Bug4938846 { public static void main(String[] args) { - String zoneInfo = new String(); Locale tzLocale = Locale.of("en", "IE"); - TimeZone ieTz = TimeZone.getTimeZone("Europe/London"); + TimeZone ieTz = TimeZone.getTimeZone("Europe/Dublin"); - if (!ieTz.getDisplayName(true, TimeZone.LONG, tzLocale).equals ("Irish Summer Time")) - throw new RuntimeException("\nString for IST, en_IE locale should be \"Irish Summer Time\""); + // "Standard" because of the negative DST, summer is considered standard for Europe/Dublin + if (!ieTz.getDisplayName(true, TimeZone.LONG, tzLocale).equals ("Irish Standard Time")) + throw new RuntimeException("\nString for Europe/Dublin, en_IE locale should be \"Irish Standard Time\""); } } diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6271396.java b/test/jdk/sun/util/resources/TimeZone/Bug6271396.java index 164a686cf49..627617ff44d 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug6271396.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug6271396.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 6271396 8008577 + * @bug 6271396 8008577 8174269 * @modules jdk.localedata * @summary Test case for verifying typo of timezone display name Australia/Lord_Howe - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6271396 + * @run main Bug6271396 */ import java.util.Locale; @@ -40,13 +40,13 @@ public static void main(String[] args) { Locale tzLocale = Locale.FRENCH; if (!Lord_Howe.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Heure standard de Lord Howe")) + ("heure normale de Lord Howe")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Lord_Howe should be " + "\"Heure standard de Lord Howe\""); if (!Lord_Howe.getDisplayName(true, TimeZone.LONG, tzLocale).equals - ("Heure d'\u00e9t\u00e9 de Lord Howe")) + ("heure d\u2019\u00e9t\u00e9 de Lord Howe")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "daylight saving name for " + "Australia/Lord_Howe should be " + diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6317929.java b/test/jdk/sun/util/resources/TimeZone/Bug6317929.java index 7243f00184f..e952b3f1be3 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug6317929.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug6317929.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 6317929 6409419 8008577 + * @bug 6317929 6409419 8008577 8174269 * @modules jdk.localedata * @summary Test case for tzdata2005m support for 9 locales - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6317929 + * @run main Bug6317929 */ import java.util.Locale; @@ -59,150 +59,138 @@ public static void main(String[] args) { "\"Eastern Standard Time\""); tzLocale = locales2Test[1]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u00d6stliche Normalzeit")) + ("Nordamerikanische Ostk\u00fcsten-Normalzeit")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"\u00d6stliche Normalzeit\""); + "\"Nordamerikanische Ostk\u00fcsten-Normalzeit\""); tzLocale = locales2Test[2]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Hora est\u00e1ndar Oriental")) + ("hora est\u00e1ndar oriental")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"Hora est\u00e1ndar Oriental\""); + "\"hora est\u00e1ndar oriental\""); tzLocale = locales2Test[3]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Heure normale de l'Est")) + ("heure normale de l\u2019Est nord-am\u00e9ricain")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"Heure normale de l'Est\""); + "\"heure normale de l\u2019Est nord-am\u00e9ricain\""); tzLocale = locales2Test[4]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Ora solare USA orientale")) + ("Ora standard orientale USA")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"Ora solare USA orientale\""); + "\"Ora standard orientale USA\""); tzLocale = locales2Test[5]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u6771\u90e8\u6a19\u6e96\u6642")) + ("\u30a2\u30e1\u30ea\u30ab\u6771\u90e8\u6a19\u6e96\u6642")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"\u6771\u90e8\u6a19\u6e96\u6642\""); + "\"\u30a2\u30e1\u30ea\u30ab\u6771\u90e8\u6a19\u6e96\u6642\""); tzLocale = locales2Test[6]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\ub3d9\ubd80 \ud45c\uc900\uc2dc")) + ("\ubbf8 \ub3d9\ubd80 \ud45c\uc900\uc2dc")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"\ub3d9\ubd80 \ud45c\uc900\uc2dc\""); + "\"\ubbf8 \ub3d9\ubd80 \ud45c\uc900\uc2dc\""); tzLocale = locales2Test[7]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Eastern, normaltid")) + ("\u00f6stnordamerikansk normaltid")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"Eastern, normaltid\""); + "\"\u00f6stnordamerikansk normaltid\""); tzLocale = locales2Test[8]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4")) + ("\u5317\u7f8e\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\""); + "\"\u5317\u7f8e\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\""); tzLocale = locales2Test[9]; if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u6771\u65b9\u6a19\u6e96\u6642\u9593")) + ("\u6771\u90e8\u6a19\u6e96\u6642\u9593")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "America/Coral_Harbour should be " + - "\"\u6771\u65b9\u6a19\u6e96\u6642\u9593\""); + "\"\u6771\u90e8\u6a19\u6e96\u6642\u9593\""); TimeZone Currie = TimeZone.getTimeZone("Australia/Currie"); tzLocale = locales2Test[0]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Australian Eastern Standard Time (New South Wales)")) + ("Australian Eastern Standard Time")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"Australian Eastern Standard Time " + - "(New South Wales)\""); + "\"Australian Eastern Standard Time\""); tzLocale = locales2Test[1]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u00D6stliche Normalzeit (New South Wales)")) + ("Ostaustralische Normalzeit")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\u00D6stliche Normalzeit " + - "(New South Wales)\""); + "\"Ostaustralische Normalzeit\""); tzLocale = locales2Test[2]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Hora est\u00e1ndar Oriental (Nueva Gales del Sur)")) + ("hora est\u00e1ndar de Australia oriental")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"Hora est\u00e1ndar Oriental " + - "(Nueva Gales del Sur)\""); + "\"hora est\u00e1ndar de Australia oriental\""); tzLocale = locales2Test[3]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Heure normale de l'Est (Nouvelle-Galles du Sud)")) + ("heure normale de l\u2019Est de l\u2019Australie")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"Heure normale de l'Est " + - "(Nouvelle-Galles du Sud)\""); + "\"heure normale de l\u2019Est de l\u2019Australie\""); tzLocale = locales2Test[4]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Ora standard dell'Australia orientale (Nuovo Galles del Sud)")) + ("Ora standard dell\u2019Australia orientale")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"Ora standard dell'Australia orientale " + - "(Nuovo Galles del Sud)\""); + "\"Ora standard dell\u2019Australia orientale\""); tzLocale = locales2Test[5]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u6771\u90E8\u6A19\u6E96\u6642" + - "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)")) + ("\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2\u6771\u90e8\u6a19\u6e96\u6642")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\u6771\u90E8\u6A19\u6E96\u6642" + - "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9" + - "\u30A6\u30A7\u30FC\u30EB\u30BA)\""); + "\"\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2\u6771\u90e8\u6a19\u6e96\u6642\""); tzLocale = locales2Test[6]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)")) + ("\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544 \ub3d9\ubd80 \ud45c\uc900\uc2dc")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\uB3D9\uBD80 \uD45C\uC900\uC2DC" + - "(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)\""); + "\"\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544 \ub3d9\ubd80 \ud45c\uc900\uc2dc\""); tzLocale = locales2Test[7]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u00D6stlig standardtid (New South Wales)")) + ("\u00f6staustralisk normaltid")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\u00D6stlig standardtid " + - "(New South Wales)\""); + "\"\u00f6staustralisk normaltid\""); tzLocale = locales2Test[8]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)")) + ("\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 " + - "(\u65B0\u5357\u5A01\u5C14\u65AF)\""); + "\"\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\""); tzLocale = locales2Test[9]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)")) + ("\u6fb3\u6d32\u6771\u90e8\u6a19\u6e96\u6642\u9593")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"\u6771\u90E8\u6A19\u6E96\u6642\u9593 " + - "(\u65B0\u5357\u5A01\u723E\u65AF)\""); + "\"\u6fb3\u6d32\u6771\u90e8\u6a19\u6e96\u6642\u9593\""); } } diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6377794.java b/test/jdk/sun/util/resources/TimeZone/Bug6377794.java index 911cacd3681..1ee957b16a5 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug6377794.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug6377794.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 6377794 + * @bug 6377794 8174269 * @modules jdk.localedata * @summary Test case for tzdata2005r support for 9 locales - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6377794 + * @run main Bug6377794 */ import java.util.Locale; @@ -47,15 +47,32 @@ public class Bug6377794 { }; public static void main(String[] args) { + // As of CLDR 44, "SystemV/YST9" is replaced by "Pacific/Gambier" in supplementalMetadata.xml TimeZone SystemVYST9 = TimeZone.getTimeZone("SystemV/YST9"); Locale tzLocale; for (int i = 0; i < locales2Test.length; i++) { tzLocale = locales2Test[i]; - if (!SystemVYST9.getDisplayName(false, TimeZone.SHORT, tzLocale).equals - ("AKST")) - throw new RuntimeException("\n" + tzLocale + ": SHORT, " + - "non-daylight saving name for " + - "SystemV/YST9 should be \"AKST\""); + if (i == 3) { + // French + if (!SystemVYST9.getDisplayName(false, TimeZone.SHORT, tzLocale).equals + ("UTC\u221209:00")) + throw new RuntimeException("\n" + tzLocale + ": SHORT, " + + "non-daylight saving name for " + + "SystemV/YST9 should be \"UTC\u221209:00\""); + } else if (i == 7) { + // Swedish + if (!SystemVYST9.getDisplayName(false, TimeZone.SHORT, tzLocale).equals + ("GMT\u221209:00")) + throw new RuntimeException("\n" + tzLocale + ": SHORT, " + + "non-daylight saving name for " + + "SystemV/YST9 should be \"GMT\u221209:00\""); + } else { + if (!SystemVYST9.getDisplayName(false, TimeZone.SHORT, tzLocale).equals + ("GMT-09:00")) + throw new RuntimeException("\n" + tzLocale + ": SHORT, " + + "non-daylight saving name for " + + "SystemV/YST9 should be \"GMT-09:00\""); + } } /* @@ -64,76 +81,78 @@ public static void main(String[] args) { * TimeZone.LONG instead. */ + // As of CLDR 44, "SystemV/PST8" is replaced by "Pacific/Pitcairn" + // in supplementalMetadata.xml TimeZone SystemVPST8 = TimeZone.getTimeZone("SystemV/PST8"); tzLocale = locales2Test[0]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Pacific Standard Time")) + ("Pitcairn Time")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Pacific Standard Time\""); + "\"Pitcairn Time\""); tzLocale = locales2Test[1]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Pazifische Normalzeit")) + ("Pitcairninseln-Zeit")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Pazifische Normalzeit\""); + "\"Pitcairninseln-Zeit\""); tzLocale = locales2Test[2]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Hora est\u00e1ndar del Pac\u00edfico")) + ("hora de Pitcairn")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Hora est\u00e1ndar del Pac\u00edfico\""); + "\"hora de Pitcairn\""); tzLocale = locales2Test[3]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Heure normale du Pacifique")) + ("heure des \u00eeles Pitcairn")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Heure normale du Pacifique\""); + "\"heure des \u00eeles Pitcairn\""); tzLocale = locales2Test[4]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Ora solare della costa occidentale USA")) + ("Ora delle Pitcairn")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Ora solare della costa occidentale USA\""); + "\"Ora delle Pitcairn\""); tzLocale = locales2Test[5]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u592a\u5e73\u6d0b\u6a19\u6e96\u6642")) + ("\u30d4\u30c8\u30b1\u30a2\u30f3\u6642\u9593")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\""); + "\"\u30d4\u30c8\u30b1\u30a2\u30f3\u6642\u9593\""); tzLocale = locales2Test[6]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc")) + ("\ud54f\ucf00\uc5b8 \uc2dc\uac04")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc\""); + "\"\ud54f\ucf00\uc5b8 \uc2dc\uac04\""); tzLocale = locales2Test[7]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Stilla havet, normaltid")) + ("Pitcairntid")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"Stilla havet, normaltid\""); + "\"Pitcairntid\""); tzLocale = locales2Test[8]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4")) + ("\u76ae\u7279\u51ef\u6069\u65f6\u95f4")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4\""); + "\"\u76ae\u7279\u51ef\u6069\u65f6\u95f4\""); tzLocale = locales2Test[9]; if (!SystemVPST8.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593")) + ("\u76ae\u7279\u80af\u6642\u9593")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "SystemV/PST8 should be " + - "\"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593\""); + "\"\u76ae\u7279\u80af\u6642\u9593\""); } } diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6442006.java b/test/jdk/sun/util/resources/TimeZone/Bug6442006.java index cef672bcddf..982347093be 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug6442006.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug6442006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, 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,10 +23,10 @@ /* * @test - * @bug 6442006 8008577 + * @bug 6442006 8008577 8174269 * @modules jdk.localedata * @summary Test case for verifying timezone display name for Asia/Taipei - * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6442006 + * @run main Bug6442006 */ import java.util.Locale; @@ -38,8 +38,8 @@ public static void main(String[] args) { TimeZone tz = TimeZone.getTimeZone("Asia/Taipei"); Locale tzLocale = Locale.JAPANESE; - String jaStdName = "\u4e2d\u56fd\u6a19\u6e96\u6642"; - String jaDstName = "\u4e2d\u56fd\u590f\u6642\u9593"; + String jaStdName = "\u53f0\u5317\u6a19\u6e96\u6642"; + String jaDstName = "\u53f0\u5317\u590f\u6642\u9593"; if (!tz.getDisplayName(false, TimeZone.LONG, tzLocale).equals (jaStdName)) diff --git a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java index 4334d63dcdf..1320d228793 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, 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,11 +23,11 @@ /* * @test - * @bug 8139107 + * @bug 8139107 8174269 * @summary Test that date parsing with DateTimeFormatter pattern * that contains timezone field doesn't trigger NPE. All supported * locales are tested. - * @run testng/othervm -Djava.locale.providers=JRE,SPI Bug8139107 + * @run testng Bug8139107 */ import java.time.format.DateTimeFormatter; import java.util.Locale; diff --git a/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java b/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java index c752ec4d63c..f874da18df3 100644 --- a/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java +++ b/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, 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,10 +23,9 @@ /* * @test - * @bug 8275721 + * @bug 8275721 8174269 * @modules jdk.localedata * @summary Checks Chinese time zone names for `UTC` using CLDR are consistent - * @run testng/othervm -Djava.locale.providers=CLDR,COMPAT ChineseTimeZoneNameTest * @run testng/othervm -Djava.locale.providers=CLDR ChineseTimeZoneNameTest */ diff --git a/test/jdk/sun/util/resources/cldr/NorwegianFallbackTest.java b/test/jdk/sun/util/resources/cldr/NorwegianFallbackTest.java index 2b3e0c805d1..26d9bff9ea0 100644 --- a/test/jdk/sun/util/resources/cldr/NorwegianFallbackTest.java +++ b/test/jdk/sun/util/resources/cldr/NorwegianFallbackTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, 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,15 +23,12 @@ /* * @test - * @bug 8282227 + * @bug 8282227 8174269 * @modules jdk.localedata * @summary Checks Norwegian locale fallback retrieves resource bundles correctly. - * @run main/othervm -Djava.locale.providers=COMPAT NorwegianFallbackTest nb - * @run main/othervm -Djava.locale.providers=COMPAT NorwegianFallbackTest nn - * @run main/othervm -Djava.locale.providers=COMPAT NorwegianFallbackTest no - * @run main/othervm -Djava.locale.providers=CLDR NorwegianFallbackTest nb - * @run main/othervm -Djava.locale.providers=CLDR NorwegianFallbackTest nn - * @run main/othervm -Djava.locale.providers=CLDR NorwegianFallbackTest no + * @run main NorwegianFallbackTest nb + * @run main NorwegianFallbackTest nn + * @run main NorwegianFallbackTest no */ import java.text.DateFormatSymbols; diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java index a468f6b1f1b..3e2c1208bc9 100644 --- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java +++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8181157 8202537 8234347 8236548 8261279 8322647 + * @bug 8181157 8202537 8234347 8236548 8261279 8322647 8174269 * @modules jdk.localedata * @summary Checks CLDR time zone names are generated correctly at * either build or runtime @@ -51,80 +51,80 @@ Object[][] sampleTZs() { return new Object[][] { // tzid, locale, style, expected - // This list is as of CLDR version 33, and should be examined + // This list is as of CLDR version 44, and should be examined // on the CLDR data upgrade. // no "metazone" zones {"Asia/Srednekolymsk", Locale.US, "Srednekolymsk Standard Time", "GMT+11:00", "Srednekolymsk Daylight Time", - "GMT+11:00", + "GMT+12:00", "Srednekolymsk Time", "GMT+11:00"}, {"Asia/Srednekolymsk", Locale.FRANCE, "Srednekolymsk (heure standard)", "UTC+11:00", "Srednekolymsk (heure d\u2019\u00e9t\u00e9)", - "UTC+11:00", + "UTC+12:00", "heure : Srednekolymsk", "UTC+11:00"}, {"America/Punta_Arenas", Locale.US, "Punta Arenas Standard Time", "GMT-03:00", "Punta Arenas Daylight Time", - "GMT-03:00", + "GMT-02:00", "Punta Arenas Time", "GMT-03:00"}, {"America/Punta_Arenas", Locale.FRANCE, "Punta Arenas (heure standard)", "UTC\u221203:00", "Punta Arenas (heure d\u2019\u00e9t\u00e9)", - "UTC\u221203:00", + "UTC\u221202:00", "heure : Punta Arenas", "UTC\u221203:00"}, {"Asia/Famagusta", Locale.US, "Famagusta Standard Time", - "GMT+02:00", + "EET", "Famagusta Daylight Time", - "GMT+03:00", + "EEST", "Famagusta Time", - "GMT+02:00"}, + "EET"}, {"Asia/Famagusta", Locale.FRANCE, "Famagouste (heure standard)", - "UTC+02:00", + "EET", "Famagouste (heure d\u2019\u00e9t\u00e9)", - "UTC+03:00", + "EEST", "heure : Famagouste", - "UTC+02:00"}, + "EET"}, {"Europe/Astrakhan", Locale.US, "Astrakhan Standard Time", "GMT+04:00", "Astrakhan Daylight Time", - "GMT+04:00", + "GMT+05:00", "Astrakhan Time", "GMT+04:00"}, {"Europe/Astrakhan", Locale.FRANCE, "Astrakhan (heure standard)", "UTC+04:00", "Astrakhan (heure d\u2019\u00e9t\u00e9)", - "UTC+04:00", + "UTC+05:00", "heure : Astrakhan", "UTC+04:00"}, {"Europe/Saratov", Locale.US, "Saratov Standard Time", "GMT+04:00", "Saratov Daylight Time", - "GMT+04:00", + "GMT+05:00", "Saratov Time", "GMT+04:00"}, {"Europe/Saratov", Locale.FRANCE, "Saratov (heure standard)", "UTC+04:00", "Saratov (heure d\u2019\u00e9t\u00e9)", - "UTC+04:00", + "UTC+05:00", "heure : Saratov", "UTC+04:00"}, {"Europe/Ulyanovsk", Locale.US, "Ulyanovsk Standard Time", "GMT+04:00", "Ulyanovsk Daylight Time", - "GMT+04:00", + "GMT+05:00", "Ulyanovsk Time", "GMT+04:00"}, {"Europe/Ulyanovsk", Locale.FRANCE, "Oulianovsk (heure standard)", "UTC+04:00", "Oulianovsk (heure d\u2019\u00e9t\u00e9)", - "UTC+04:00", + "UTC+05:00", "heure : Oulianovsk", "UTC+04:00"}, {"Pacific/Bougainville", Locale.US, "Bougainville Standard Time", @@ -142,37 +142,37 @@ Object[][] sampleTZs() { {"Europe/Istanbul", Locale.US, "Istanbul Standard Time", "GMT+03:00", "Istanbul Daylight Time", - "GMT+03:00", + "GMT+04:00", "Istanbul Time", "GMT+03:00"}, {"Europe/Istanbul", Locale.FRANCE, "Istanbul (heure standard)", "UTC+03:00", "Istanbul (heure d\u2019\u00e9t\u00e9)", - "UTC+03:00", + "UTC+04:00", "heure : Istanbul", "UTC+03:00"}, {"Asia/Istanbul", Locale.US, "Istanbul Standard Time", "GMT+03:00", "Istanbul Daylight Time", - "GMT+03:00", + "GMT+04:00", "Istanbul Time", "GMT+03:00"}, {"Asia/Istanbul", Locale.FRANCE, "Istanbul (heure standard)", "UTC+03:00", "Istanbul (heure d\u2019\u00e9t\u00e9)", - "UTC+03:00", + "UTC+04:00", "heure : Istanbul", "UTC+03:00"}, {"Turkey", Locale.US, "Istanbul Standard Time", "GMT+03:00", "Istanbul Daylight Time", - "GMT+03:00", + "GMT+04:00", "Istanbul Time", "GMT+03:00"}, {"Turkey", Locale.FRANCE, "Istanbul (heure standard)", "UTC+03:00", "Istanbul (heure d\u2019\u00e9t\u00e9)", - "UTC+03:00", + "UTC+04:00", "heure : Istanbul", "UTC+03:00"}, diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java index 0e485bd75dd..97626ecc1b9 100644 --- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java +++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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,9 +28,7 @@ import java.util.Locale; import java.util.stream.Collectors; -import jdk.tools.jlink.plugin.Plugin; import jdk.tools.jlink.plugin.PluginException; -import jdk.tools.jlink.internal.PluginRepository; import jdk.tools.jlink.internal.TaskHelper; import jdk.tools.jlink.internal.plugins.PluginsResourceBundle; import tests.Helper; @@ -42,7 +40,7 @@ * @test * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918 * 8179071 8202537 8221432 8222098 8251317 8258794 8265315 - * 8296248 8306116 + * 8296248 8306116 8174269 * @summary IncludeLocalesPlugin tests * @author Naoto Sato * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) @@ -86,10 +84,6 @@ public class IncludeLocalesPluginTest { "", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", @@ -107,10 +101,6 @@ public class IncludeLocalesPluginTest { "--include-locales=*", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", @@ -128,9 +118,6 @@ public class IncludeLocalesPluginTest { "--include-locales=en-001,es-419", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_AU.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_es.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_es_AR.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class", @@ -142,8 +129,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), List.of( @@ -175,8 +160,6 @@ public class IncludeLocalesPluginTest { "--include-locales=en,ja", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class"), List.of( @@ -184,8 +167,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), List.of( @@ -212,8 +193,6 @@ public class IncludeLocalesPluginTest { "--include-locales=*-AT", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_de.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_de_AT.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de_AT.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", @@ -224,9 +203,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), List.of( @@ -240,8 +216,6 @@ public class IncludeLocalesPluginTest { "--include-locales=*-IN", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_IN.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_hi_IN.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_IN.class"), List.of( @@ -250,10 +224,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", "/jdk.localedata/sun/text/resources/ext/BreakIteratorResources_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", "/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_as_IN.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", @@ -283,12 +253,8 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/BreakIteratorResources_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class"), + "/jdk.localedata/sun/text/resources/ext/BreakIteratorResources_th.class"), List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), @@ -303,19 +269,12 @@ public class IncludeLocalesPluginTest { "--include-locales=zh-HK", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh_HK.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh_TW.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), List.of( "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), @@ -330,18 +289,12 @@ public class IncludeLocalesPluginTest { "--include-locales=zh-Hans", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_zh_SG.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), List.of( "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), @@ -356,9 +309,6 @@ public class IncludeLocalesPluginTest { "--include-locales=nb,nn,no", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_no.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_no_NO.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_no_NO_NY.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nb.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nn.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_no.class"), @@ -367,9 +317,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), @@ -385,10 +332,6 @@ public class IncludeLocalesPluginTest { "--include-locales=he,id,yi", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_he.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_he_IL.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_id.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_id_ID.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_he.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_id.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_yi.class"), @@ -397,9 +340,6 @@ public class IncludeLocalesPluginTest { "/jdk.localedata/sun/text/resources/ext/thai_dict", "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), @@ -414,11 +354,8 @@ public class IncludeLocalesPluginTest { "--include-locales=en,ja-u-nu-thai", "jdk.localedata", List.of( - "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class"), - List.of( - "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", - "/jdk.localedata/sun/text/resources/ext/FormatData_th.class"), + List.of(), List.of( "(root)", "en", "en_001", "en_150", "en_AE", "en_AG", "en_AI", "en_AS", "en_AT", "en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ", @@ -477,8 +414,7 @@ public class IncludeLocalesPluginTest { public static void main(String[] args) throws Exception { helper = Helper.newHelper(); if (helper == null) { - System.err.println("Test not run"); - return; + throw new RuntimeException("Helper could not be initialized"); } helper.generateDefaultModules(); From 721bfee53af5bc2e2d67eebc7b82f09a642d5309 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Tue, 5 Mar 2024 20:31:17 +0000 Subject: [PATCH 63/86] 8326891: Prefer RPATH over RUNPATH for $ORIGIN rpaths in internal JDK binaries Reviewed-by: ihse, dholmes --- make/autoconf/flags-cflags.m4 | 10 ++++++++-- test/jdk/tools/launcher/RunpathTest.java | 23 +++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 index efc8025a074..dc4426d1d45 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 @@ -28,7 +28,7 @@ # Setup flags for C/C++ compiler # -############################################################################### +################################################################################ # # How to compile shared libraries. # @@ -37,7 +37,10 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], if test "x$TOOLCHAIN_TYPE" = xgcc; then # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' + # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths. + # This protects internal library dependencies within the JDK from being + # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information. + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags' SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' @@ -60,6 +63,9 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' + if test "x$OPENJDK_TARGET_OS" = xlinux; then + SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags" + fi SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' # arm specific settings diff --git a/test/jdk/tools/launcher/RunpathTest.java b/test/jdk/tools/launcher/RunpathTest.java index cc050c589c7..c83a43195db 100644 --- a/test/jdk/tools/launcher/RunpathTest.java +++ b/test/jdk/tools/launcher/RunpathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -24,7 +24,8 @@ /* * @test * @bug 7190813 8022719 - * @summary Check for extended RPATHs on *nixes + * @summary Check for extended RPATHs on Linux + * @requires os.family == "linux" * @compile -XDignore.symbol.file RunpathTest.java * @run main RunpathTest * @author ksrini @@ -57,25 +58,23 @@ void elfCheck(String javacmd, String expectedRpath) { final TestResult tr = doExec(elfreaderCmd, "-d", javacmd); if (!tr.matches(expectedRpath)) { System.out.println(tr); - throw new RuntimeException("FAILED: RPATH/RUNPATH strings " + + throw new RuntimeException("FAILED: RPATH strings " + expectedRpath + " not found in " + javaCmd); } - System.out.println(javacmd + " contains expected RPATHS/RUNPATH"); + System.out.println(javacmd + " contains expected RPATHS"); } void testRpath() { - String expectedRpath = ".*R(UN)?PATH.*\\$ORIGIN/../lib.*"; + String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib.*"; elfCheck(javaCmd, expectedRpath); } public static void main(String... args) throws Exception { - if (isLinux) { - RunpathTest rp = new RunpathTest(); - if (rp.elfreaderCmd == null) { - System.err.println("Warning: test passes vacuously"); - return; - } - rp.testRpath(); + RunpathTest rp = new RunpathTest(); + if (rp.elfreaderCmd == null) { + System.err.println("Warning: test passes vacuously"); + return; } + rp.testRpath(); } } From a7280d1b9657f1afd07d4a550b687f6ad3f9c885 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Tue, 5 Mar 2024 20:32:33 +0000 Subject: [PATCH 64/86] 8311002: missing @since info in 21 files in jdk.security.auth Reviewed-by: mullan --- .../classes/com/sun/security/auth/NTDomainPrincipal.java | 4 +++- .../classes/com/sun/security/auth/NTNumericCredential.java | 4 +++- .../share/classes/com/sun/security/auth/NTSid.java | 4 +++- .../classes/com/sun/security/auth/NTSidDomainPrincipal.java | 4 +++- .../classes/com/sun/security/auth/NTSidGroupPrincipal.java | 4 +++- .../com/sun/security/auth/NTSidPrimaryGroupPrincipal.java | 4 +++- .../classes/com/sun/security/auth/NTSidUserPrincipal.java | 4 +++- .../share/classes/com/sun/security/auth/NTUserPrincipal.java | 4 +++- .../classes/com/sun/security/auth/PrincipalComparator.java | 4 +++- .../com/sun/security/auth/UnixNumericGroupPrincipal.java | 4 +++- .../com/sun/security/auth/UnixNumericUserPrincipal.java | 4 +++- .../share/classes/com/sun/security/auth/UnixPrincipal.java | 4 +++- .../com/sun/security/auth/callback/TextCallbackHandler.java | 4 +++- .../share/classes/com/sun/security/auth/login/ConfigFile.java | 4 +++- .../classes/com/sun/security/auth/module/JndiLoginModule.java | 3 ++- .../com/sun/security/auth/module/KeyStoreLoginModule.java | 4 +++- .../classes/com/sun/security/auth/module/Krb5LoginModule.java | 4 +++- .../classes/com/sun/security/auth/module/NTLoginModule.java | 4 +++- .../share/classes/com/sun/security/auth/module/NTSystem.java | 3 ++- .../classes/com/sun/security/auth/module/UnixLoginModule.java | 3 ++- .../classes/com/sun/security/auth/module/UnixSystem.java | 4 +++- 21 files changed, 60 insertions(+), 21 deletions(-) diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java index 771df0f6097..b0d0d815f91 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -47,6 +47,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTDomainPrincipal implements Principal, java.io.Serializable { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java index 59d318b1a30..3867b08ee2d 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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,6 +28,8 @@ /** * This class abstracts an NT security token * and provides a mechanism to do same-process security impersonation. + * + * @since 1.4 */ public class NTNumericCredential { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java index 1bf37f6461d..686284ee003 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -49,6 +49,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTSid implements Principal, java.io.Serializable { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java index 78858375a05..58fa2cc1ab8 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -42,6 +42,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTSidDomainPrincipal extends NTSid { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java index 3ebd8fe996a..392570d3364 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -39,6 +39,8 @@ * @see java.security.Principal * @see javax.security.auth.Subject * @see com.sun.security.auth.NTSid + * + * @since 1.4 */ public class NTSidGroupPrincipal extends NTSid { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java index 7b636f42222..eb41b1e8911 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -38,6 +38,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTSidPrimaryGroupPrincipal extends NTSid { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java index 983dc2b0590..98016558031 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -38,6 +38,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTSidUserPrincipal extends NTSid { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java index d4b9dcef3a9..6ede3347025 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -43,6 +43,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class NTUserPrincipal implements Principal, java.io.Serializable { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java index f21a09a5d9a..7b24101c5bc 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2024, 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 @@ -49,6 +49,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public interface PrincipalComparator { /** diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java index e8c12e2918d..b6213a187b0 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -44,6 +44,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class UnixNumericGroupPrincipal implements Principal, diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java index 2a48332eedd..d25ff71f270 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -43,6 +43,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class UnixNumericUserPrincipal implements Principal, diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java index b8a80f75aad..02d3087b12c 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -43,6 +43,8 @@ * * @see java.security.Principal * @see javax.security.auth.Subject + * + * @since 1.4 */ public class UnixPrincipal implements Principal, java.io.Serializable { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java index ba078bab99f..b034c815e18 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -43,6 +43,8 @@ * This can be used by a JAAS application to instantiate a * CallbackHandler * @see javax.security.auth.callback + * + * @since 1.4 */ public class TextCallbackHandler implements CallbackHandler { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java index d89c12c5e35..bb371333dfd 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -86,6 +86,8 @@ * * @see javax.security.auth.login.LoginContext * @see java.security.Security security properties + * + * @since 1.4 */ public class ConfigFile extends Configuration { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java index 7e36b125c00..4694134e388 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -150,6 +150,7 @@ * have completed. * * + * @since 1.4 */ public class JndiLoginModule implements LoginModule { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java index 7e3c597a131..d823278405b 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -110,6 +110,8 @@ * privateKeyPasswordURL must not be specified. * * + * + * @since 1.4 */ public class KeyStoreLoginModule implements LoginModule { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java index 8147fa76a37..4255e0aac9d 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -364,6 +364,8 @@ * * * @author Ram Marti + * + * @since 1.4 */ public class Krb5LoginModule implements LoginModule { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java index 60e93fa5c7c..55f6d7b6a4c 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -56,6 +56,8 @@ * will be output to the output stream, System.out. * * @see javax.security.auth.spi.LoginModule + * + * @since 1.4 */ public class NTLoginModule implements LoginModule { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java index 43bcd7811ea..0814f0f7332 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -29,6 +29,7 @@ * This class implementation retrieves and makes available NT * security information for the current user. * + * @since 1.4 */ public class NTSystem { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java index 41c374bfeea..785b178e296 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -46,6 +46,7 @@ * If set to true in the login Configuration, * debug messages will be output to the output stream, System.out. * + * @since 1.4 */ public class UnixLoginModule implements LoginModule { diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java index 3acfd61aaa5..96bc1fb32fc 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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,6 +28,8 @@ /** * This class implementation retrieves and makes available Unix * UID/GID/groups information for the current user. + * + * @since 1.4 */ public class UnixSystem { From b665fe3ac10f4e85b91737228780b1d50ae81514 Mon Sep 17 00:00:00 2001 From: Justin Lu Date: Tue, 5 Mar 2024 22:37:58 +0000 Subject: [PATCH 65/86] 6801704: ChoiceFormat::applyPattern inconsistency for invalid patterns Reviewed-by: naoto --- .../share/classes/java/text/ChoiceFormat.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java index b9aad971aa5..94b8c188c93 100644 --- a/src/java.base/share/classes/java/text/ChoiceFormat.java +++ b/src/java.base/share/classes/java/text/ChoiceFormat.java @@ -134,6 +134,16 @@ * Use two single quotes in a row to produce a literal single quote. For example, * {@code new ChoiceFormat("1# ''one'' ").format(1)} returns {@code " 'one' "}. * + * @apiNote A subclass could perform more consistent pattern validation by + * throwing an {@code IllegalArgumentException} for all incorrect cases. + * @implNote Given an incorrect pattern, this implementation may either + * throw an exception or succeed and discard the incorrect portion. A {@code + * NumberFormatException} is thrown if a {@code limit} can not be + * parsed as a numeric value and an {@code IllegalArgumentException} is thrown + * if a {@code SubPattern} is missing, or the intervals are not ascending. + * Discarding the incorrect portion may result in a ChoiceFormat with + * empty {@code limits} and {@code formats}. + * *

    Usage Information

    * *

    @@ -227,11 +237,12 @@ public class ChoiceFormat extends NumberFormat { private static final long serialVersionUID = 1795184449645032964L; /** - * Apply the given pattern to this ChoiceFormat object. The syntax - * for the ChoiceFormat pattern can be seen in the {@linkplain ##patterns - * Patterns} section. Unlike {@link #setChoices(double[], String[])} this - * method will throw an {@code IllegalArgumentException} if the {@code - * limits} are not in ascending order. + * Apply the given pattern to this ChoiceFormat object. The syntax and error + * related caveats for the ChoiceFormat pattern can be found in the + * {@linkplain ##patterns Patterns} section. Unlike {@link #setChoices(double[], + * String[])}, this method will throw an {@code IllegalArgumentException} if + * the {@code limits} are not in ascending order. + * * @param newPattern a pattern string * @throws NullPointerException if {@code newPattern} * is {@code null} @@ -399,9 +410,11 @@ public String toPattern() { /** * Constructs a ChoiceFormat with limits and corresponding formats - * based on the pattern. - * The syntax for the ChoiceFormat pattern can be seen in the {@linkplain - * ##patterns Patterns} section. + * based on the pattern. The syntax and error related caveats for the + * ChoiceFormat pattern can be found in the {@linkplain ##patterns Patterns} + * section. Unlike {@link #ChoiceFormat(double[], String[])}, this constructor will + * throw an {@code IllegalArgumentException} if the {@code limits} are not + * in ascending order. * * @param newPattern the new pattern string * @throws NullPointerException if {@code newPattern} is From fcf48ab3d36a7f8eed84e81c3e2445adcbc95374 Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Tue, 5 Mar 2024 23:02:14 +0000 Subject: [PATCH 66/86] 8327391: Add SipHash attribution file Reviewed-by: dholmes, lfoltan --- src/hotspot/share/legal/siphash.md | 150 +++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 src/hotspot/share/legal/siphash.md diff --git a/src/hotspot/share/legal/siphash.md b/src/hotspot/share/legal/siphash.md new file mode 100644 index 00000000000..1583f229e1e --- /dev/null +++ b/src/hotspot/share/legal/siphash.md @@ -0,0 +1,150 @@ +## SipHash v1.0-68c8a7c + +### Notice +SipHash reference C implementation + +``` + Copyright (c) 2012-2021 Jean-Philippe Aumasson + + Copyright (c) 2012-2014 Daniel J. Bernstein + To the extent possible under law, the author(s) have dedicated all copyright + and related and neighboring rights to this software to the public domain + worldwide. This software is distributed without any warranty. + You should have received a copy of the CC0 Public Domain Dedication along + with + this software. If not, see + . +``` + +### Licenses +The code is dual-licensed CCO and MIT + +#### MIT License +``` +Copyright 2012-2024 JP Aumasson + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` + +#### CC0 1.0 Universal +``` +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. + +For more information, please see + + +``` From 96bfe613c31f890bc4bbe989c5348ad11c070bf6 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 6 Mar 2024 05:29:42 +0000 Subject: [PATCH 67/86] 8326458: Menu mnemonics don't toggle in Windows LAF when F10 is pressed Reviewed-by: psadhukhan, aivanov --- .../swing/plaf/windows/WindowsMenuBarUI.java | 19 +-- .../swing/JMenuBar/TestMenuMnemonic.java | 132 ++++++++++++++++++ 2 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java index 23df6b67849..10aadfa7cd8 100644 --- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java +++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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 @@ -139,19 +139,22 @@ protected void installKeyboardActions() { */ @SuppressWarnings("serial") // Superclass is not serializable across versions private static class TakeFocus extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { JMenuBar menuBar = (JMenuBar)e.getSource(); JMenu menu = menuBar.getMenu(0); if (menu != null) { MenuSelectionManager msm = MenuSelectionManager.defaultManager(); - MenuElement[] path = new MenuElement[2]; - path[0] = (MenuElement)menuBar; - path[1] = (MenuElement)menu; - msm.setSelectedPath(path); - - // show mnemonics - WindowsLookAndFeel.setMnemonicHidden(false); + MenuElement[] selectedPath = msm.getSelectedPath(); + if (selectedPath.length > 0 && (selectedPath[0] instanceof JMenuBar)) { + msm.clearSelectedPath(); + WindowsLookAndFeel.setMnemonicHidden(true); + } else { + MenuElement[] path = {menuBar, menu}; + msm.setSelectedPath(path); + WindowsLookAndFeel.setMnemonicHidden(false); + } WindowsLookAndFeel.repaintRootPane(menuBar); } } diff --git a/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java new file mode 100644 index 00000000000..500d3ca3408 --- /dev/null +++ b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2024, 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. + * + * 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. + */ + +/* + * @test + * @bug 8326458 + * @key headful + * @requires (os.family == "windows") + * @modules java.desktop/com.sun.java.swing.plaf.windows + * @summary Verifies if menu mnemonics toggle on F10 press in Windows LAF + * @run main TestMenuMnemonic + */ + +import java.awt.Robot; +import java.awt.event.KeyEvent; +import java.util.concurrent.atomic.AtomicInteger; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.MenuElement; +import javax.swing.MenuSelectionManager; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; + +import com.sun.java.swing.plaf.windows.WindowsLookAndFeel; + +public class TestMenuMnemonic { + + private static JFrame frame; + private static JMenuBar menuBar; + private static JMenu fileMenu; + + private static final AtomicInteger mnemonicHideCount = new AtomicInteger(0); + private static final AtomicInteger mnemonicShowCount = new AtomicInteger(0); + + private static final int EXPECTED = 5; + + public static void main(String[] args) throws Exception { + UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); + Robot robot = new Robot(); + robot.setAutoDelay(100); + + try { + SwingUtilities.invokeAndWait(TestMenuMnemonic::createAndShowUI); + robot.waitForIdle(); + robot.delay(1000); + + for (int i = 0; i < EXPECTED * 2; i++) { + robot.keyPress(KeyEvent.VK_F10); + robot.waitForIdle(); + robot.delay(50); + robot.keyRelease(KeyEvent.VK_F10); + robot.waitForIdle(); + robot.delay(50); + SwingUtilities.invokeAndWait(TestMenuMnemonic::verifyMnemonicsState); + } + + if (mnemonicShowCount.get() != EXPECTED + && mnemonicHideCount.get() != EXPECTED) { + throw new RuntimeException("Mismatch in Mnemonic show/hide on F10 press"); + } + } finally { + SwingUtilities.invokeAndWait(() -> { + if (frame != null) { + frame.dispose(); + } + }); + } + } + + private static void verifyMnemonicsState() { + MenuSelectionManager msm = + MenuSelectionManager.defaultManager(); + MenuElement[] selectedPath = msm.getSelectedPath(); + if (WindowsLookAndFeel.isMnemonicHidden()) { + mnemonicHideCount.getAndIncrement(); + // Check if selection is cleared when mnemonics are hidden + if (selectedPath.length != 0) { + throw new RuntimeException("Menubar is active after" + + " mnemonics are hidden"); + } + } else { + mnemonicShowCount.getAndIncrement(); + if (selectedPath.length != 2 + && (selectedPath[0] != menuBar || selectedPath[1] != fileMenu)) { + throw new RuntimeException("No Menu and Menubar is active when" + + " mnemonics are shown"); + } + } + } + + private static void createAndShowUI() { + frame = new JFrame("Test Menu Mnemonic Show/Hide"); + menuBar = new JMenuBar(); + fileMenu = new JMenu("File"); + JMenu editMenu = new JMenu("Edit"); + fileMenu.setMnemonic(KeyEvent.VK_F); + editMenu.setMnemonic(KeyEvent.VK_E); + JMenuItem item1 = new JMenuItem("Item 1"); + JMenuItem item2 = new JMenuItem("Item 2"); + fileMenu.add(item1); + fileMenu.add(item2); + menuBar.add(fileMenu); + menuBar.add(editMenu); + frame.setJMenuBar(menuBar); + frame.setSize(250, 200); + frame.setLocationRelativeTo(null); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setVisible(true); + } +} From bee50cd330c9f31bf8830caf87f97cd72e7adc95 Mon Sep 17 00:00:00 2001 From: Adam Sotona Date: Wed, 6 Mar 2024 06:15:10 +0000 Subject: [PATCH 68/86] 8294961: Convert java.base/java.lang.reflect.ProxyGenerator to use the Classfile API to generate proxy classes Reviewed-by: mchung --- .../classes/java/lang/reflect/Proxy.java | 1 + .../java/lang/reflect/ProxyGenerator.java | 767 ++++++++---------- 2 files changed, 354 insertions(+), 414 deletions(-) diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java index 3c37153b875..24c6aaee01c 100644 --- a/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -618,6 +618,7 @@ private static boolean isDebug(String flag) { private final List> interfaces; private final ProxyClassContext context; ProxyBuilder(ClassLoader loader, List> interfaces) { + Objects.requireNonNull(interfaces); if (!VM.isModuleSystemInited()) { throw new InternalError("Proxy is not supported until " + "module system is fully initialized"); diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java index 8911ba11903..9637af4b251 100644 --- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java +++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java @@ -25,16 +25,18 @@ package java.lang.reflect; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import sun.invoke.util.Wrapper; +import java.lang.classfile.*; +import java.lang.classfile.constantpool.*; +import java.lang.classfile.attribute.ExceptionsAttribute; import sun.security.action.GetBooleanAction; import java.io.IOException; -import java.lang.invoke.MethodType; +import static java.lang.classfile.ClassFile.*; +import java.lang.classfile.attribute.StackMapFrameInfo; +import java.lang.classfile.attribute.StackMapTableAttribute; +import java.lang.constant.ClassDesc; +import static java.lang.constant.ConstantDescs.*; +import java.lang.constant.MethodTypeDesc; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -43,8 +45,8 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; - -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import java.util.Objects; +import java.util.function.IntFunction; /** * ProxyGenerator contains the code to generate a dynamic proxy class @@ -53,33 +55,34 @@ * The external interface to ProxyGenerator is the static * "generateProxyClass" method. */ -final class ProxyGenerator extends ClassWriter { - private static final int CLASSFILE_VERSION = ClassFileFormatVersion.latest().major(); - private static final String JL_CLASS = "java/lang/Class"; - private static final String JL_OBJECT = "java/lang/Object"; - private static final String JL_THROWABLE = "java/lang/Throwable"; - private static final String JL_CLASS_NOT_FOUND_EX = "java/lang/ClassNotFoundException"; - private static final String JL_ILLEGAL_ACCESS_EX = "java/lang/IllegalAccessException"; - - private static final String JL_NO_CLASS_DEF_FOUND_ERROR = "java/lang/NoClassDefFoundError"; - private static final String JL_NO_SUCH_METHOD_EX = "java/lang/NoSuchMethodException"; - private static final String JL_NO_SUCH_METHOD_ERROR = "java/lang/NoSuchMethodError"; - private static final String JLI_LOOKUP = "java/lang/invoke/MethodHandles$Lookup"; - private static final String JLI_METHODHANDLES = "java/lang/invoke/MethodHandles"; - - private static final String JLR_INVOCATION_HANDLER = "java/lang/reflect/InvocationHandler"; - private static final String JLR_PROXY = "java/lang/reflect/Proxy"; - private static final String JLR_UNDECLARED_THROWABLE_EX = "java/lang/reflect/UndeclaredThrowableException"; - - private static final String LJL_CLASS = "Ljava/lang/Class;"; - private static final String LJL_CLASSLOADER = "Ljava/lang/ClassLoader;"; - private static final String LJLR_METHOD = "Ljava/lang/reflect/Method;"; - private static final String LJLR_INVOCATION_HANDLER = "Ljava/lang/reflect/InvocationHandler;"; - - private static final String MJLR_INVOCATIONHANDLER = "(Ljava/lang/reflect/InvocationHandler;)V"; - - private static final String NAME_CTOR = ""; - private static final String NAME_CLINIT = ""; +final class ProxyGenerator { + + private static final ClassDesc + CD_ClassLoader = ClassDesc.ofInternalName("java/lang/ClassLoader"), + CD_ClassNotFoundException = ClassDesc.ofInternalName("java/lang/ClassNotFoundException"), + CD_IllegalAccessException = ClassDesc.ofInternalName("java/lang/IllegalAccessException"), + CD_InvocationHandler = ClassDesc.ofInternalName("java/lang/reflect/InvocationHandler"), + CD_Method = ClassDesc.ofInternalName("java/lang/reflect/Method"), + CD_NoClassDefFoundError = ClassDesc.ofInternalName("java/lang/NoClassDefFoundError"), + CD_NoSuchMethodError = ClassDesc.ofInternalName("java/lang/NoSuchMethodError"), + CD_NoSuchMethodException = ClassDesc.ofInternalName("java/lang/NoSuchMethodException"), + CD_Proxy = ClassDesc.ofInternalName("java/lang/reflect/Proxy"), + CD_UndeclaredThrowableException = ClassDesc.ofInternalName("java/lang/reflect/UndeclaredThrowableException"); + + private static final MethodTypeDesc + MTD_boolean = MethodTypeDesc.of(CD_boolean), + MTD_void_InvocationHandler = MethodTypeDesc.of(CD_void, CD_InvocationHandler), + MTD_void_String = MethodTypeDesc.of(CD_void, CD_String), + MTD_void_Throwable = MethodTypeDesc.of(CD_void, CD_Throwable), + MTD_Class = MethodTypeDesc.of(CD_Class), + MTD_Class_String_boolean_ClassLoader = MethodTypeDesc.of(CD_Class, CD_String, CD_boolean, CD_ClassLoader), + MTD_ClassLoader = MethodTypeDesc.of(CD_ClassLoader), + MTD_MethodHandles$Lookup = MethodTypeDesc.of(CD_MethodHandles_Lookup), + MTD_MethodHandles$Lookup_MethodHandles$Lookup = MethodTypeDesc.of(CD_MethodHandles_Lookup, CD_MethodHandles_Lookup), + MTD_Method_String_ClassArray = MethodTypeDesc.of(CD_Method, CD_String, CD_Class.arrayType()), + MTD_Object_Object_Method_ObjectArray = MethodTypeDesc.of(CD_Object, CD_Object, CD_Method, CD_Object.arrayType()), + MTD_String = MethodTypeDesc.of(CD_String); + private static final String NAME_LOOKUP_ACCESSOR = "proxyClassLookup"; private static final Class[] EMPTY_CLASS_ARRAY = new Class[0]; @@ -103,25 +106,122 @@ final class ProxyGenerator extends ClassWriter { private static final ProxyMethod equalsMethod; private static final ProxyMethod toStringMethod; + private static final ClassModel TEMPLATE; + + private static final ClassEntry CE_Class; + private static final ClassEntry CE_ClassNotFoundException; + private static final ClassEntry CE_NoClassDefFoundError; + private static final ClassEntry CE_NoSuchMethodError; + private static final ClassEntry CE_NoSuchMethodException; + private static final ClassEntry CE_Object; + private static final ClassEntry CE_Throwable; + private static final ClassEntry CE_UndeclaredThrowableException; + + private static final FieldRefEntry FRE_Proxy_h; + + private static final InterfaceMethodRefEntry IMRE_InvocationHandler_invoke; + + private static final MethodRefEntry MRE_Class_forName; + private static final MethodRefEntry MRE_Class_getClassLoader; + private static final MethodRefEntry MRE_Class_getMethod; + private static final MethodRefEntry MRE_NoClassDefFoundError_init; + private static final MethodRefEntry MRE_NoSuchMethodError_init; + private static final MethodRefEntry MRE_Throwable_getMessage; + private static final MethodRefEntry MRE_UndeclaredThrowableException_init; + + private static final Utf8Entry UE_Method; + + private static final List THROWABLE_STACK; + + @SuppressWarnings("unchecked") + private static T entryByIndex(int index) { + return (T) TEMPLATE.constantPool().entryByIndex(index); + } + static { + // static template ClassModel holds pre-defined constant pool entries + // proxy transformed from the template shares the template constant pool + // each direct use of the template pool entry is significantly faster + var cc = ClassFile.of(); + var ei = new int[21]; + TEMPLATE = cc.parse(cc.build(CD_Proxy, clb -> { + clb.withSuperclass(CD_Proxy); + generateConstructor(clb); + generateLookupAccessor(clb); + var cp = clb.constantPool(); + + ei[0] = cp.classEntry(CD_Class).index(); + ei[1] = cp.classEntry(CD_ClassNotFoundException).index(); + ei[2] = cp.classEntry(CD_NoClassDefFoundError).index(); + ei[3] = cp.classEntry(CD_NoSuchMethodError).index(); + ei[4] = cp.classEntry(CD_NoSuchMethodException).index(); + ei[5] = cp.classEntry(CD_Object).index(); + ei[6] = cp.classEntry(CD_Throwable).index(); + ei[7] = cp.classEntry(CD_UndeclaredThrowableException).index(); + + ei[8] = cp.fieldRefEntry(CD_Proxy, handlerFieldName, CD_InvocationHandler).index(); + + ei[9] = cp.interfaceMethodRefEntry(CD_InvocationHandler, "invoke", MTD_Object_Object_Method_ObjectArray).index(); + + ei[10] = cp.methodRefEntry(CD_Class, "forName", MTD_Class_String_boolean_ClassLoader).index(); + ei[11] = cp.methodRefEntry(CD_Class, "getClassLoader", MTD_ClassLoader).index(); + ei[12] = cp.methodRefEntry(CD_Class, "getMethod", MTD_Method_String_ClassArray).index(); + ei[13] = cp.methodRefEntry(CD_NoClassDefFoundError, INIT_NAME, MTD_void_String).index(); + ei[14] = cp.methodRefEntry(CD_NoSuchMethodError, INIT_NAME, MTD_void_String).index(); + ei[15] = cp.methodRefEntry(CD_Throwable, "getMessage", MTD_String).index(); + ei[16] = cp.methodRefEntry(CD_UndeclaredThrowableException, INIT_NAME, MTD_void_Throwable).index(); + + ei[17] = cp.utf8Entry(CD_Method).index(); + + ei[18] = cp.utf8Entry("m0").index(); + ei[19] = cp.utf8Entry("m1").index(); + ei[20] = cp.utf8Entry("m2").index(); + })); + + CE_Class = entryByIndex(ei[0]); + CE_ClassNotFoundException = entryByIndex(ei[1]); + CE_NoClassDefFoundError = entryByIndex(ei[2]); + CE_NoSuchMethodError = entryByIndex(ei[3]); + CE_NoSuchMethodException = entryByIndex(ei[4]); + CE_Object = entryByIndex(ei[5]); + CE_Throwable = entryByIndex(ei[6]); + CE_UndeclaredThrowableException = entryByIndex(ei[7]); + + FRE_Proxy_h = entryByIndex(ei[8]); + + IMRE_InvocationHandler_invoke = entryByIndex(ei[9]); + + MRE_Class_forName = entryByIndex(ei[10]); + MRE_Class_getClassLoader = entryByIndex(ei[11]); + MRE_Class_getMethod = entryByIndex(ei[12]); + MRE_NoClassDefFoundError_init = entryByIndex(ei[13]); + MRE_NoSuchMethodError_init = entryByIndex(ei[14]); + MRE_Throwable_getMessage = entryByIndex(ei[15]); + MRE_UndeclaredThrowableException_init = entryByIndex(ei[16]); + + UE_Method = entryByIndex(ei[17]); + try { - hashCodeMethod = new ProxyMethod(Object.class.getMethod("hashCode"), "m0"); - equalsMethod = new ProxyMethod(Object.class.getMethod("equals", Object.class), "m1"); - toStringMethod = new ProxyMethod(Object.class.getMethod("toString"), "m2"); + hashCodeMethod = new ProxyMethod(Object.class.getMethod("hashCode"), entryByIndex(ei[18])); + equalsMethod = new ProxyMethod(Object.class.getMethod("equals", Object.class), entryByIndex(ei[19])); + toStringMethod = new ProxyMethod(Object.class.getMethod("toString"), entryByIndex(ei[20])); } catch (NoSuchMethodException e) { throw new NoSuchMethodError(e.getMessage()); } + + THROWABLE_STACK = List.of(StackMapFrameInfo.ObjectVerificationTypeInfo.of(CE_Throwable)); } /** - * Class loader + * Classfile context */ - private final ClassLoader loader; + private final ClassFile classfileContext; + private final ConstantPoolBuilder cp; /** * Name of proxy class */ - private final String className; + private ClassEntry classEntry; /** * Proxy interfaces @@ -155,9 +255,12 @@ final class ProxyGenerator extends ClassWriter { */ private ProxyGenerator(ClassLoader loader, String className, List> interfaces, int accessFlags) { - super(ClassWriter.COMPUTE_FRAMES); - this.loader = loader; - this.className = className; + this.classfileContext = ClassFile.of( + ClassFile.StackMapsOption.DROP_STACK_MAPS, + ClassFile.ClassHierarchyResolverOption.of( + ClassHierarchyResolver.ofClassLoading(loader).cached())); + this.cp = ConstantPoolBuilder.of(TEMPLATE); + this.classEntry = cp.classEntry(ClassDesc.of(className)); this.interfaces = interfaces; this.accessFlags = accessFlags; } @@ -174,6 +277,7 @@ static byte[] generateProxyClass(ClassLoader loader, final String name, List> interfaces, int accessFlags) { + Objects.requireNonNull(interfaces); ProxyGenerator gen = new ProxyGenerator(loader, name, interfaces, accessFlags); final byte[] classFile = gen.generateClassFile(); @@ -185,7 +289,7 @@ public Void run() { int i = name.lastIndexOf('.'); Path path; if (i > 0) { - Path dir = Path.of(dotToSlash(name.substring(0, i))); + Path dir = Path.of(name.substring(0, i).replace('.', '/')); Files.createDirectories(dir); path = dir.resolve(name.substring(i + 1) + ".class"); } else { @@ -205,20 +309,22 @@ public Void run() { } /** - * Return an array of the class and interface names from an array of Classes. - * - * @param classes an array of classes or interfaces - * @return the array of class and interface names; or null if classes is - * null or empty + * {@return the entries of the given type} + * @param types the {@code Class} objects, not primitive types nor array types + */ + private static ClassEntry[] toClassEntries(ConstantPoolBuilder cp, List> types) { + var ces = new ClassEntry[types.size()]; + for (int i = 0; i < ces.length; i++) + ces[i] = cp.classEntry(cp.utf8Entry(types.get(i).getName().replace('.', '/'))); + return ces; + } + + /** + * {@return the {@code ClassDesc} of the given type} + * @param type the {@code Class} object */ - private static String[] typeNames(List> classes) { - if (classes == null || classes.size() == 0) - return null; - int size = classes.size(); - String[] ifaces = new String[size]; - for (int i = 0; i < size; i++) - ifaces[i] = dotToSlash(classes.get(i).getName()); - return ifaces; + private static ClassDesc toClassDesc(Class type) { + return ClassDesc.ofDescriptor(type.descriptorString()); } /** @@ -387,34 +493,6 @@ private static List> computeUniqueCatchList(Class[] exceptions) { return uniqueList; } - /** - * Convert a fully qualified class name that uses '.' as the package - * separator, the external representation used by the Java language - * and APIs, to a fully qualified class name that uses '/' as the - * package separator, the representation used in the class file - * format (see JVMS section {@jvms 4.2}). - */ - private static String dotToSlash(String name) { - return name.replace('.', '/'); - } - - /** - * Return the number of abstract "words", or consecutive local variable - * indexes, required to contain a value of the given type. See JVMS - * section {@jvms 3.6.1}. - *

    - * Note that the original version of the JVMS contained a definition of - * this abstract notion of a "word" in section 3.4, but that definition - * was removed for the second edition. - */ - private static int getWordsPerType(Class type) { - if (type == long.class || type == double.class) { - return 2; - } else { - return 1; - } - } - /** * Add to the given list all of the types in the "from" array that * are not already contained in the list and are assignable to at @@ -439,25 +517,11 @@ private static void collectCompatibleTypes(Class[] from, } } - /** - * Returns the {@link ClassLoader} to be used by the default implementation of {@link - * #getCommonSuperClass(String, String)}, that of this {@link ClassWriter}'s runtime type by - * default. - * - * @return ClassLoader - */ - protected ClassLoader getClassLoader() { - return loader; - } - /** * Generate a class file for the proxy class. This method drives the * class file generation process. */ private byte[] generateClassFile() { - visit(CLASSFILE_VERSION, accessFlags, dotToSlash(className), null, - JLR_PROXY, typeNames(interfaces)); - /* * Add proxy methods for the hashCode, equals, * and toString methods of java.lang.Object. This is done before @@ -475,7 +539,7 @@ private byte[] generateClassFile() { for (Class intf : interfaces) { for (Method m : intf.getMethods()) { if (!Modifier.isStatic(m.getModifiers())) { - addProxyMethod(m, intf); + addProxyMethod(m, intf, cp); } } } @@ -488,22 +552,23 @@ private byte[] generateClassFile() { checkReturnTypes(sigmethods); } - generateConstructor(); + return classfileContext.build(classEntry, cp, clb -> { + TEMPLATE.forEach(clb); + clb.withFlags(accessFlags); + clb.withInterfaces(toClassEntries(cp, interfaces)); - for (List sigmethods : proxyMethods.values()) { - for (ProxyMethod pm : sigmethods) { - // add static field for the Method object - visitField(ACC_PRIVATE | ACC_STATIC | ACC_FINAL, pm.methodFieldName, - LJLR_METHOD, null, null); + for (List sigmethods : proxyMethods.values()) { + for (ProxyMethod pm : sigmethods) { + // add static field for the Method object + clb.withField(pm.methodFieldName, UE_Method, ACC_PRIVATE | ACC_STATIC | ACC_FINAL); - // Generate code for proxy method - pm.generateMethod(this, className); + // Generate code for proxy method + pm.generateMethod(clb, classEntry); + } } - } - generateStaticInitializer(); - generateLookupAccessor(); - return toByteArray(); + generateStaticInitializer(clb); + }); } /** @@ -519,7 +584,7 @@ private byte[] generateClassFile() { * passed to the invocation handler's "invoke" method for a given * set of duplicate methods. */ - private void addProxyMethod(Method m, Class fromClass) { + private void addProxyMethod(Method m, Class fromClass, ConstantPoolBuilder cp) { Class returnType = m.getReturnType(); Class[] exceptionTypes = m.getSharedExceptionTypes(); @@ -545,7 +610,7 @@ private void addProxyMethod(Method m, Class fromClass) { } sigmethods.add(new ProxyMethod(m, sig, m.getSharedParameterTypes(), returnType, exceptionTypes, fromClass, - "m" + proxyMethodCount++)); + cp.utf8Entry("m" + proxyMethodCount++))); } /** @@ -563,82 +628,51 @@ private void addProxyMethod(ProxyMethod pm) { /** * Generate the constructor method for the proxy class. */ - private void generateConstructor() { - MethodVisitor ctor = visitMethod(Modifier.PUBLIC, NAME_CTOR, - MJLR_INVOCATIONHANDLER, null, null); - ctor.visitParameter(null, 0); - ctor.visitCode(); - ctor.visitVarInsn(ALOAD, 0); - ctor.visitVarInsn(ALOAD, 1); - ctor.visitMethodInsn(INVOKESPECIAL, JLR_PROXY, NAME_CTOR, - MJLR_INVOCATIONHANDLER, false); - ctor.visitInsn(RETURN); - - // Maxs computed by ClassWriter.COMPUTE_FRAMES, these arguments ignored - ctor.visitMaxs(-1, -1); - ctor.visitEnd(); + private static void generateConstructor(ClassBuilder clb) { + clb.withMethodBody(INIT_NAME, MTD_void_InvocationHandler, ACC_PUBLIC, cob -> cob + .aload(cob.receiverSlot()) + .aload(cob.parameterSlot(0)) + .invokespecial(CD_Proxy, INIT_NAME, MTD_void_InvocationHandler) + .return_()); } /** * Generate the static initializer method for the proxy class. */ - private void generateStaticInitializer() { - - MethodVisitor mv = visitMethod(Modifier.STATIC, NAME_CLINIT, - "()V", null, null); - mv.visitCode(); - Label L_startBlock = new Label(); - Label L_endBlock = new Label(); - Label L_NoMethodHandler = new Label(); - Label L_NoClassHandler = new Label(); - - mv.visitTryCatchBlock(L_startBlock, L_endBlock, L_NoMethodHandler, - JL_NO_SUCH_METHOD_EX); - mv.visitTryCatchBlock(L_startBlock, L_endBlock, L_NoClassHandler, - JL_CLASS_NOT_FOUND_EX); - - // Put ClassLoader at local variable index 0, used by - // Class.forName(String, boolean, ClassLoader) calls - mv.visitLdcInsn(Type.getObjectType(dotToSlash(className))); - mv.visitMethodInsn(INVOKEVIRTUAL, JL_CLASS, - "getClassLoader", "()" + LJL_CLASSLOADER, false); - mv.visitVarInsn(ASTORE, 0); - - mv.visitLabel(L_startBlock); - for (List sigmethods : proxyMethods.values()) { - for (ProxyMethod pm : sigmethods) { - pm.codeFieldInitialization(mv, className); + private void generateStaticInitializer(ClassBuilder clb) { + clb.withMethodBody(CLASS_INIT_NAME, MTD_void, ACC_STATIC, cob -> { + // Put ClassLoader at local variable index 0, used by + // Class.forName(String, boolean, ClassLoader) calls + cob.ldc(classEntry) + .invokevirtual(MRE_Class_getClassLoader) + .astore(0); + var ts = cob.newBoundLabel(); + for (List sigmethods : proxyMethods.values()) { + for (ProxyMethod pm : sigmethods) { + pm.codeFieldInitialization(cob, classEntry); + } } - } - mv.visitInsn(RETURN); - mv.visitLabel(L_endBlock); - // Generate exception handler - - mv.visitLabel(L_NoMethodHandler); - mv.visitVarInsn(ASTORE, 1); - mv.visitTypeInsn(Opcodes.NEW, JL_NO_SUCH_METHOD_ERROR); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEVIRTUAL, JL_THROWABLE, - "getMessage", "()Ljava/lang/String;", false); - mv.visitMethodInsn(INVOKESPECIAL, JL_NO_SUCH_METHOD_ERROR, - "", "(Ljava/lang/String;)V", false); - mv.visitInsn(ATHROW); - - mv.visitLabel(L_NoClassHandler); - mv.visitVarInsn(ASTORE, 1); - mv.visitTypeInsn(Opcodes.NEW, JL_NO_CLASS_DEF_FOUND_ERROR); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEVIRTUAL, JL_THROWABLE, - "getMessage", "()Ljava/lang/String;", false); - mv.visitMethodInsn(INVOKESPECIAL, JL_NO_CLASS_DEF_FOUND_ERROR, - "", "(Ljava/lang/String;)V", false); - mv.visitInsn(ATHROW); - - // Maxs computed by ClassWriter.COMPUTE_FRAMES, these arguments ignored - mv.visitMaxs(-1, -1); - mv.visitEnd(); + cob.return_(); + var c1 = cob.newBoundLabel(); + cob.exceptionCatch(ts, c1, c1, CE_NoSuchMethodException) + .new_(CE_NoSuchMethodError) + .dup_x1() + .swap() + .invokevirtual(MRE_Throwable_getMessage) + .invokespecial(MRE_NoSuchMethodError_init) + .athrow(); + var c2 = cob.newBoundLabel(); + cob.exceptionCatch(ts, c1, c2, CE_ClassNotFoundException) + .new_(CE_NoClassDefFoundError) + .dup_x1() + .swap() + .invokevirtual(MRE_Throwable_getMessage) + .invokespecial(MRE_NoClassDefFoundError_init) + .athrow() + .with(StackMapTableAttribute.of(List.of( + StackMapFrameInfo.of(c1, List.of(), THROWABLE_STACK), + StackMapFrameInfo.of(c2, List.of(), THROWABLE_STACK)))); + }); } /** @@ -646,39 +680,28 @@ private void generateStaticInitializer() { * on this proxy class if the caller's lookup class is java.lang.reflect.Proxy; * otherwise, IllegalAccessException is thrown */ - private void generateLookupAccessor() { - MethodVisitor mv = visitMethod(ACC_PRIVATE | ACC_STATIC, NAME_LOOKUP_ACCESSOR, - "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;", null, - new String[] { JL_ILLEGAL_ACCESS_EX }); - mv.visitCode(); - Label L_illegalAccess = new Label(); - - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, JLI_LOOKUP, "lookupClass", - "()Ljava/lang/Class;", false); - mv.visitLdcInsn(Type.getType(Proxy.class)); - mv.visitJumpInsn(IF_ACMPNE, L_illegalAccess); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, JLI_LOOKUP, "hasFullPrivilegeAccess", - "()Z", false); - mv.visitJumpInsn(IFEQ, L_illegalAccess); - mv.visitMethodInsn(INVOKESTATIC, JLI_METHODHANDLES, "lookup", - "()Ljava/lang/invoke/MethodHandles$Lookup;", false); - mv.visitInsn(ARETURN); - - mv.visitLabel(L_illegalAccess); - mv.visitTypeInsn(Opcodes.NEW, JL_ILLEGAL_ACCESS_EX); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, JLI_LOOKUP, "toString", - "()Ljava/lang/String;", false); - mv.visitMethodInsn(INVOKESPECIAL, JL_ILLEGAL_ACCESS_EX, - "", "(Ljava/lang/String;)V", false); - mv.visitInsn(ATHROW); - - // Maxs computed by ClassWriter.COMPUTE_FRAMES, these arguments ignored - mv.visitMaxs(-1, -1); - mv.visitEnd(); + private static void generateLookupAccessor(ClassBuilder clb) { + clb.withMethod(NAME_LOOKUP_ACCESSOR, + MTD_MethodHandles$Lookup_MethodHandles$Lookup, + ACC_PRIVATE | ACC_STATIC, + mb -> mb.with(ExceptionsAttribute.of(List.of(mb.constantPool().classEntry(CD_IllegalAccessException)))) + .withCode(cob -> cob + .block(blockBuilder -> blockBuilder + .aload(cob.parameterSlot(0)) + .invokevirtual(CD_MethodHandles_Lookup, "lookupClass", MTD_Class) + .constantInstruction(Opcode.LDC, CD_Proxy) + .if_acmpne(blockBuilder.breakLabel()) + .aload(cob.parameterSlot(0)) + .invokevirtual(CD_MethodHandles_Lookup, "hasFullPrivilegeAccess", MTD_boolean) + .ifeq(blockBuilder.breakLabel()) + .invokestatic(CD_MethodHandles, "lookup", MTD_MethodHandles$Lookup) + .areturn()) + .new_(CD_IllegalAccessException) + .dup() + .aload(cob.parameterSlot(0)) + .invokevirtual(CD_MethodHandles_Lookup, "toString", MTD_String) + .invokespecial(CD_IllegalAccessException, INIT_NAME, MTD_void_String) + .athrow())); } /** @@ -693,12 +716,12 @@ private static class ProxyMethod { private final Class fromClass; private final Class[] parameterTypes; private final Class returnType; - private final String methodFieldName; + private final Utf8Entry methodFieldName; private Class[] exceptionTypes; private ProxyMethod(Method method, String sig, Class[] parameterTypes, Class returnType, Class[] exceptionTypes, - Class fromClass, String methodFieldName) { + Class fromClass, Utf8Entry methodFieldName) { this.method = method; this.shortSignature = sig; this.parameterTypes = parameterTypes; @@ -714,100 +737,70 @@ private ProxyMethod(Method method, String sig, Class[] parameterTypes, * @param method The method for which to create a proxy * @param methodFieldName the fieldName to generate */ - private ProxyMethod(Method method, String methodFieldName) { + private ProxyMethod(Method method, Utf8Entry methodFieldName) { this(method, method.toShortSignature(), - method.getSharedParameterTypes(), method.getReturnType(), - method.getSharedExceptionTypes(), method.getDeclaringClass(), methodFieldName); + method.getSharedParameterTypes(), method.getReturnType(), + method.getSharedExceptionTypes(), method.getDeclaringClass(), methodFieldName); } /** * Generate this method, including the code and exception table entry. */ - private void generateMethod(ClassWriter cw, String className) { - MethodType mt = MethodType.methodType(returnType, parameterTypes); - String desc = mt.toMethodDescriptorString(); - int accessFlags = ACC_PUBLIC | ACC_FINAL; - if (method.isVarArgs()) accessFlags |= ACC_VARARGS; - - MethodVisitor mv = cw.visitMethod(accessFlags, - method.getName(), desc, null, - typeNames(Arrays.asList(exceptionTypes))); - - int[] parameterSlot = new int[parameterTypes.length]; - int nextSlot = 1; - for (int i = 0; i < parameterSlot.length; i++) { - parameterSlot[i] = nextSlot; - nextSlot += getWordsPerType(parameterTypes[i]); - } - - mv.visitCode(); - Label L_startBlock = new Label(); - Label L_endBlock = new Label(); - Label L_RuntimeHandler = new Label(); - Label L_ThrowableHandler = new Label(); - - List> catchList = computeUniqueCatchList(exceptionTypes); - if (catchList.size() > 0) { - for (Class ex : catchList) { - mv.visitTryCatchBlock(L_startBlock, L_endBlock, L_RuntimeHandler, - dotToSlash(ex.getName())); - } - - mv.visitTryCatchBlock(L_startBlock, L_endBlock, L_ThrowableHandler, - JL_THROWABLE); - } - mv.visitLabel(L_startBlock); - - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, JLR_PROXY, handlerFieldName, - LJLR_INVOCATION_HANDLER); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETSTATIC, dotToSlash(className), methodFieldName, - LJLR_METHOD); - - if (parameterTypes.length > 0) { - // Create an array and fill with the parameters converting primitives to wrappers - emitIconstInsn(mv, parameterTypes.length); - mv.visitTypeInsn(Opcodes.ANEWARRAY, JL_OBJECT); - for (int i = 0; i < parameterTypes.length; i++) { - mv.visitInsn(DUP); - emitIconstInsn(mv, i); - codeWrapArgument(mv, parameterTypes[i], parameterSlot[i]); - mv.visitInsn(Opcodes.AASTORE); - } - } else { - mv.visitInsn(Opcodes.ACONST_NULL); - } - - mv.visitMethodInsn(INVOKEINTERFACE, JLR_INVOCATION_HANDLER, - "invoke", - "(Ljava/lang/Object;Ljava/lang/reflect/Method;" + - "[Ljava/lang/Object;)Ljava/lang/Object;", true); + private void generateMethod(ClassBuilder clb, ClassEntry className) { + var cp = clb.constantPool(); + MethodTypeDesc desc = MethodTypeDesc.of(toClassDesc(returnType), + Arrays.stream(parameterTypes).map(ProxyGenerator::toClassDesc).toArray(ClassDesc[]::new)); + int accessFlags = (method.isVarArgs()) ? ACC_VARARGS | ACC_PUBLIC | ACC_FINAL + : ACC_PUBLIC | ACC_FINAL; + var catchList = computeUniqueCatchList(exceptionTypes); + clb.withMethod(method.getName(), desc, accessFlags, mb -> + mb.with(ExceptionsAttribute.of(toClassEntries(cp, List.of(exceptionTypes)))) + .withCode(cob -> { + cob.aload(cob.receiverSlot()) + .getfield(FRE_Proxy_h) + .aload(cob.receiverSlot()) + .getstatic(cp.fieldRefEntry(className, cp.nameAndTypeEntry(methodFieldName, UE_Method))); + + if (parameterTypes.length > 0) { + // Create an array and fill with the parameters converting primitives to wrappers + cob.constantInstruction(parameterTypes.length) + .anewarray(CE_Object); + for (int i = 0; i < parameterTypes.length; i++) { + cob.dup() + .constantInstruction(i); + codeWrapArgument(cob, parameterTypes[i], cob.parameterSlot(i)); + cob.aastore(); + } + } else { + cob.aconst_null(); + } - if (returnType == void.class) { - mv.visitInsn(POP); - mv.visitInsn(RETURN); - } else { - codeUnwrapReturnValue(mv, returnType); - } + cob.invokeinterface(IMRE_InvocationHandler_invoke); - mv.visitLabel(L_endBlock); - - // Generate exception handler - mv.visitLabel(L_RuntimeHandler); - mv.visitInsn(ATHROW); // just rethrow the exception - - mv.visitLabel(L_ThrowableHandler); - mv.visitVarInsn(ASTORE, 1); - mv.visitTypeInsn(Opcodes.NEW, JLR_UNDECLARED_THROWABLE_EX); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKESPECIAL, JLR_UNDECLARED_THROWABLE_EX, - "", "(Ljava/lang/Throwable;)V", false); - mv.visitInsn(ATHROW); - // Maxs computed by ClassWriter.COMPUTE_FRAMES, these arguments ignored - mv.visitMaxs(-1, -1); - mv.visitEnd(); + if (returnType == void.class) { + cob.pop() + .return_(); + } else { + codeUnwrapReturnValue(cob, returnType); + } + if (!catchList.isEmpty()) { + var c1 = cob.newBoundLabel(); + for (var exc : catchList) { + cob.exceptionCatch(cob.startLabel(), c1, c1, toClassDesc(exc)); + } + cob.athrow(); // just rethrow the exception + var c2 = cob.newBoundLabel(); + cob.exceptionCatchAll(cob.startLabel(), c1, c2) + .new_(CE_UndeclaredThrowableException) + .dup_x1() + .swap() + .invokespecial(MRE_UndeclaredThrowableException_init) + .athrow() + .with(StackMapTableAttribute.of(List.of( + StackMapFrameInfo.of(c1, List.of(), THROWABLE_STACK), + StackMapFrameInfo.of(c2, List.of(), THROWABLE_STACK)))); + } + })); } /** @@ -816,15 +809,13 @@ private void generateMethod(ClassWriter cw, String className) { * index, in order for it to be passed (as an Object) to the * invocation handler's "invoke" method. */ - private void codeWrapArgument(MethodVisitor mv, Class type, int slot) { + private void codeWrapArgument(CodeBuilder cob, Class type, int slot) { if (type.isPrimitive()) { + cob.loadInstruction(TypeKind.from(type).asLoadable(), slot); PrimitiveTypeInfo prim = PrimitiveTypeInfo.get(type); - - mv.visitVarInsn(prim.loadOpcode, slot); - mv.visitMethodInsn(INVOKESTATIC, prim.wrapperClassName, "valueOf", - prim.wrapperValueOfDesc, false); + cob.invokestatic(prim.wrapperMethodRef); } else { - mv.visitVarInsn(ALOAD, slot); + cob.aload(slot); } } @@ -833,19 +824,16 @@ private void codeWrapArgument(MethodVisitor mv, Class type, int slot) { * type from the invocation handler's "invoke" method (as type * Object) to its correct type. */ - private void codeUnwrapReturnValue(MethodVisitor mv, Class type) { + private void codeUnwrapReturnValue(CodeBuilder cob, Class type) { if (type.isPrimitive()) { PrimitiveTypeInfo prim = PrimitiveTypeInfo.get(type); - mv.visitTypeInsn(CHECKCAST, prim.wrapperClassName); - mv.visitMethodInsn(INVOKEVIRTUAL, - prim.wrapperClassName, - prim.unwrapMethodName, prim.unwrapMethodDesc, false); - - mv.visitInsn(prim.returnOpcode); + cob.checkcast(prim.wrapperClass) + .invokevirtual(prim.unwrapMethodRef) + .returnInstruction(TypeKind.from(type).asLoadable()); } else { - mv.visitTypeInsn(CHECKCAST, dotToSlash(type.getName())); - mv.visitInsn(ARETURN); + cob.checkcast(toClassDesc(type)) + .areturn(); } } @@ -854,40 +842,29 @@ private void codeUnwrapReturnValue(MethodVisitor mv, Class type) { * the Method object for this proxy method. A class loader is * anticipated at local variable index 0. */ - private void codeFieldInitialization(MethodVisitor mv, String className) { - codeClassForName(mv, fromClass); - - mv.visitLdcInsn(method.getName()); + private void codeFieldInitialization(CodeBuilder cob, ClassEntry className) { + var cp = cob.constantPool(); + codeClassForName(cob, fromClass); - emitIconstInsn(mv, parameterTypes.length); - - mv.visitTypeInsn(Opcodes.ANEWARRAY, JL_CLASS); + cob.ldc(method.getName()) + .constantInstruction(parameterTypes.length) + .anewarray(CE_Class); // Construct an array with the parameter types mapping primitives to Wrapper types for (int i = 0; i < parameterTypes.length; i++) { - mv.visitInsn(DUP); - emitIconstInsn(mv, i); - + cob.dup() + .constantInstruction(i); if (parameterTypes[i].isPrimitive()) { - PrimitiveTypeInfo prim = - PrimitiveTypeInfo.get(parameterTypes[i]); - mv.visitFieldInsn(GETSTATIC, - prim.wrapperClassName, "TYPE", LJL_CLASS); + PrimitiveTypeInfo prim = PrimitiveTypeInfo.get(parameterTypes[i]); + cob.getstatic(prim.typeFieldRef); } else { - codeClassForName(mv, parameterTypes[i]); + codeClassForName(cob, parameterTypes[i]); } - mv.visitInsn(Opcodes.AASTORE); + cob.aastore(); } // lookup the method - mv.visitMethodInsn(INVOKEVIRTUAL, - JL_CLASS, - "getMethod", - "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", - false); - - mv.visitFieldInsn(PUTSTATIC, - dotToSlash(className), - methodFieldName, LJLR_METHOD); + cob.invokevirtual(MRE_Class_getMethod) + .putstatic(cp.fieldRefEntry(className, cp.nameAndTypeEntry(methodFieldName, UE_Method))); } /* @@ -901,33 +878,11 @@ private void codeFieldInitialization(MethodVisitor mv, String className) { * may cause the checked ClassNotFoundException to be thrown. A class * loader is anticipated at local variable index 0. */ - private void codeClassForName(MethodVisitor mv, Class cl) { - mv.visitLdcInsn(cl.getName()); - mv.visitInsn(ICONST_0); // false - mv.visitVarInsn(ALOAD, 0); // classLoader - mv.visitMethodInsn(INVOKESTATIC, - JL_CLASS, - "forName", - "(Ljava/lang/String;Z" + LJL_CLASSLOADER + ")Ljava/lang/Class;", - false); - } - - /** - * Visit a bytecode for a constant. - * - * @param mv The MethodVisitor - * @param cst The constant value - */ - private void emitIconstInsn(MethodVisitor mv, final int cst) { - if (cst >= -1 && cst <= 5) { - mv.visitInsn(Opcodes.ICONST_0 + cst); - } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) { - mv.visitIntInsn(Opcodes.BIPUSH, cst); - } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) { - mv.visitIntInsn(Opcodes.SIPUSH, cst); - } else { - mv.visitLdcInsn(cst); - } + private void codeClassForName(CodeBuilder cob, Class cl) { + cob.ldc(cl.getName()) + .iconst_0() // false + .aload(0)// classLoader + .invokestatic(MRE_Class_forName); } @Override @@ -936,61 +891,45 @@ public String toString() { } } + private static final ConstantPoolBuilder CP = ConstantPoolBuilder.of(); /** * A PrimitiveTypeInfo object contains bytecode-related information about * a primitive type in its instance fields. The struct for a particular * primitive type can be obtained using the static "get" method. */ private enum PrimitiveTypeInfo { - BYTE(byte.class, ILOAD, IRETURN), - CHAR(char.class, ILOAD, IRETURN), - DOUBLE(double.class, DLOAD, DRETURN), - FLOAT(float.class, FLOAD, FRETURN), - INT(int.class, ILOAD, IRETURN), - LONG(long.class, LLOAD, LRETURN), - SHORT(short.class, ILOAD, IRETURN), - BOOLEAN(boolean.class, ILOAD, IRETURN); + BYTE(byte.class, CD_byte, CD_Byte), + CHAR(char.class, CD_char, CD_Character), + DOUBLE(double.class, CD_double, CD_Double), + FLOAT(float.class, CD_float, CD_Float), + INT(int.class, CD_int, CD_Integer), + LONG(long.class, CD_long, CD_Long), + SHORT(short.class, CD_short, CD_Short), + BOOLEAN(boolean.class, CD_boolean, CD_Boolean); /** - * internal name of corresponding wrapper class - */ - private final String wrapperClassName; - /** - * method descriptor for wrapper class "valueOf" factory method - */ - private final String wrapperValueOfDesc; - /** - * name of wrapper class method for retrieving primitive value + * CP entry of corresponding wrapper class */ - private final String unwrapMethodName; + private final ClassEntry wrapperClass; /** - * descriptor of same method + * CP entry for wrapper class "valueOf" factory method */ - private final String unwrapMethodDesc; + private final MethodRefEntry wrapperMethodRef; /** - * Load opcode used by this primitive + * CP entry of wrapper class method for retrieving primitive value */ - private final int loadOpcode; + private final MethodRefEntry unwrapMethodRef; /** - * Return opcode used by this primitive + * CP entry of wrapper class TYPE field */ - private final int returnOpcode; - - PrimitiveTypeInfo(Class primitiveClass, int loadOpcode, int returnOpcode) { - assert primitiveClass.isPrimitive(); - assert returnOpcode - IRETURN == loadOpcode - ILOAD; - - Wrapper wrapper = Wrapper.forPrimitiveType(primitiveClass); - // single-char BaseType descriptor (see JVMS section 4.3.2) - String baseTypeString = wrapper.basicTypeString(); - var wrapperType = wrapper.wrapperType(); - wrapperClassName = dotToSlash(wrapperType.getName()); - wrapperValueOfDesc = - "(" + baseTypeString + ")" + wrapperType.descriptorString(); - unwrapMethodName = primitiveClass.getName() + "Value"; - unwrapMethodDesc = "()" + baseTypeString; - this.loadOpcode = loadOpcode; - this.returnOpcode = returnOpcode; + private final FieldRefEntry typeFieldRef; + + PrimitiveTypeInfo(Class primitiveClass, ClassDesc baseType, ClassDesc wrapperClass) { + assert baseType.isPrimitive(); + this.wrapperClass = CP.classEntry(wrapperClass); + this.wrapperMethodRef = CP.methodRefEntry(wrapperClass, "valueOf", MethodTypeDesc.of(wrapperClass, baseType)); + this.unwrapMethodRef = CP.methodRefEntry(wrapperClass, primitiveClass.getName() + "Value", MethodTypeDesc.of(baseType)); + this.typeFieldRef = CP.fieldRefEntry(wrapperClass, "TYPE", CD_Class); } public static PrimitiveTypeInfo get(Class cl) { From 7d53559d2f8f3c27f4d764f081fb031f7660c50b Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Wed, 6 Mar 2024 09:04:31 +0000 Subject: [PATCH 69/86] 8319932: [JVMCI] class unloading related tests can fail on libgraal Reviewed-by: dholmes --- .../InitExceptionUnloadTest.java | 9 +++-- .../lib/classloader/ClassUnloadCommon.java | 40 ++++++++++++++++++- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java b/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java index 26a5b5ae01f..b6342f425a4 100644 --- a/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java +++ b/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java @@ -37,6 +37,8 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.util.Set; +import java.util.List; import jdk.test.whitebox.WhiteBox; import jdk.test.lib.classloader.ClassUnloadCommon; @@ -122,10 +124,9 @@ static void test() throws Throwable { } } cl = null; - ClassUnloadCommon.triggerUnloading(); // should unload these classes - for (String className : classNames) { - ClassUnloadCommon.failIf(wb.isClassAlive(className), "should be unloaded"); - } + + Set aliveClasses = ClassUnloadCommon.triggerUnloading(List.of(classNames)); + ClassUnloadCommon.failIf(!aliveClasses.isEmpty(), "should be unloaded: " + aliveClasses); } public static void main(java.lang.String[] unused) throws Throwable { test(); diff --git a/test/lib/jdk/test/lib/classloader/ClassUnloadCommon.java b/test/lib/jdk/test/lib/classloader/ClassUnloadCommon.java index ae8ae12cf97..11bea44fa33 100644 --- a/test/lib/jdk/test/lib/classloader/ClassUnloadCommon.java +++ b/test/lib/jdk/test/lib/classloader/ClassUnloadCommon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, 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 @@ -38,6 +38,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.stream.Stream; public class ClassUnloadCommon { @@ -67,6 +70,41 @@ public static void triggerUnloading() { wb.fullGC(); // will do class unloading } + /** + * Calls triggerUnloading() in a retry loop for 2 seconds or until WhiteBox.isClassAlive + * determines that no classes named in classNames are alive. + * + * This variant of triggerUnloading() accommodates the inherent raciness + * of class unloading. For example, it's possible for a JIT compilation to hold + * strong roots to types (e.g. in virtual call or instanceof profiles) that + * are not released or converted to weak roots until the compilation completes. + * + * @param classNames the set of classes that are expected to be unloaded + * @return the set of classes that have not been unloaded after exiting the retry loop + */ + public static Set triggerUnloading(List classNames) { + WhiteBox wb = WhiteBox.getWhiteBox(); + Set aliveClasses = new HashSet<>(classNames); + int attempt = 0; + while (!aliveClasses.isEmpty() && attempt < 20) { + ClassUnloadCommon.triggerUnloading(); + for (String className : classNames) { + if (aliveClasses.contains(className)) { + if (wb.isClassAlive(className)) { + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + } + } else { + aliveClasses.remove(className); + } + } + } + attempt++; + } + return aliveClasses; + } + /** * Creates a class loader that loads classes from {@code ${test.class.path}} * before delegating to the system class loader. From fbb422ece7ff61bc10ebafe48ecb7f17ea315682 Mon Sep 17 00:00:00 2001 From: Joshua Cao Date: Wed, 6 Mar 2024 09:18:52 +0000 Subject: [PATCH 70/86] 8327201: C2: Uninitialized VLoop::_pre_loop_end after JDK-8324890 Reviewed-by: chagedorn, shade --- src/hotspot/share/opto/vectorization.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp index 3f897010d9d..c98e298ca75 100644 --- a/src/hotspot/share/opto/vectorization.hpp +++ b/src/hotspot/share/opto/vectorization.hpp @@ -99,7 +99,8 @@ class VLoop : public StackObj { _allow_cfg (allow_cfg), _cl (nullptr), _cl_exit (nullptr), - _iv (nullptr) {} + _iv (nullptr), + _pre_loop_end (nullptr) {} NONCOPYABLE(VLoop); IdealLoopTree* lpt() const { return _lpt; }; From 992104d47785e6ce7c1f41ac8e2fd452022b8834 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 6 Mar 2024 11:35:23 +0000 Subject: [PATCH 71/86] 8327239: Obsolete unused GCLockerEdenExpansionPercent product option Reviewed-by: gli, ayang --- src/hotspot/share/gc/shared/gc_globals.hpp | 5 ----- src/hotspot/share/runtime/arguments.cpp | 1 + test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java | 1 - test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java | 1 - test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp index 25e581cae67..b41bff01e29 100644 --- a/src/hotspot/share/gc/shared/gc_globals.hpp +++ b/src/hotspot/share/gc/shared/gc_globals.hpp @@ -168,11 +168,6 @@ "A System.gc() request invokes a concurrent collection; " \ "(effective only when using concurrent collectors)") \ \ - product(uint, GCLockerEdenExpansionPercent, 5, \ - "How much the GC can expand the eden by while the GC locker " \ - "is active (as a percentage)") \ - range(0, 100) \ - \ product(uintx, GCLockerRetryAllocationCount, 2, DIAGNOSTIC, \ "Number of times to retry allocations when " \ "blocked by the GC locker") \ diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 7b593b8c093..8f3b9aa11c7 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -527,6 +527,7 @@ static SpecialFlag const special_jvm_flags[] = { { "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "TLABStats", JDK_Version::jdk(12), JDK_Version::jdk(23), JDK_Version::jdk(24) }, + { "GCLockerEdenExpansionPercent", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, #ifdef ASSERT { "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() }, #endif diff --git a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java index 6eff65f3fa8..adb0ae26a9f 100644 --- a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java +++ b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java @@ -73,7 +73,6 @@ public static void testNewRatio(int ratio, LinkedList options) throws Ex "-Xbootclasspath/a:.", "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", - "-XX:GCLockerEdenExpansionPercent=0", "-Xmx" + HEAP_SIZE, "-Xms" + HEAP_SIZE, "-XX:NewRatio=" + ratio, diff --git a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java index 8fc522f8be8..460160f045c 100644 --- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java +++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java @@ -157,7 +157,6 @@ private static OutputAnalyzer executeLimitedTestJava(LinkedList options, (maxNewSize >= 0 ? "-XX:MaxNewSize=" + maxNewSize : ""), "-Xmx" + maxHeapSize, "-Xms" + heapSize, - "-XX:GCLockerEdenExpansionPercent=0", "-XX:-UseLargePages", NewSizeVerifier.class.getName(), Long.toString(expectedNewSize), diff --git a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java index a593970e6f7..c1e58e071a4 100644 --- a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java +++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java @@ -77,7 +77,6 @@ public static void testSurvivorRatio(int ratio, LinkedList options) thro "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED", "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", - "-XX:GCLockerEdenExpansionPercent=0", "-XX:MaxNewSize=" + NEW_SIZE, "-XX:NewSize=" + NEW_SIZE, "-Xmx" + HEAP_SIZE, From 2bdd38716c396587a907e0df6fb51ceb6da598ca Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 6 Mar 2024 11:50:05 +0000 Subject: [PATCH 72/86] 8327286: Obsolete unused NUMAPageScanRate product option Reviewed-by: kbarrett, ayang --- src/hotspot/share/runtime/arguments.cpp | 1 + src/hotspot/share/runtime/globals.hpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 8f3b9aa11c7..bacbe3f343f 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -528,6 +528,7 @@ static SpecialFlag const special_jvm_flags[] = { { "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "TLABStats", JDK_Version::jdk(12), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "GCLockerEdenExpansionPercent", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, + { "NUMAPageScanRate", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, #ifdef ASSERT { "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() }, #endif diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 88549316e8c..d27fa2bd6b3 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -220,10 +220,6 @@ const int ObjectAlignmentInBytes = 8; product(bool, NUMAStats, false, \ "Print NUMA stats in detailed heap information") \ \ - product(uintx, NUMAPageScanRate, 256, \ - "Maximum number of pages to include in the page scan procedure") \ - range(0, max_uintx) \ - \ product(bool, UseAES, false, \ "Control whether AES instructions are used when available") \ \ From a7461de231da20ed78a7c6ad8275f1bafbfa556c Mon Sep 17 00:00:00 2001 From: Jim Laskey Date: Wed, 6 Mar 2024 12:01:10 +0000 Subject: [PATCH 73/86] 8325255: jdk.internal.util.ReferencedKeySet::add using wrong test Reviewed-by: rriggs, liach --- .../jdk/internal/util/ReferencedKeyMap.java | 26 +++++++++++++++++++ .../jdk/internal/util/ReferencedKeySet.java | 2 +- .../jdk/internal/util/ReferencedKeyTest.java | 6 +++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java index f102e3c94e1..be392c3ae2d 100644 --- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java +++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java @@ -439,4 +439,30 @@ private static T internKey(ReferencedKeyMap> setMap, T ke return interned; } + + /** + * Attempt to add key to map if absent. + * + * @param setMap {@link ReferencedKeyMap} where interning takes place + * @param key key to add + * + * @param type of key + * + * @return true if the key was added + */ + static boolean internAddKey(ReferencedKeyMap> setMap, T key) { + ReferenceKey entryKey = setMap.entryKey(key); + setMap.removeStaleReferences(); + ReferenceKey existing = setMap.map.putIfAbsent(entryKey, entryKey); + if (existing == null) { + return true; + } else { + // If {@code putIfAbsent} returns non-null then was actually a + // {@code replace} and older key was used. In that case the new + // key was not used and the reference marked stale. + entryKey.unused(); + return false; + } + } + } diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java index 807eea87dfe..21b940439e0 100644 --- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java +++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java @@ -148,7 +148,7 @@ public boolean contains(Object o) { @Override public boolean add(T e) { - return intern(e) == null; + return ReferencedKeyMap.internAddKey(map, e); } @Override diff --git a/test/jdk/jdk/internal/util/ReferencedKeyTest.java b/test/jdk/jdk/internal/util/ReferencedKeyTest.java index c5edaedd2e2..75690fa6e25 100644 --- a/test/jdk/jdk/internal/util/ReferencedKeyTest.java +++ b/test/jdk/jdk/internal/util/ReferencedKeyTest.java @@ -127,6 +127,12 @@ static void methods(ReferencedKeySet set) { assertTrue(element1 == intern1, "intern failed"); // must be same object assertTrue(intern2 != null, "intern failed"); assertTrue(element3 == intern3, "intern failed"); + + Long value1 = Long.valueOf(BASE_KEY + 999); + Long value2 = Long.valueOf(BASE_KEY + 999); + assertTrue(set.add(value1), "key not added"); + assertTrue(!set.add(value1), "key added after second attempt"); + assertTrue(!set.add(value2), "key should not have been added"); } // Borrowed from jdk.test.lib.util.ForceGC but couldn't use from java.base/jdk.internal.util From 326c91e1a28ec70822ef927ee9ab17f79aa6d35c Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 6 Mar 2024 12:28:36 +0000 Subject: [PATCH 74/86] 8327288: Obsolete unused ProcessDistributionStride product option Reviewed-by: kbarrett, ayang --- src/hotspot/share/runtime/arguments.cpp | 1 + src/hotspot/share/runtime/globals.hpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index bacbe3f343f..7b2639ea1be 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -529,6 +529,7 @@ static SpecialFlag const special_jvm_flags[] = { { "TLABStats", JDK_Version::jdk(12), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "GCLockerEdenExpansionPercent", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, { "NUMAPageScanRate", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, + { "ProcessDistributionStride", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, #ifdef ASSERT { "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() }, #endif diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index d27fa2bd6b3..75ba2eb3516 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -894,10 +894,6 @@ const int ObjectAlignmentInBytes = 8; develop(bool, TraceOopMapRewrites, false, \ "Trace rewriting of methods during oop map generation") \ \ - product(uintx, ProcessDistributionStride, 4, \ - "Stride through processors when distributing processes") \ - range(0, max_juint) \ - \ develop(bool, TraceFinalizerRegistration, false, \ "Trace registration of final references") \ \ From ae5e3fdd5922a232c9b48fc846c4fcdc8f2b2645 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Wed, 6 Mar 2024 13:04:38 +0000 Subject: [PATCH 75/86] 8327365: Inline and remove GCStats Reviewed-by: gli, tschatzl --- .../gc/parallel/psAdaptiveSizePolicy.cpp | 2 +- .../gc/parallel/psAdaptiveSizePolicy.hpp | 7 ++-- src/hotspot/share/gc/serial/generation.hpp | 14 ------- .../share/gc/serial/tenuredGeneration.cpp | 6 +-- .../share/gc/serial/tenuredGeneration.hpp | 10 +++-- src/hotspot/share/gc/shared/gcStats.cpp | 30 ------------- src/hotspot/share/gc/shared/gcStats.hpp | 42 ------------------- 7 files changed, 14 insertions(+), 97 deletions(-) delete mode 100644 src/hotspot/share/gc/shared/gcStats.cpp delete mode 100644 src/hotspot/share/gc/shared/gcStats.hpp diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp index c8a15c2cb92..cfdb7e9eb29 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp @@ -49,7 +49,7 @@ PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size, gc_cost_ratio), _avg_major_pause(new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding)), _avg_base_footprint(new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight)), - _gc_stats(), + _avg_promoted(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding)), _major_pause_old_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)), _major_pause_young_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)), _latest_major_mutator_interval_seconds(0), diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp index 997a4784667..90e1e60db94 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp @@ -27,7 +27,6 @@ #include "gc/shared/adaptiveSizePolicy.hpp" #include "gc/shared/gcCause.hpp" -#include "gc/shared/gcStats.hpp" #include "gc/shared/gcUtil.hpp" #include "utilities/align.hpp" @@ -72,8 +71,8 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { // Footprint statistics AdaptiveWeightedAverage* _avg_base_footprint; - // Statistical data gathered for GC - GCStats _gc_stats; + // Statistics for promoted objs + AdaptivePaddedNoZeroDevAverage* _avg_promoted; // Variable for estimating the major and minor pause times. // These variables represent linear least-squares fits of @@ -166,7 +165,7 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { public: // Accessors for use by performance counters AdaptivePaddedNoZeroDevAverage* avg_promoted() const { - return _gc_stats.avg_promoted(); + return _avg_promoted; } AdaptiveWeightedAverage* avg_base_footprint() const { return _avg_base_footprint; diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp index 114ab3d6312..33ae773f7bf 100644 --- a/src/hotspot/share/gc/serial/generation.hpp +++ b/src/hotspot/share/gc/serial/generation.hpp @@ -51,9 +51,7 @@ class DefNewGeneration; class GCMemoryManager; class ContiguousSpace; - class OopClosure; -class GCStats; class Generation: public CHeapObj { friend class VMStructs; @@ -73,9 +71,6 @@ class Generation: public CHeapObj { // Performance Counters CollectorCounters* _gc_counters; - // Statistics for garbage collection - GCStats* _gc_stats; - // Initialize the generation. Generation(ReservedSpace rs, size_t initial_byte_size); @@ -168,15 +163,6 @@ class Generation: public CHeapObj { // still unsuccessful, return "null". virtual HeapWord* expand_and_allocate(size_t word_size, bool is_tlab) = 0; - // Generations may keep statistics about collection. This method - // updates those statistics. current_generation is the generation - // that was most recently collected. This allows the generation to - // decide what statistics are valid to collect. For example, the - // generation can decide to gather the amount of promoted data if - // the collection of the young generation has completed. - GCStats* gc_stats() const { return _gc_stats; } - virtual void update_gc_stats(Generation* current_generation, bool full) {} - // Printing virtual const char* name() const = 0; virtual const char* short_name() const = 0; diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp index fe37d997549..61eed1994b9 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp @@ -308,7 +308,7 @@ TenuredGeneration::TenuredGeneration(ReservedSpace rs, _shrink_factor = ShrinkHeapInSteps ? 0 : 100; _capacity_at_prologue = 0; - _gc_stats = new GCStats(); + _avg_promoted = new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding); // initialize performance counters @@ -390,7 +390,7 @@ void TenuredGeneration::update_gc_stats(Generation* current_generation, // also possible that no promotion was needed. if (used_before_gc >= _used_at_prologue) { size_t promoted_in_bytes = used_before_gc - _used_at_prologue; - gc_stats()->avg_promoted()->sample(promoted_in_bytes); + _avg_promoted->sample(promoted_in_bytes); } } } @@ -404,7 +404,7 @@ void TenuredGeneration::update_counters() { bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const { size_t available = max_contiguous_available(); - size_t av_promo = (size_t)gc_stats()->avg_promoted()->padded_average(); + size_t av_promo = (size_t)_avg_promoted->padded_average(); bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); log_trace(gc)("Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "), max_promo(" SIZE_FORMAT ")", diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp index b87926e0497..2700c888619 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp @@ -27,7 +27,6 @@ #include "gc/serial/cSpaceCounters.hpp" #include "gc/serial/generation.hpp" -#include "gc/shared/gcStats.hpp" #include "gc/shared/generationCounters.hpp" #include "gc/shared/space.hpp" #include "utilities/macros.hpp" @@ -71,6 +70,10 @@ class TenuredGeneration: public Generation { GenerationCounters* _gen_counters; CSpaceCounters* _space_counters; + // Avg amount promoted; used for avoiding promotion undo + // This class does not update deviations if the sample is zero. + AdaptivePaddedNoZeroDevAverage* _avg_promoted; + // Attempt to expand the generation by "bytes". Expand by at a // minimum "expand_bytes". Return true if some amount (not // necessarily the full "bytes") was done. @@ -80,7 +83,8 @@ class TenuredGeneration: public Generation { void shrink(size_t bytes); void compute_new_size_inner(); - public: + +public: void compute_new_size(); TenuredSpace* space() const { return _the_space; } @@ -158,7 +162,7 @@ class TenuredGeneration: public Generation { // Statistics - virtual void update_gc_stats(Generation* current_generation, bool full); + void update_gc_stats(Generation* current_generation, bool full); // Returns true if promotions of the specified amount are // likely to succeed without a promotion failure. diff --git a/src/hotspot/share/gc/shared/gcStats.cpp b/src/hotspot/share/gc/shared/gcStats.cpp deleted file mode 100644 index 42307e974d2..00000000000 --- a/src/hotspot/share/gc/shared/gcStats.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2003, 2021, 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. - * - * 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. - * - */ - -#include "precompiled.hpp" -#include "gc/shared/gcStats.hpp" -#include "gc/shared/gcUtil.hpp" -#include "gc/shared/gc_globals.hpp" - -GCStats::GCStats() : _avg_promoted(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding)) {} diff --git a/src/hotspot/share/gc/shared/gcStats.hpp b/src/hotspot/share/gc/shared/gcStats.hpp deleted file mode 100644 index 1bd34f06ec4..00000000000 --- a/src/hotspot/share/gc/shared/gcStats.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2003, 2019, 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. - * - * 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. - * - */ - -#ifndef SHARE_GC_SHARED_GCSTATS_HPP -#define SHARE_GC_SHARED_GCSTATS_HPP - -#include "gc/shared/gcUtil.hpp" - -class GCStats : public CHeapObj { - protected: - // Avg amount promoted; used for avoiding promotion undo - // This class does not update deviations if the sample is zero. - AdaptivePaddedNoZeroDevAverage* _avg_promoted; - - public: - GCStats(); - - AdaptivePaddedNoZeroDevAverage* avg_promoted() const { return _avg_promoted; } -}; - -#endif // SHARE_GC_SHARED_GCSTATS_HPP From 08b03a329fd1a7307242a8b1cfeda94f3338e136 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Wed, 6 Mar 2024 14:31:20 +0000 Subject: [PATCH 76/86] 8327376: Parallel: Remove unimplemented methods in psParallelCompact.hpp Reviewed-by: gli, tschatzl --- src/hotspot/share/gc/parallel/psParallelCompact.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index f5521b6014e..d13d374827f 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -405,7 +405,6 @@ class ParallelCompactData size_t block_count() const { return _block_count; } inline BlockData* block(size_t block_idx) const; - inline size_t block(const BlockData* block_ptr) const; // Fill in the regions covering [beg, end) so that no data moves; i.e., the // destination of region n is simply the start of region n. Both arguments @@ -1040,9 +1039,6 @@ class PSParallelCompact : AllStatic { #endif // #ifndef PRODUCT public: - - PSParallelCompact(); - static bool invoke(bool maximum_heap_compaction); static bool invoke_no_policy(bool maximum_heap_compaction); From 9f7094079b6eb6b60b345955dba358a2d5c90931 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Wed, 6 Mar 2024 16:15:23 +0000 Subject: [PATCH 77/86] 8327261: Parsing test for Double/Float succeeds w/o testing all bad cases Reviewed-by: darcy, gli, joehw, jlu, bpb, lancea --- test/jdk/java/lang/Double/ParseDouble.java | 21 +++++++++------------ test/jdk/java/lang/Float/ParseFloat.java | 21 +++++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/test/jdk/java/lang/Double/ParseDouble.java b/test/jdk/java/lang/Double/ParseDouble.java index ff4a3b80af3..5ee4cc680e1 100644 --- a/test/jdk/java/lang/Double/ParseDouble.java +++ b/test/jdk/java/lang/Double/ParseDouble.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2024, 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 @@ -556,24 +556,21 @@ private static void rudimentaryTest() { */ private static void testParsing(String [] input, boolean exceptionalInput) { - for(int i = 0; i < input.length; i++) { - double d; - + for (String s : input) { try { - d = Double.parseDouble(input[i]); - check(input[i]); - } - catch (NumberFormatException e) { - if (! exceptionalInput) { + Double.parseDouble(s); + check(s); + } catch (NumberFormatException e) { + if (!exceptionalInput) { throw new RuntimeException("Double.parseDouble rejected " + - "good string `" + input[i] + + "good string `" + s + "'."); } - break; + continue; } if (exceptionalInput) { throw new RuntimeException("Double.parseDouble accepted " + - "bad string `" + input[i] + + "bad string `" + s + "'."); } } diff --git a/test/jdk/java/lang/Float/ParseFloat.java b/test/jdk/java/lang/Float/ParseFloat.java index c40a9ea3338..8f9c300b02d 100644 --- a/test/jdk/java/lang/Float/ParseFloat.java +++ b/test/jdk/java/lang/Float/ParseFloat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, 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 @@ -276,24 +276,21 @@ private static void rudimentaryTest() { */ private static void testParsing(String [] input, boolean exceptionalInput) { - for(int i = 0; i < input.length; i++) { - double d; - + for (String s : input) { try { - d = Float.parseFloat(input[i]); - check(input[i]); - } - catch (NumberFormatException e) { - if (! exceptionalInput) { + Float.parseFloat(s); + check(s); + } catch (NumberFormatException e) { + if (!exceptionalInput) { throw new RuntimeException("Float.parseFloat rejected " + - "good string `" + input[i] + + "good string `" + s + "'."); } - break; + continue; } if (exceptionalInput) { throw new RuntimeException("Float.parseFloat accepted " + - "bad string `" + input[i] + + "bad string `" + s + "'."); } } From e92ecd9703e0a4f71d52a159516785a3eab5195a Mon Sep 17 00:00:00 2001 From: Kuai Wei Date: Wed, 6 Mar 2024 17:02:05 +0000 Subject: [PATCH 78/86] 8326983: Unused operands reported after JDK-8326135 Reviewed-by: kvn, vlivanov --- src/hotspot/cpu/aarch64/aarch64.ad | 440 --------------------------- src/hotspot/cpu/arm/arm.ad | 101 ------ src/hotspot/cpu/arm/arm_32.ad | 43 +-- src/hotspot/cpu/ppc/ppc.ad | 21 -- src/hotspot/cpu/riscv/riscv.ad | 40 --- src/hotspot/cpu/s390/s390.ad | 119 -------- src/hotspot/cpu/x86/gc/z/z_x86_64.ad | 12 + src/hotspot/cpu/x86/x86_32.ad | 95 ------ src/hotspot/cpu/x86/x86_64.ad | 125 -------- src/hotspot/share/adlc/archDesc.cpp | 7 +- 10 files changed, 27 insertions(+), 976 deletions(-) diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad index 7b94897eaad..a5943a13d61 100644 --- a/src/hotspot/cpu/aarch64/aarch64.ad +++ b/src/hotspot/cpu/aarch64/aarch64.ad @@ -4087,26 +4087,6 @@ operand immI_56() interface(CONST_INTER); %} -operand immI_63() -%{ - predicate(n->get_int() == 63); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - -operand immI_64() -%{ - predicate(n->get_int() == 64); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - operand immI_255() %{ predicate(n->get_int() == 255); @@ -4236,28 +4216,6 @@ operand immIScale() interface(CONST_INTER); %} -// 26 bit signed offset -- for pc-relative branches -operand immI26() -%{ - predicate(((-(1 << 25)) <= n->get_int()) && (n->get_int() < (1 << 25))); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - -// 19 bit signed offset -- for pc-relative loads -operand immI19() -%{ - predicate(((-(1 << 18)) <= n->get_int()) && (n->get_int() < (1 << 18))); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // 5 bit signed integer operand immI5() %{ @@ -4280,27 +4238,6 @@ operand immIU7() interface(CONST_INTER); %} -// 12 bit unsigned offset -- for base plus immediate loads -operand immIU12() -%{ - predicate((0 <= n->get_int()) && (n->get_int() < (1 << 12))); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - -operand immLU12() -%{ - predicate((0 <= n->get_long()) && (n->get_long() < (1 << 12))); - match(ConL); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // Offset for scaled or unscaled immediate loads and stores operand immIOffset() %{ @@ -4565,17 +4502,6 @@ operand immL0() interface(CONST_INTER); %} -// 64 bit unit increment -operand immL_1() -%{ - predicate(n->get_long() == 1); - match(ConL); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // 64 bit unit decrement operand immL_M1() %{ @@ -4587,19 +4513,6 @@ operand immL_M1() interface(CONST_INTER); %} -// 32 bit offset of pc in thread anchor - -operand immL_pc_off() -%{ - predicate(n->get_long() == in_bytes(JavaThread::frame_anchor_offset()) + - in_bytes(JavaFrameAnchor::last_Java_pc_offset())); - match(ConL); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // 64 bit integer valid for add sub immediate operand immLAddSub() %{ @@ -4688,30 +4601,6 @@ operand immByteMapBase() interface(CONST_INTER); %} -// Pointer Immediate Minus One -// this is used when we want to write the current PC to the thread anchor -operand immP_M1() -%{ - predicate(n->get_ptr() == -1); - match(ConP); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - -// Pointer Immediate Minus Two -// this is used when we want to write the current PC to the thread anchor -operand immP_M2() -%{ - predicate(n->get_ptr() == -2); - match(ConP); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // Float and Double operands // Double Immediate operand immD() @@ -4976,28 +4865,6 @@ operand iRegL_R0() interface(REG_INTER); %} -// Long 64 bit Register R2 only -operand iRegL_R2() -%{ - constraint(ALLOC_IN_RC(r2_reg)); - match(RegL); - match(iRegLNoSp); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -// Long 64 bit Register R3 only -operand iRegL_R3() -%{ - constraint(ALLOC_IN_RC(r3_reg)); - match(RegL); - match(iRegLNoSp); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - // Long 64 bit Register R11 only operand iRegL_R11() %{ @@ -5009,17 +4876,6 @@ operand iRegL_R11() interface(REG_INTER); %} -// Pointer 64 bit Register FP only -operand iRegP_FP() -%{ - constraint(ALLOC_IN_RC(fp_reg)); - match(RegP); - // match(iRegP); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - // Register R0 only operand iRegI_R0() %{ @@ -5078,33 +4934,6 @@ operand iRegN() interface(REG_INTER); %} -operand iRegN_R0() -%{ - constraint(ALLOC_IN_RC(r0_reg)); - match(iRegN); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand iRegN_R2() -%{ - constraint(ALLOC_IN_RC(r2_reg)); - match(iRegN); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand iRegN_R3() -%{ - constraint(ALLOC_IN_RC(r3_reg)); - match(iRegN); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - // Integer 64 bit Register not Special operand iRegNNoSp() %{ @@ -5255,222 +5084,6 @@ operand vRegD_V7() interface(REG_INTER); %} -operand vRegD_V8() -%{ - constraint(ALLOC_IN_RC(v8_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V9() -%{ - constraint(ALLOC_IN_RC(v9_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V10() -%{ - constraint(ALLOC_IN_RC(v10_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V11() -%{ - constraint(ALLOC_IN_RC(v11_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V12() -%{ - constraint(ALLOC_IN_RC(v12_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V13() -%{ - constraint(ALLOC_IN_RC(v13_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V14() -%{ - constraint(ALLOC_IN_RC(v14_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V15() -%{ - constraint(ALLOC_IN_RC(v15_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V16() -%{ - constraint(ALLOC_IN_RC(v16_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V17() -%{ - constraint(ALLOC_IN_RC(v17_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V18() -%{ - constraint(ALLOC_IN_RC(v18_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V19() -%{ - constraint(ALLOC_IN_RC(v19_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V20() -%{ - constraint(ALLOC_IN_RC(v20_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V21() -%{ - constraint(ALLOC_IN_RC(v21_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V22() -%{ - constraint(ALLOC_IN_RC(v22_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V23() -%{ - constraint(ALLOC_IN_RC(v23_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V24() -%{ - constraint(ALLOC_IN_RC(v24_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V25() -%{ - constraint(ALLOC_IN_RC(v25_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V26() -%{ - constraint(ALLOC_IN_RC(v26_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V27() -%{ - constraint(ALLOC_IN_RC(v27_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V28() -%{ - constraint(ALLOC_IN_RC(v28_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V29() -%{ - constraint(ALLOC_IN_RC(v29_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V30() -%{ - constraint(ALLOC_IN_RC(v30_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - -operand vRegD_V31() -%{ - constraint(ALLOC_IN_RC(v31_reg)); - match(RegD); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - operand pReg() %{ constraint(ALLOC_IN_RC(pr_reg)); @@ -5572,15 +5185,6 @@ operand thread_RegP(iRegP reg) interface(REG_INTER); %} -operand lr_RegP(iRegP reg) -%{ - constraint(ALLOC_IN_RC(lr_reg)); // link_reg - match(reg); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - //----------Memory Operands---------------------------------------------------- operand indirect(iRegP reg) @@ -5655,20 +5259,6 @@ operand indIndex(iRegP reg, iRegL lreg) %} %} -operand indOffI(iRegP reg, immIOffset off) -%{ - constraint(ALLOC_IN_RC(ptr_reg)); - match(AddP reg off); - op_cost(0); - format %{ "[$reg, $off]" %} - interface(MEMORY_INTER) %{ - base($reg); - index(0xffffffff); - scale(0x0); - disp($off); - %} -%} - operand indOffI1(iRegP reg, immIOffset1 off) %{ constraint(ALLOC_IN_RC(ptr_reg)); @@ -5739,20 +5329,6 @@ operand indOffI16(iRegP reg, immIOffset16 off) %} %} -operand indOffL(iRegP reg, immLoffset off) -%{ - constraint(ALLOC_IN_RC(ptr_reg)); - match(AddP reg off); - op_cost(0); - format %{ "[$reg, $off]" %} - interface(MEMORY_INTER) %{ - base($reg); - index(0xffffffff); - scale(0x0); - disp($off); - %} -%} - operand indOffL1(iRegP reg, immLoffset1 off) %{ constraint(ALLOC_IN_RC(ptr_reg)); @@ -5929,22 +5505,6 @@ operand indOffLN(iRegN reg, immLoffset off) %} - -// AArch64 opto stubs need to write to the pc slot in the thread anchor -operand thread_anchor_pc(thread_RegP reg, immL_pc_off off) -%{ - constraint(ALLOC_IN_RC(ptr_reg)); - match(AddP reg off); - op_cost(0); - format %{ "[$reg, $off]" %} - interface(MEMORY_INTER) %{ - base($reg); - index(0xffffffff); - scale(0x0); - disp($off); - %} -%} - //----------Special Memory Operands-------------------------------------------- // Stack Slot Operand - This operand is used for loading and storing temporary // values on the stack where a match requires a value to diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad index 1a833b08c4c..07c5b953254 100644 --- a/src/hotspot/cpu/arm/arm.ad +++ b/src/hotspot/cpu/arm/arm.ad @@ -1737,56 +1737,6 @@ operand immI0() %{ interface(CONST_INTER); %} -// Integer Immediate: the value 1 -operand immI_1() %{ - predicate(n->get_int() == 1); - match(ConI); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - -// Integer Immediate: the value 2 -operand immI_2() %{ - predicate(n->get_int() == 2); - match(ConI); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - -// Integer Immediate: the value 3 -operand immI_3() %{ - predicate(n->get_int() == 3); - match(ConI); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - -// Integer Immediate: the value 4 -operand immI_4() %{ - predicate(n->get_int() == 4); - match(ConI); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - -// Integer Immediate: the value 8 -operand immI_8() %{ - predicate(n->get_int() == 8); - match(ConI); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - // Int Immediate non-negative operand immU31() %{ @@ -1917,27 +1867,6 @@ operand limmIn() %{ interface(CONST_INTER); %} - -// Long Immediate: the value FF -operand immL_FF() %{ - predicate( n->get_long() == 0xFFL ); - match(ConL); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - -// Long Immediate: the value FFFF -operand immL_FFFF() %{ - predicate( n->get_long() == 0xFFFFL ); - match(ConL); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} - // Pointer Immediate: 32 or 64-bit operand immP() %{ match(ConP); @@ -1957,36 +1886,6 @@ operand immP0() %{ interface(CONST_INTER); %} -// Pointer Immediate -operand immN() -%{ - match(ConN); - - op_cost(10); - format %{ %} - interface(CONST_INTER); -%} - -operand immNKlass() -%{ - match(ConNKlass); - - op_cost(10); - format %{ %} - interface(CONST_INTER); -%} - -// Null Pointer Immediate -operand immN0() -%{ - predicate(n->get_narrowcon() == 0); - match(ConN); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - operand immL() %{ match(ConL); op_cost(40); diff --git a/src/hotspot/cpu/arm/arm_32.ad b/src/hotspot/cpu/arm/arm_32.ad index dd7d6f491da..1c15d55fbc3 100644 --- a/src/hotspot/cpu/arm/arm_32.ad +++ b/src/hotspot/cpu/arm/arm_32.ad @@ -501,31 +501,6 @@ operand immIRotn() %{ interface(CONST_INTER); %} -operand immIRotneg() %{ - // if AsmOperand::is_rotated_imm() is true for this constant, it is - // a immIRot and an optimal instruction combination exists to handle the - // constant as an immIRot - predicate(!AsmOperand::is_rotated_imm(n->get_int()) && AsmOperand::is_rotated_imm(-n->get_int())); - match(ConI); - - op_cost(0); - // formats are generated automatically for constants and base registers - format %{ %} - interface(CONST_INTER); -%} - -// Non-negative integer immediate that is encodable using the rotation scheme, -// and that when expanded fits in 31 bits. -operand immU31Rot() %{ - predicate((0 <= n->get_int()) && AsmOperand::is_rotated_imm(n->get_int())); - match(ConI); - - op_cost(0); - // formats are generated automatically for constants and base registers - format %{ %} - interface(CONST_INTER); -%} - operand immPRot() %{ predicate(n->get_ptr() == 0 || (AsmOperand::is_rotated_imm(n->get_ptr()) && ((ConPNode*)n)->type()->reloc() == relocInfo::none)); @@ -546,15 +521,15 @@ operand immLlowRot() %{ interface(CONST_INTER); %} -operand immLRot2() %{ - predicate(AsmOperand::is_rotated_imm((int)(n->get_long() >> 32)) && - AsmOperand::is_rotated_imm((int)(n->get_long()))); - match(ConL); - op_cost(0); - - format %{ %} - interface(CONST_INTER); -%} +//operand immLRot2() %{ +// predicate(AsmOperand::is_rotated_imm((int)(n->get_long() >> 32)) && +// AsmOperand::is_rotated_imm((int)(n->get_long()))); +// match(ConL); +// op_cost(0); +// +// format %{ %} +// interface(CONST_INTER); +//%} // Integer Immediate: 12-bit - for addressing mode operand immI12() %{ diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad index 1058ae35b76..773e60e3f4f 100644 --- a/src/hotspot/cpu/ppc/ppc.ad +++ b/src/hotspot/cpu/ppc/ppc.ad @@ -4388,27 +4388,6 @@ operand rarg1RegL() %{ interface(REG_INTER); %} -operand rarg2RegL() %{ - constraint(ALLOC_IN_RC(rarg2_bits64_reg)); - match(iRegLdst); - format %{ %} - interface(REG_INTER); -%} - -operand rarg3RegL() %{ - constraint(ALLOC_IN_RC(rarg3_bits64_reg)); - match(iRegLdst); - format %{ %} - interface(REG_INTER); -%} - -operand rarg4RegL() %{ - constraint(ALLOC_IN_RC(rarg4_bits64_reg)); - match(iRegLdst); - format %{ %} - interface(REG_INTER); -%} - // Pointer Destination Register // See definition of reg_class bits64_reg_rw. operand iRegPdst() %{ diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad index 86d0ad7a059..9e5f233ce17 100644 --- a/src/hotspot/cpu/riscv/riscv.ad +++ b/src/hotspot/cpu/riscv/riscv.ad @@ -2966,19 +2966,6 @@ operand immL_M1() %} -// 32 bit offset of pc in thread anchor - -operand immL_pc_off() -%{ - predicate(n->get_long() == in_bytes(JavaThread::frame_anchor_offset()) + - in_bytes(JavaFrameAnchor::last_Java_pc_offset())); - match(ConL); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // 64 bit integer valid for add immediate operand immLAdd() %{ @@ -3186,17 +3173,6 @@ operand iRegLNoSp() interface(REG_INTER); %} -// Long 64 bit Register R28 only -operand iRegL_R28() -%{ - constraint(ALLOC_IN_RC(r28_reg)); - match(RegL); - match(iRegLNoSp); - op_cost(0); - format %{ %} - interface(REG_INTER); -%} - // Long 64 bit Register R29 only operand iRegL_R29() %{ @@ -3694,22 +3670,6 @@ operand indOffLN(iRegN reg, immLOffset off) %} %} -// RISCV opto stubs need to write to the pc slot in the thread anchor -operand thread_anchor_pc(javaThread_RegP reg, immL_pc_off off) -%{ - constraint(ALLOC_IN_RC(ptr_reg)); - match(AddP reg off); - op_cost(0); - format %{ "[$reg, $off]" %} - interface(MEMORY_INTER) %{ - base($reg); - index(0xffffffff); - scale(0x0); - disp($off); - %} -%} - - //----------Special Memory Operands-------------------------------------------- // Stack Slot Operand - This operand is used for loading and storing temporary // values on the stack where a match requires a value to diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad index 5fcb885cdc3..8757d06af76 100644 --- a/src/hotspot/cpu/s390/s390.ad +++ b/src/hotspot/cpu/s390/s390.ad @@ -2578,24 +2578,6 @@ operand uimmI8() %{ interface(CONST_INTER); %} -// Integer Immediate: 6-bit -operand uimmI6() %{ - predicate(Immediate::is_uimm(n->get_int(), 6)); - match(ConI); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - -// Integer Immediate: 5-bit -operand uimmI5() %{ - predicate(Immediate::is_uimm(n->get_int(), 5)); - match(ConI); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - // Length for SS instructions, given in DWs, // possible range [1..512], i.e. [8..4096] Bytes // used range [1..256], i.e. [8..2048] Bytes @@ -2640,15 +2622,6 @@ operand immI_24() %{ interface(CONST_INTER); %} -// Integer Immediate: the value 255 -operand immI_255() %{ - predicate(n->get_int() == 255); - match(ConI); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - // Integer Immediate: the values 32-63 operand immI_32_63() %{ predicate(n->get_int() >= 32 && n->get_int() <= 63); @@ -2753,37 +2726,10 @@ operand uimmL12() %{ interface(CONST_INTER); %} -// Unsigned Long Immediate: 8-bit -operand uimmL8() %{ - predicate(Immediate::is_uimm8(n->get_long())); - match(ConL); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - //------------------------------------------- // (UN)SIGNED LONG specific values //------------------------------------------- -// Long Immediate: the value FF -operand immL_FF() %{ - predicate(n->get_long() == 0xFFL); - match(ConL); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - -// Long Immediate: the value FFFF -operand immL_FFFF() %{ - predicate(n->get_long() == 0xFFFFL); - match(ConL); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - // Long Immediate: the value FFFFFFFF operand immL_FFFFFFFF() %{ predicate(n->get_long() == 0xFFFFFFFFL); @@ -2858,15 +2804,6 @@ operand immP() %{ interface(CONST_INTER); %} -// Pointer Immediate: 32-bit -operand immP32() %{ - predicate(Immediate::is_uimm32(n->get_ptr())); - match(ConP); - op_cost(1); - format %{ %} - interface(CONST_INTER); -%} - // Pointer Immediate: 16-bit operand immP16() %{ predicate(Immediate::is_uimm16(n->get_ptr())); @@ -3166,20 +3103,6 @@ operand roddRegP() %{ interface(REG_INTER); %} -operand lock_ptr_RegP() %{ - constraint(ALLOC_IN_RC(z_lock_ptr_reg)); - match(RegP); - format %{ %} - interface(REG_INTER); -%} - -operand rscratch2RegP() %{ - constraint(ALLOC_IN_RC(z_rscratch2_bits64_reg)); - match(RegP); - format %{ %} - interface(REG_INTER); -%} - operand iRegN() %{ constraint(ALLOC_IN_RC(z_int_reg)); match(RegN); @@ -3294,14 +3217,6 @@ operand flagsReg() %{ interface(REG_INTER); %} -// Condition Code Flag Registers for rules with result tuples -operand TD_flagsReg() %{ - constraint(ALLOC_IN_RC(z_condition_reg)); - match(RegFlags); - format %{ "CR" %} - interface(REG_TUPLE_DEST_INTER); -%} - operand regD() %{ constraint(ALLOC_IN_RC(z_dbl_reg)); match(RegD); @@ -3309,13 +3224,6 @@ operand regD() %{ interface(REG_INTER); %} -operand rscratchRegD() %{ - constraint(ALLOC_IN_RC(z_rscratch1_dbl_reg)); - match(RegD); - format %{ %} - interface(REG_INTER); -%} - operand regF() %{ constraint(ALLOC_IN_RC(z_flt_reg)); match(RegF); @@ -3323,13 +3231,6 @@ operand regF() %{ interface(REG_INTER); %} -operand rscratchRegF() %{ - constraint(ALLOC_IN_RC(z_rscratch1_flt_reg)); - match(RegF); - format %{ %} - interface(REG_INTER); -%} - // Special Registers // Method Register @@ -3340,26 +3241,6 @@ operand inline_cache_regP(iRegP reg) %{ interface(REG_INTER); %} -// Operands to remove register moves in unscaled mode. -// Match read/write registers with an EncodeP node if neither shift nor add are required. -operand iRegP2N(iRegP reg) %{ - predicate(CompressedOops::shift() == 0 && _leaf->as_EncodeP()->in(0) == nullptr); - constraint(ALLOC_IN_RC(z_memory_ptr_reg)); - match(EncodeP reg); - format %{ "$reg" %} - interface(REG_INTER) -%} - -operand iRegN2P(iRegN reg) %{ - predicate(CompressedOops::base() == nullptr && CompressedOops::shift() == 0 && - _leaf->as_DecodeN()->in(0) == nullptr); - constraint(ALLOC_IN_RC(z_memory_ptr_reg)); - match(DecodeN reg); - format %{ "$reg" %} - interface(REG_INTER) -%} - - //----------Complex Operands--------------------------------------------------- // Indirect Memory Reference diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad index d178805dfc7..0cc2ea03b35 100644 --- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad +++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad @@ -99,6 +99,18 @@ static void z_store_barrier(MacroAssembler& _masm, const MachNode* node, Address %} +operand no_rax_RegP() +%{ + constraint(ALLOC_IN_RC(ptr_no_rax_reg)); + match(RegP); + match(rbx_RegP); + match(rsi_RegP); + match(rdi_RegP); + + format %{ %} + interface(REG_INTER); +%} + // Load Pointer instruct zLoadP(rRegP dst, memory mem, rFlagsReg cr) %{ diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad index 2fe655a5767..1c9f6fc4134 100644 --- a/src/hotspot/cpu/x86/x86_32.ad +++ b/src/hotspot/cpu/x86/x86_32.ad @@ -3602,64 +3602,6 @@ operand kReg() interface(REG_INTER); %} -operand kReg_K1() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K1)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K2() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K2)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -// Special Registers -operand kReg_K3() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K3)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K4() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K4)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K5() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K5)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K6() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K6)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -// Special Registers -operand kReg_K7() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K7)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - // Register Operands // Integer Register operand rRegI() %{ @@ -3737,18 +3679,6 @@ operand eDIRegI(xRegI reg) %{ interface(REG_INTER); %} -operand naxRegI() %{ - constraint(ALLOC_IN_RC(nax_reg)); - match(RegI); - match(eCXRegI); - match(eDXRegI); - match(eSIRegI); - match(eDIRegI); - - format %{ %} - interface(REG_INTER); -%} - operand nadxRegI() %{ constraint(ALLOC_IN_RC(nadx_reg)); match(RegI); @@ -3836,31 +3766,6 @@ operand eRegP_no_EBP() %{ interface(REG_INTER); %} -operand naxRegP() %{ - constraint(ALLOC_IN_RC(nax_reg)); - match(RegP); - match(eBXRegP); - match(eDXRegP); - match(eCXRegP); - match(eSIRegP); - match(eDIRegP); - - format %{ %} - interface(REG_INTER); -%} - -operand nabxRegP() %{ - constraint(ALLOC_IN_RC(nabx_reg)); - match(RegP); - match(eCXRegP); - match(eDXRegP); - match(eSIRegP); - match(eDIRegP); - - format %{ %} - interface(REG_INTER); -%} - operand pRegP() %{ constraint(ALLOC_IN_RC(p_reg)); match(RegP); diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad index d43929efd3e..aef3453b0b1 100644 --- a/src/hotspot/cpu/x86/x86_64.ad +++ b/src/hotspot/cpu/x86/x86_64.ad @@ -2126,28 +2126,6 @@ operand immU31() interface(CONST_INTER); %} -// Constant for long shifts -operand immI_32() -%{ - predicate( n->get_int() == 32 ); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - -// Constant for long shifts -operand immI_64() -%{ - predicate( n->get_int() == 64 ); - match(ConI); - - op_cost(0); - format %{ %} - interface(CONST_INTER); -%} - // Pointer Immediate operand immP() %{ @@ -2302,28 +2280,6 @@ operand immL_M1() interface(CONST_INTER); %} -// Long Immediate: the value 10 -operand immL10() -%{ - predicate(n->get_long() == 10); - match(ConL); - - format %{ %} - interface(CONST_INTER); -%} - -// Long immediate from 0 to 127. -// Used for a shorter form of long mul by 10. -operand immL_127() -%{ - predicate(0 <= n->get_long() && n->get_long() < 0x80); - match(ConL); - - op_cost(10); - format %{ %} - interface(CONST_INTER); -%} - // Long Immediate: low 32-bit mask operand immL_32bits() %{ @@ -2458,64 +2414,6 @@ operand kReg() interface(REG_INTER); %} -operand kReg_K1() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K1)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K2() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K2)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -// Special Registers -operand kReg_K3() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K3)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K4() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K4)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K5() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K5)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -operand kReg_K6() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K6)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - -// Special Registers -operand kReg_K7() -%{ - constraint(ALLOC_IN_RC(vectmask_reg_K7)); - match(RegVectMask); - format %{%} - interface(REG_INTER); -%} - // Register Operands // Integer Register operand rRegI() @@ -2663,18 +2561,6 @@ operand rRegN() %{ // the RBP is used as a proper frame pointer and is not included in ptr_reg. As a // result, RBP is not included in the output of the instruction either. -operand no_rax_RegP() -%{ - constraint(ALLOC_IN_RC(ptr_no_rax_reg)); - match(RegP); - match(rbx_RegP); - match(rsi_RegP); - match(rdi_RegP); - - format %{ %} - interface(REG_INTER); -%} - // This operand is not allowed to use RBP even if // RBP is not used to hold the frame pointer. operand no_rbp_RegP() @@ -2689,17 +2575,6 @@ operand no_rbp_RegP() interface(REG_INTER); %} -operand no_rax_rbx_RegP() -%{ - constraint(ALLOC_IN_RC(ptr_no_rax_rbx_reg)); - match(RegP); - match(rsi_RegP); - match(rdi_RegP); - - format %{ %} - interface(REG_INTER); -%} - // Special Registers // Return a pointer value operand rax_RegP() diff --git a/src/hotspot/share/adlc/archDesc.cpp b/src/hotspot/share/adlc/archDesc.cpp index 93fa7451dc0..f084f506bf5 100644 --- a/src/hotspot/share/adlc/archDesc.cpp +++ b/src/hotspot/share/adlc/archDesc.cpp @@ -720,6 +720,10 @@ class MarkUsageFormClosure : public FormClosure { // check unused operands bool ArchDesc::check_usage() { + if (_disable_warnings) { + return true; + } + std::unordered_set visited; MarkUsageFormClosure callback(this, &visited); _instructions.reset(); @@ -747,11 +751,12 @@ bool ArchDesc::check_usage() { callback.do_form_by_name("sRegL"); // special generic vector operands only used in Matcher::pd_specialize_generic_vector_operand + // x86_32 combine x86.ad and x86_32.ad, the vec*/legVec* can not be cleaned from IA32 #if defined(AARCH64) callback.do_form_by_name("vecA"); callback.do_form_by_name("vecD"); callback.do_form_by_name("vecX"); -#elif defined(AMD64) +#elif defined(IA32) || defined(AMD64) callback.do_form_by_name("vecS"); callback.do_form_by_name("vecD"); callback.do_form_by_name("vecX"); From 4f336085d1098e7fba7b58f0a73c028179a2a13d Mon Sep 17 00:00:00 2001 From: Chad Rakoczy Date: Wed, 6 Mar 2024 19:55:29 +0000 Subject: [PATCH 79/86] 8326718: Test java/util/Formatter/Padding.java should timeout on large inputs before fix in JDK-8299677 Reviewed-by: rgiulietti --- test/jdk/java/util/Formatter/Padding.java | 43 +++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/test/jdk/java/util/Formatter/Padding.java b/test/jdk/java/util/Formatter/Padding.java index 5f0e7f0e201..dc3df0be0e4 100644 --- a/test/jdk/java/util/Formatter/Padding.java +++ b/test/jdk/java/util/Formatter/Padding.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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,7 +23,7 @@ /* * @test - * @bug 4906370 + * @bug 4906370 8299677 8326718 * @summary Tests to excercise padding on int and double values, * with various flag combinations. * @run junit Padding @@ -40,6 +40,9 @@ public class Padding { + private static final String tenMillionZeros = "0".repeat(10_000_000); + private static final String tenMillionBlanks = " ".repeat(10_000_000); + static Arguments[] padding() { return new Arguments[] { /* blank padding, right adjusted, optional plus sign */ @@ -49,6 +52,7 @@ static Arguments[] padding() { arguments(" 12", "%4d", 12), arguments(" 12", "%5d", 12), arguments(" 12", "%10d", 12), + arguments(tenMillionBlanks + "12", "%10000002d", 12), arguments("-12", "%1d", -12), arguments("-12", "%2d", -12), @@ -56,6 +60,7 @@ static Arguments[] padding() { arguments(" -12", "%4d", -12), arguments(" -12", "%5d", -12), arguments(" -12", "%10d", -12), + arguments(tenMillionBlanks + "-12", "%10000003d", -12), arguments("1.2", "%1.1f", 1.2), arguments("1.2", "%2.1f", 1.2), @@ -63,6 +68,7 @@ static Arguments[] padding() { arguments(" 1.2", "%4.1f", 1.2), arguments(" 1.2", "%5.1f", 1.2), arguments(" 1.2", "%10.1f", 1.2), + arguments(tenMillionBlanks + "1.2", "%10000003.1f", 1.2), arguments("-1.2", "%1.1f", -1.2), arguments("-1.2", "%2.1f", -1.2), @@ -70,6 +76,7 @@ static Arguments[] padding() { arguments("-1.2", "%4.1f", -1.2), arguments(" -1.2", "%5.1f", -1.2), arguments(" -1.2", "%10.1f", -1.2), + arguments(tenMillionBlanks + "-1.2", "%10000004.1f", -1.2), /* blank padding, right adjusted, mandatory plus sign */ arguments("+12", "%+1d", 12), @@ -78,6 +85,7 @@ static Arguments[] padding() { arguments(" +12", "%+4d", 12), arguments(" +12", "%+5d", 12), arguments(" +12", "%+10d", 12), + arguments(tenMillionBlanks + "+12", "%+10000003d", 12), arguments("-12", "%+1d", -12), arguments("-12", "%+2d", -12), @@ -85,6 +93,7 @@ static Arguments[] padding() { arguments(" -12", "%+4d", -12), arguments(" -12", "%+5d", -12), arguments(" -12", "%+10d", -12), + arguments(tenMillionBlanks + "-12", "%+10000003d", -12), arguments("+1.2", "%+1.1f", 1.2), arguments("+1.2", "%+2.1f", 1.2), @@ -92,6 +101,7 @@ static Arguments[] padding() { arguments("+1.2", "%+4.1f", 1.2), arguments(" +1.2", "%+5.1f", 1.2), arguments(" +1.2", "%+10.1f", 1.2), + arguments(tenMillionBlanks + "+1.2", "%+10000004.1f", 1.2), arguments("-1.2", "%+1.1f", -1.2), arguments("-1.2", "%+2.1f", -1.2), @@ -99,6 +109,7 @@ static Arguments[] padding() { arguments("-1.2", "%+4.1f", -1.2), arguments(" -1.2", "%+5.1f", -1.2), arguments(" -1.2", "%+10.1f", -1.2), + arguments(tenMillionBlanks + "-1.2", "%+10000004.1f", -1.2), /* blank padding, right adjusted, mandatory blank sign */ arguments(" 12", "% 1d", 12), @@ -107,6 +118,7 @@ static Arguments[] padding() { arguments(" 12", "% 4d", 12), arguments(" 12", "% 5d", 12), arguments(" 12", "% 10d", 12), + arguments(tenMillionBlanks + "12", "% 10000002d", 12), arguments("-12", "% 1d", -12), arguments("-12", "% 2d", -12), @@ -114,6 +126,7 @@ static Arguments[] padding() { arguments(" -12", "% 4d", -12), arguments(" -12", "% 5d", -12), arguments(" -12", "% 10d", -12), + arguments(tenMillionBlanks + "-12", "% 10000003d", -12), arguments(" 1.2", "% 1.1f", 1.2), arguments(" 1.2", "% 2.1f", 1.2), @@ -121,6 +134,7 @@ static Arguments[] padding() { arguments(" 1.2", "% 4.1f", 1.2), arguments(" 1.2", "% 5.1f", 1.2), arguments(" 1.2", "% 10.1f", 1.2), + arguments(tenMillionBlanks + "1.2", "% 10000003.1f", 1.2), arguments("-1.2", "% 1.1f", -1.2), arguments("-1.2", "% 2.1f", -1.2), @@ -128,6 +142,7 @@ static Arguments[] padding() { arguments("-1.2", "% 4.1f", -1.2), arguments(" -1.2", "% 5.1f", -1.2), arguments(" -1.2", "% 10.1f", -1.2), + arguments(tenMillionBlanks + "-1.2", "% 10000004.1f", -1.2), /* blank padding, left adjusted, optional sign */ arguments("12", "%-1d", 12), @@ -136,6 +151,7 @@ static Arguments[] padding() { arguments("12 ", "%-4d", 12), arguments("12 ", "%-5d", 12), arguments("12 ", "%-10d", 12), + arguments("12" + tenMillionBlanks, "%-10000002d", 12), arguments("-12", "%-1d", -12), arguments("-12", "%-2d", -12), @@ -143,6 +159,7 @@ static Arguments[] padding() { arguments("-12 ", "%-4d", -12), arguments("-12 ", "%-5d", -12), arguments("-12 ", "%-10d", -12), + arguments("-12" + tenMillionBlanks, "%-10000003d", -12), arguments("1.2", "%-1.1f", 1.2), arguments("1.2", "%-2.1f", 1.2), @@ -150,6 +167,7 @@ static Arguments[] padding() { arguments("1.2 ", "%-4.1f", 1.2), arguments("1.2 ", "%-5.1f", 1.2), arguments("1.2 ", "%-10.1f", 1.2), + arguments("1.2" + tenMillionBlanks, "%-10000003.1f", 1.2), arguments("-1.2", "%-1.1f", -1.2), arguments("-1.2", "%-2.1f", -1.2), @@ -157,6 +175,7 @@ static Arguments[] padding() { arguments("-1.2", "%-4.1f", -1.2), arguments("-1.2 ", "%-5.1f", -1.2), arguments("-1.2 ", "%-10.1f", -1.2), + arguments("-1.2" + tenMillionBlanks, "%-10000004.1f", -1.2), /* blank padding, left adjusted, mandatory plus sign */ arguments("+12", "%-+1d", 12), @@ -165,6 +184,7 @@ static Arguments[] padding() { arguments("+12 ", "%-+4d", 12), arguments("+12 ", "%-+5d", 12), arguments("+12 ", "%-+10d", 12), + arguments("+12" + tenMillionBlanks, "%-+10000003d", 12), arguments("-12", "%-+1d", -12), arguments("-12", "%-+2d", -12), @@ -172,6 +192,7 @@ static Arguments[] padding() { arguments("-12 ", "%-+4d", -12), arguments("-12 ", "%-+5d", -12), arguments("-12 ", "%-+10d", -12), + arguments("-12" + tenMillionBlanks, "%-+10000003d", -12), arguments("+1.2", "%-+1.1f", 1.2), arguments("+1.2", "%-+2.1f", 1.2), @@ -179,6 +200,7 @@ static Arguments[] padding() { arguments("+1.2", "%-+4.1f", 1.2), arguments("+1.2 ", "%-+5.1f", 1.2), arguments("+1.2 ", "%-+10.1f", 1.2), + arguments("+1.2" + tenMillionBlanks, "%-+10000004.1f", 1.2), arguments("-1.2", "%-+1.1f", -1.2), arguments("-1.2", "%-+2.1f", -1.2), @@ -186,6 +208,7 @@ static Arguments[] padding() { arguments("-1.2", "%-+4.1f", -1.2), arguments("-1.2 ", "%-+5.1f", -1.2), arguments("-1.2 ", "%-+10.1f", -1.2), + arguments("-1.2" + tenMillionBlanks, "%-+10000004.1f", -1.2), /* blank padding, left adjusted, mandatory blank sign */ arguments(" 12", "%- 1d", 12), @@ -194,6 +217,7 @@ static Arguments[] padding() { arguments(" 12 ", "%- 4d", 12), arguments(" 12 ", "%- 5d", 12), arguments(" 12 ", "%- 10d", 12), + arguments(" 12" + tenMillionBlanks, "%- 10000003d", 12), arguments("-12", "%- 1d", -12), arguments("-12", "%- 2d", -12), @@ -201,6 +225,7 @@ static Arguments[] padding() { arguments("-12 ", "%- 4d", -12), arguments("-12 ", "%- 5d", -12), arguments("-12 ", "%- 10d", -12), + arguments("-12" + tenMillionBlanks, "%- 10000003d", -12), arguments(" 1.2", "%- 1.1f", 1.2), arguments(" 1.2", "%- 2.1f", 1.2), @@ -208,6 +233,7 @@ static Arguments[] padding() { arguments(" 1.2", "%- 4.1f", 1.2), arguments(" 1.2 ", "%- 5.1f", 1.2), arguments(" 1.2 ", "%- 10.1f", 1.2), + arguments(" 1.2" + tenMillionBlanks, "%- 10000004.1f", 1.2), arguments("-1.2", "%- 1.1f", -1.2), arguments("-1.2", "%- 2.1f", -1.2), @@ -215,6 +241,7 @@ static Arguments[] padding() { arguments("-1.2", "%- 4.1f", -1.2), arguments("-1.2 ", "%- 5.1f", -1.2), arguments("-1.2 ", "%- 10.1f", -1.2), + arguments("-1.2" + tenMillionBlanks, "%- 10000004.1f", -1.2), /* zero padding, right adjusted, optional sign */ arguments("12", "%01d", 12), @@ -223,6 +250,7 @@ static Arguments[] padding() { arguments("0012", "%04d", 12), arguments("00012", "%05d", 12), arguments("0000000012", "%010d", 12), + arguments(tenMillionZeros + "12", "%010000002d", 12), arguments("-12", "%01d", -12), arguments("-12", "%02d", -12), @@ -230,6 +258,7 @@ static Arguments[] padding() { arguments("-012", "%04d", -12), arguments("-0012", "%05d", -12), arguments("-000000012", "%010d", -12), + arguments("-" + tenMillionZeros + "12", "%010000003d", -12), arguments("1.2", "%01.1f", 1.2), arguments("1.2", "%02.1f", 1.2), @@ -237,6 +266,7 @@ static Arguments[] padding() { arguments("01.2", "%04.1f", 1.2), arguments("001.2", "%05.1f", 1.2), arguments("00000001.2", "%010.1f", 1.2), + arguments(tenMillionZeros + "1.2", "%010000003.1f", 1.2), arguments("-1.2", "%01.1f", -1.2), arguments("-1.2", "%02.1f", -1.2), @@ -244,6 +274,7 @@ static Arguments[] padding() { arguments("-1.2", "%04.1f", -1.2), arguments("-01.2", "%05.1f", -1.2), arguments("-0000001.2", "%010.1f", -1.2), + arguments("-" + tenMillionZeros + "1.2", "%010000004.1f", -1.2), /* zero padding, right adjusted, mandatory plus sign */ arguments("+12", "%+01d", 12), @@ -252,6 +283,7 @@ static Arguments[] padding() { arguments("+012", "%+04d", 12), arguments("+0012", "%+05d", 12), arguments("+000000012", "%+010d", 12), + arguments("+" + tenMillionZeros + "12", "%+010000003d", 12), arguments("-12", "%+01d", -12), arguments("-12", "%+02d", -12), @@ -259,6 +291,7 @@ static Arguments[] padding() { arguments("-012", "%+04d", -12), arguments("-0012", "%+05d", -12), arguments("-000000012", "%+010d", -12), + arguments("-" + tenMillionZeros + "12", "%+010000003d", -12), arguments("+1.2", "%+01.1f", 1.2), arguments("+1.2", "%+02.1f", 1.2), @@ -266,6 +299,7 @@ static Arguments[] padding() { arguments("+1.2", "%+04.1f", 1.2), arguments("+01.2", "%+05.1f", 1.2), arguments("+0000001.2", "%+010.1f", 1.2), + arguments("+" + tenMillionZeros + "1.2", "%+010000004.1f", 1.2), arguments("-1.2", "%+01.1f", -1.2), arguments("-1.2", "%+02.1f", -1.2), @@ -273,6 +307,7 @@ static Arguments[] padding() { arguments("-1.2", "%+04.1f", -1.2), arguments("-01.2", "%+05.1f", -1.2), arguments("-0000001.2", "%+010.1f", -1.2), + arguments("-" + tenMillionZeros + "1.2", "%+010000004.1f", -1.2), /* zero padding, right adjusted, mandatory blank sign */ arguments(" 12", "% 01d", 12), @@ -281,6 +316,7 @@ static Arguments[] padding() { arguments(" 012", "% 04d", 12), arguments(" 0012", "% 05d", 12), arguments(" 000000012", "% 010d", 12), + arguments(" " + tenMillionZeros + "12", "% 010000003d", 12), arguments("-12", "% 01d", -12), arguments("-12", "% 02d", -12), @@ -288,6 +324,7 @@ static Arguments[] padding() { arguments("-012", "% 04d", -12), arguments("-0012", "% 05d", -12), arguments("-000000012", "% 010d", -12), + arguments("-" + tenMillionZeros + "12", "% 010000003d", -12), arguments(" 1.2", "% 01.1f", 1.2), arguments(" 1.2", "% 02.1f", 1.2), @@ -295,6 +332,7 @@ static Arguments[] padding() { arguments(" 1.2", "% 04.1f", 1.2), arguments(" 01.2", "% 05.1f", 1.2), arguments(" 0000001.2", "% 010.1f", 1.2), + arguments(" " + tenMillionZeros + "1.2", "% 010000004.1f", 1.2), arguments("-1.2", "% 01.1f", -1.2), arguments("-1.2", "% 02.1f", -1.2), @@ -302,6 +340,7 @@ static Arguments[] padding() { arguments("-1.2", "% 04.1f", -1.2), arguments("-01.2", "% 05.1f", -1.2), arguments("-0000001.2", "% 010.1f", -1.2), + arguments("-" + tenMillionZeros + "1.2", "% 010000004.1f", -1.2), }; } From 13c74535dea99133fe71942d1ac4f6df0f742d90 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Wed, 6 Mar 2024 20:00:12 +0000 Subject: [PATCH 80/86] 8325880: Require minimum Open XL C/C++ version 17.1.1 Reviewed-by: mdoerr, jwaters, ihse --- doc/building.html | 2 +- doc/building.md | 2 +- make/autoconf/toolchain.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/building.html b/doc/building.html index 29d0ace19b0..2b137a584bc 100644 --- a/doc/building.html +++ b/doc/building.html @@ -562,7 +562,7 @@

    Native Compiler AIX -IBM XL C/C++ +IBM Open XL C/C++ Windows diff --git a/doc/building.md b/doc/building.md index 14409b40668..7418013dbb7 100644 --- a/doc/building.md +++ b/doc/building.md @@ -382,7 +382,7 @@ one-to-one correlation between target operating system and toolchain. | ------------------ | ------------------------- | | Linux | gcc, clang | | macOS | Apple Xcode (using clang) | -| AIX | IBM XL C/C++ | +| AIX | IBM Open XL C/C++ | | Windows | Microsoft Visual Studio | Please see the individual sections on the toolchains for version diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 index de0b6f0adfb..411ee5a029d 100644 --- a/make/autoconf/toolchain.m4 +++ b/make/autoconf/toolchain.m4 @@ -53,7 +53,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" TOOLCHAIN_MINIMUM_VERSION_clang="3.5" TOOLCHAIN_MINIMUM_VERSION_gcc="10.0" TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28 -TOOLCHAIN_MINIMUM_VERSION_xlc="16.1.0.0011" +TOOLCHAIN_MINIMUM_VERSION_xlc="17.1.1.4" # Minimum supported linker versions, empty means unspecified TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.18" From 989fc3e6ea65e530055296ac4bc181cb5c6a41ea Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Wed, 6 Mar 2024 20:17:11 +0000 Subject: [PATCH 81/86] 8325878: Require minimum Clang version 13 Reviewed-by: jwaters, ihse --- doc/building.html | 2 +- doc/building.md | 2 +- make/autoconf/toolchain.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/building.html b/doc/building.html index 2b137a584bc..a57d3d16abc 100644 --- a/doc/building.html +++ b/doc/building.html @@ -607,7 +607,7 @@

    gcc

    13.2 or newer.

    In general, any version between these two should be usable.

    clang

    -

    The minimum accepted version of clang is 3.5. Older versions will not +

    The minimum accepted version of clang is 13. Older versions will not be accepted by configure.

    To use clang instead of gcc on Linux, use --with-toolchain-type=clang.

    diff --git a/doc/building.md b/doc/building.md index 7418013dbb7..5812b7529e3 100644 --- a/doc/building.md +++ b/doc/building.md @@ -413,7 +413,7 @@ In general, any version between these two should be usable. ### clang -The minimum accepted version of clang is 3.5. Older versions will not be +The minimum accepted version of clang is 13. Older versions will not be accepted by `configure`. To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`. diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 index 411ee5a029d..15ebc0cbbbc 100644 --- a/make/autoconf/toolchain.m4 +++ b/make/autoconf/toolchain.m4 @@ -50,7 +50,7 @@ TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio" TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" # Minimum supported versions, empty means unspecified -TOOLCHAIN_MINIMUM_VERSION_clang="3.5" +TOOLCHAIN_MINIMUM_VERSION_clang="13.0" TOOLCHAIN_MINIMUM_VERSION_gcc="10.0" TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28 TOOLCHAIN_MINIMUM_VERSION_xlc="17.1.1.4" From 3d37b28642fd2715ab5c365426409c61939a1436 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Wed, 6 Mar 2024 22:42:18 +0000 Subject: [PATCH 82/86] 8327173: HotSpot Style Guide needs update regarding nullptr vs NULL Reviewed-by: shade, dholmes, kvn --- doc/hotspot-style.html | 13 ++++++++----- doc/hotspot-style.md | 10 ++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html index ced607d7109..0305bfeca03 100644 --- a/doc/hotspot-style.html +++ b/doc/hotspot-style.html @@ -748,12 +748,15 @@

    thread_local

    href="https://bugs.openjdk.org/browse/JDK-8282469">JDK-8282469 for further discussion.

    nullptr

    -

    Prefer nullptr (Use nullptr (n2431) -to NULL. Don't use (constexpr or literal) 0 for -pointers.

    -

    For historical reasons there are widespread uses of both -NULL and of integer 0 as a pointer value.

    +rather than NULL. See the paper for reasons to avoid +NULL.

    +

    Don't use (constant expression or literal) 0 for pointers. Note that +C++14 removed non-literal 0 constants from null pointer +constants, though some compilers continue to treat them as such. +For historical reasons there may be lingering uses of 0 as a +pointer.

    <atomic>

    Do not use facilities provided by the <atomic> header ( Date: Thu, 7 Mar 2024 00:01:50 +0000 Subject: [PATCH 83/86] 8325532: serviceability/dcmd/compiler/PerfMapTest.java leaves created files in the /tmp dir. Reviewed-by: amenkov, kevinw, lmesnik, sspitsyn --- .../serviceability/dcmd/compiler/PerfMapTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java index 95ae37c527f..6bbe62044d0 100644 --- a/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java +++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java @@ -65,7 +65,13 @@ public void run(CommandExecutor executor, String cmd, Path path) { output.stderrShouldBeEmpty(); output.stdoutShouldBeEmpty(); - Assert.assertTrue(Files.exists(path), "File must exist: " + path); + try { + Assert.assertTrue(Files.exists(path), "File must exist: " + path); + Assert.assertTrue(Files.size(path) > 0, + "File must not be empty. Possible file permission issue: " + path); + } catch (IOException e) { + throw new RuntimeException(e); + } // Sanity check the file contents try { @@ -79,10 +85,11 @@ public void run(CommandExecutor executor, String cmd, Path path) { } @Test - public void defaultMapFile() { + public void defaultMapFile() throws IOException { final long pid = ProcessHandle.current().pid(); final Path path = Paths.get(String.format("/tmp/perf-%d.map", pid)); run(new JMXExecutor(), "Compiler.perfmap", path); + Files.deleteIfExists(path); } @Test @@ -96,7 +103,7 @@ public void specifiedMapFile() { } @Test - public void specifiedDefaultMapFile() { + public void specifiedDefaultMapFile() throws IOException { // This is a special case of specifiedMapFile() where the filename specified // is the same as the default filename as given in the help output. The dcmd // should treat this literally as the filename and not expand into @@ -104,5 +111,6 @@ public void specifiedDefaultMapFile() { String test_dir = System.getProperty("test.dir", "."); Path path = Paths.get("/tmp/perf-.map"); run(new JMXExecutor(), "Compiler.perfmap " + path.toString(), path); + Files.deleteIfExists(path); } } From 1bd4abf98e26d04076f330c0b2e44f666f8c27a1 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Thu, 7 Mar 2024 00:52:36 +0000 Subject: [PATCH 84/86] 8327434: Test java/util/PluggableLocale/TimeZoneNameProviderTest.java timed out Reviewed-by: jlu, rriggs, iris --- .../util/PluggableLocale/TimeZoneNameProviderTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java index 399fd440fa5..5a8463cbfde 100644 --- a/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4052440 8003267 8062588 8210406 8174269 + * @bug 4052440 8003267 8062588 8210406 8174269 8327434 * @summary TimeZoneNameProvider tests * @library providersrc/foobarutils * providersrc/barprovider @@ -45,6 +45,7 @@ import java.util.Locale; import java.util.MissingResourceException; import java.util.TimeZone; +import java.util.stream.Stream; import com.bar.TimeZoneNameProviderImpl; @@ -69,12 +70,12 @@ public static void main(String[] s) { } void test1() { - Locale[] available = Locale.getAvailableLocales(); List jreimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getTimeZoneNameProvider().getAvailableLocales()); List providerLocales = Arrays.asList(tznp.getAvailableLocales()); String[] ids = TimeZone.getAvailableIDs(); - for (Locale target: available) { + // Sampling relevant locales + Stream.concat(Stream.of(Locale.ROOT, Locale.US, Locale.JAPAN), providerLocales.stream()).forEach(target -> { // pure JRE implementation OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getTimeZoneNames(target); boolean jreSupportsTarget = jreimplloc.contains(target); @@ -111,7 +112,7 @@ void test1() { jreSupportsTarget && jresname != null); } } - } + }); } final String pattern = "z"; From 401834122dc3afb3feb9f7b31fc785de82ba2e58 Mon Sep 17 00:00:00 2001 From: Denghui Dong Date: Thu, 7 Mar 2024 02:57:28 +0000 Subject: [PATCH 85/86] 8327379: Make TimeLinearScan a develop flag Reviewed-by: gli, kvn --- src/hotspot/share/c1/c1_globals.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp index 4c73d7536b5..3940fdde46d 100644 --- a/src/hotspot/share/c1/c1_globals.hpp +++ b/src/hotspot/share/c1/c1_globals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, 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 @@ -210,7 +210,7 @@ develop(bool, StressLinearScan, false, \ "scramble block order used by LinearScan (stress test)") \ \ - product(bool, TimeLinearScan, false, \ + develop(bool, TimeLinearScan, false, \ "detailed timing of LinearScan phases") \ \ develop(bool, TimeEachLinearScan, false, \ From f54e59835492e86b9178b2050901579707f41100 Mon Sep 17 00:00:00 2001 From: Emanuel Peter Date: Thu, 7 Mar 2024 07:48:38 +0000 Subject: [PATCH 86/86] 8327172: C2 SuperWord: data node in loop has no input in loop: replace assert with bailout Reviewed-by: chagedorn, kvn --- src/hotspot/share/opto/superword.cpp | 13 ++- src/hotspot/share/opto/vectorization.hpp | 1 + .../loopopts/superword/TestNoInputInLoop.java | 91 +++++++++++++++++++ 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestNoInputInLoop.java diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index 75b5e53f279..ef4bae89426 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -2957,7 +2957,6 @@ VStatus VLoopBody::construct() { return VStatus::make_failure(VLoopBody::FAILURE_NODE_NOT_ALLOWED); } -#ifdef ASSERT if (!n->is_CFG()) { bool found = false; for (uint j = 0; j < n->req(); j++) { @@ -2967,9 +2966,17 @@ VStatus VLoopBody::construct() { break; } } - assert(found, "every non-cfg node must have an input that is also inside the loop"); - } + if (!found) { + // If all inputs to a data-node are outside the loop, the node itself should be outside the loop. +#ifndef PRODUCT + if (_vloop.is_trace_body()) { + tty->print_cr("VLoopBody::construct: fails because data node in loop has no input in loop:"); + n->dump(); + } #endif + return VStatus::make_failure(VLoopBody::FAILURE_UNEXPECTED_CTRL); + } + } } } diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp index c98e298ca75..00f6a9de474 100644 --- a/src/hotspot/share/opto/vectorization.hpp +++ b/src/hotspot/share/opto/vectorization.hpp @@ -324,6 +324,7 @@ class VLoopMemorySlices : public StackObj { class VLoopBody : public StackObj { private: static constexpr char const* FAILURE_NODE_NOT_ALLOWED = "encontered unhandled node"; + static constexpr char const* FAILURE_UNEXPECTED_CTRL = "data node in loop has no input in loop"; const VLoop& _vloop; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestNoInputInLoop.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestNoInputInLoop.java new file mode 100644 index 00000000000..8790e7afa0a --- /dev/null +++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestNoInputInLoop.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2024, 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. + * + * 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 compiler.loopopts.superword; + +/* + * @test id=Vanilla + * @bug 8327172 + * @summary Test bad loop ctrl: a node is in the loop, but has no input in the loop + * @run main/othervm compiler.loopopts.superword.TestNoInputInLoop + */ + +/* + * @test id=WithFlags + * @bug 8327172 + * @summary Test bad loop ctrl: a node is in the loop, but has no input in the loop + * @run main/othervm -Xbatch -XX:PerMethodTrapLimit=0 + * compiler.loopopts.superword.TestNoInputInLoop + */ + +/* + * @test id=WithMoreFlags + * @bug 8327172 + * @summary Test bad loop ctrl: a node is in the loop, but has no input in the loop + * @run main/othervm -Xbatch -XX:PerMethodTrapLimit=0 + * -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestNoInputInLoop::test* + * compiler.loopopts.superword.TestNoInputInLoop + */ + +public class TestNoInputInLoop { + static long lFld; + static float fFld; + static int iArr[] = new int[400]; + + public static void main(String[] strArr) { + for (int i = 0; i < 100; i++) { + test1(); + } + for (int i = 0; i < 1_000; i++) { + test2(0); + } + } + + // It specifically reproduced with UseAVX=2 + // 1. PhaseIdealLoop::build_loop_early + // We have a Store in a loop, with a Load after it. + // Both have ctrl as the CountedLoopNode. + // 2. split_if_with_blocks -> PhaseIdealLoop::try_move_store_before_loop + // The Store is moved out of the loop, and its ctrl updated accordingly. + // But the Load has its ctrl not updated, even though it has now no input in the loop. + // 3. SuperWord (VLoopBody::construct) + // We detect a data node in the loop that has no input in the loop. + // This is not expected. + + // OSR failure + static void test1() { + for (int i = 0; i < 200; i++) { + fFld *= iArr[0] - lFld; + iArr[1] = (int) lFld; + for (int j = 0; j < 100_000; j++) {} // empty loop, trigger OSR + } + } + + // Normal compilation + static void test2(int start) { + for (int i = start; i < 200; i++) { + fFld *= iArr[0] - lFld; + iArr[1] = (int) lFld; + } + } +}