From edf92721c2db4cfba091cf4901af603db8486951 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 4 Jun 2025 08:10:42 +0000 Subject: [PATCH] 8356977: UTF-8 cleanups Reviewed-by: naoto, prr --- src/java.base/share/classes/java/util/Locale.java | 4 ++-- src/java.base/share/classes/java/util/LocaleISOData.java | 2 +- .../share/classes/java/util/PropertyResourceBundle.java | 4 ++-- src/java.base/share/classes/sun/security/util/DomainName.java | 2 +- src/java.desktop/share/classes/javax/swing/Action.java | 2 +- test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java | 2 +- .../RemotePrinterStatusRefresh.java | 2 +- test/jdk/java/nio/file/Path/UriImportExport.java | 2 +- test/jdk/java/util/Currency/ValidateISO4217.java | 2 +- test/jdk/java/util/Locale/LocaleProvidersFormat.java | 2 +- .../jpackage/helpers/jdk/jpackage/test/FileAssociations.java | 2 +- .../langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java | 2 +- test/langtools/tools/javac/api/guide/Test.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java index a5ac0ae5bf7..9c745c1731b 100644 --- a/src/java.base/share/classes/java/util/Locale.java +++ b/src/java.base/share/classes/java/util/Locale.java @@ -385,10 +385,10 @@ import sun.util.locale.provider.TimeZoneNameUtility; * {@snippet lang = java: * var number = 1000; * NumberFormat.getCurrencyInstance(Locale.US).format(number); // returns "$1,000.00" - * NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "\u00A51,000"" + * NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "¥1,000"" * var date = LocalDate.of(2024, 1, 1); * DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.US).format(date); // returns "January 1, 2024" - * DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024\u5e741\u67081\u65e5" + * DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024年1月1日" * } * *

Locale Matching

diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java index 403e3f90bea..c2090d3be19 100644 --- a/src/java.base/share/classes/java/util/LocaleISOData.java +++ b/src/java.base/share/classes/java/util/LocaleISOData.java @@ -239,7 +239,7 @@ class LocaleISOData { + "AT" + "AUT" // Austria, Republic of + "AU" + "AUS" // Australia, Commonwealth of + "AW" + "ABW" // Aruba - + "AX" + "ALA" // \u00c5land Islands + + "AX" + "ALA" // Åland Islands + "AZ" + "AZE" // Azerbaijan, Republic of + "BA" + "BIH" // Bosnia and Herzegovina + "BB" + "BRB" // Barbados diff --git a/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java index d8cc1fac198..9b832a70577 100644 --- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java +++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java @@ -81,7 +81,7 @@ import sun.util.ResourceBundleEnumeration; * Keys are case-sensitive. * {@snippet lang=properties : * # MessageFormat pattern - * s1=Die Platte \"{1}\" enth\u00E4lt {0}. + * s1=Die Platte \"{1}\" enthält {0}. * # location of {0} in pattern * s2=1 * # sample disk name @@ -93,7 +93,7 @@ import sun.util.ResourceBundleEnumeration; * # third ChoiceFormat choice * s6={0,number} Dateien * # sample date - * s7=3. M\u00E4rz 1996 + * s7=3. März 1996 * } * * @apiNote diff --git a/src/java.base/share/classes/sun/security/util/DomainName.java b/src/java.base/share/classes/sun/security/util/DomainName.java index 53a646c8102..4f577f1114c 100644 --- a/src/java.base/share/classes/sun/security/util/DomainName.java +++ b/src/java.base/share/classes/sun/security/util/DomainName.java @@ -61,7 +61,7 @@ import sun.security.ssl.SSLLogger; * co.uk * k12.ak.us * com.tw - * \u7db2\u8def.tw + * 網路.tw * * Public suffixes effectively denote registration authorities. * diff --git a/src/java.desktop/share/classes/javax/swing/Action.java b/src/java.desktop/share/classes/javax/swing/Action.java index 3942d3309d4..b1b092e2104 100644 --- a/src/java.desktop/share/classes/javax/swing/Action.java +++ b/src/java.desktop/share/classes/javax/swing/Action.java @@ -263,7 +263,7 @@ public interface Action extends ActionListener { * commonly used to specify a mnemonic. For example: * myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A) * sets the mnemonic of myAction to 'a', while - * myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('\u0444')) + * myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('ф')) * sets the mnemonic of myAction to Cyrillic letter "Ef". * * @since 1.3 diff --git a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java index 6410fc4bad8..51fb3fedaba 100644 --- a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java +++ b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java @@ -87,7 +87,7 @@ public class EscapeKeyTyped { public void keyPressed(KeyEvent e) { printKey(e); int keychar = e.getKeyChar(); - if (keychar == 27) { // Escape character is 27 or \u0021 + if (keychar == 27) { // Escape character is 27 or \u001b escapeKeyTypedReceived = true; } } diff --git a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java index 7768c54481a..33fe9fc86d3 100644 --- a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java +++ b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java @@ -185,7 +185,7 @@ public class RemotePrinterStatusRefresh extends WindowAdapter { + "Step 3: Compare the list of printers in \"Before\" and " + "\"After\" lists.\n" + " Added printers are highlighted with " - + "green color, removed ones \u2014 with " + + "green color, removed ones with " + "red color.\n" + "Step 4: Click Pass if the list of printers is correctly " + "updated.\n" diff --git a/test/jdk/java/nio/file/Path/UriImportExport.java b/test/jdk/java/nio/file/Path/UriImportExport.java index 934098096b6..2ab93ee399e 100644 --- a/test/jdk/java/nio/file/Path/UriImportExport.java +++ b/test/jdk/java/nio/file/Path/UriImportExport.java @@ -128,7 +128,7 @@ public class UriImportExport { testUri("file:///foo/bar/doesnotexist"); testUri("file:/foo/bar/doesnotexist"); - // file:///foo/bar/\u0440\u0443\u0441\u0441\u043A\u0438\u0439 (Russian) + // file:///foo/bar/русский (Russian) testUri("file:///foo/bar/%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9"); // invalid diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java index 6996045fc3a..67793dcbecb 100644 --- a/test/jdk/java/util/Currency/ValidateISO4217.java +++ b/test/jdk/java/util/Currency/ValidateISO4217.java @@ -131,7 +131,7 @@ public class ValidateISO4217 { */ {"GS", "GBP", "826", "2"}, // South Georgia And The South Sandwich Islands /* Not defined in ISO 4217 list, but defined in .properties file. */ - {"AX", "EUR", "978", "2"}, // \u00c5LAND ISLANDS + {"AX", "EUR", "978", "2"}, // ÅLAND ISLANDS {"PS", "ILS", "376", "2"}, // Palestinian Territory, Occupied /* Not defined in ISO 4217 list, but added in ISO 3166 country code list */ {"JE", "GBP", "826", "2"}, // Jersey diff --git a/test/jdk/java/util/Locale/LocaleProvidersFormat.java b/test/jdk/java/util/Locale/LocaleProvidersFormat.java index 5d3f1fc2e2e..157e92ce8a3 100644 --- a/test/jdk/java/util/Locale/LocaleProvidersFormat.java +++ b/test/jdk/java/util/Locale/LocaleProvidersFormat.java @@ -85,7 +85,7 @@ public class LocaleProvidersFormat { /* * 8027289: Ensure if underlying system format locale is zh_CN, the Window's currency - * symbol under HOST provider is \u00A5, the yen (yuan) sign. + * symbol under HOST provider is ¥, the yen (yuan) sign. */ @Test @EnabledOnOs(WINDOWS) diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java index f8dc10c3dd0..ebdbb474006 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java @@ -135,7 +135,7 @@ public final class FileAssociations { // To test unicode arguments on Windows manually: // 1. add the following argument ("Hello" in Bulgarian) to the - // additionalArgs list: "\u0417\u0434\u0440\u0430\u0432\u0435\u0439\u0442\u0435" + // additionalArgs list: "Здравейте" // 2. in Control Panel -> Region -> Administrative -> Language for non-Unicode programs // change the system locale to "Bulgarian (Bulgaria)" // 3. reboot Windows and re-run the test diff --git a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java index e2f2d1f6f43..79a09b4f240 100644 --- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java +++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java @@ -33,7 +33,7 @@ package pkg; public class C { /** - * Here is a relative link in a field:\u0130 + * Here is a relative link in a field: * relative field link. */ public C field = null; diff --git a/test/langtools/tools/javac/api/guide/Test.java b/test/langtools/tools/javac/api/guide/Test.java index 64b2a304016..5bf881a590c 100644 --- a/test/langtools/tools/javac/api/guide/Test.java +++ b/test/langtools/tools/javac/api/guide/Test.java @@ -25,7 +25,7 @@ * @test * @bug 6427274 6347778 6469079 * @summary Various bugs fixed while writing Compiler API Guide - * @author Peter von der Ah\u0081 + * @author Peter von der Ahé * @library ../lib * @modules java.compiler * jdk.compiler