Skip to content

Commit edf9272

Browse files
committed
8356977: UTF-8 cleanups
Reviewed-by: naoto, prr
1 parent b5cfd76 commit edf9272

File tree

13 files changed

+15
-15
lines changed

13 files changed

+15
-15
lines changed

src/java.base/share/classes/java/util/Locale.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,10 @@
385385
* {@snippet lang = java:
386386
* var number = 1000;
387387
* NumberFormat.getCurrencyInstance(Locale.US).format(number); // returns "$1,000.00"
388-
* NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "\u00A51,000""
388+
* NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "¥1,000""
389389
* var date = LocalDate.of(2024, 1, 1);
390390
* DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.US).format(date); // returns "January 1, 2024"
391-
* DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024\u5e741\u67081\u65e5"
391+
* DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024年1月1日"
392392
* }
393393
*
394394
* <h2><a id="LocaleMatching">Locale Matching</a></h2>

src/java.base/share/classes/java/util/LocaleISOData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class LocaleISOData {
239239
+ "AT" + "AUT" // Austria, Republic of
240240
+ "AU" + "AUS" // Australia, Commonwealth of
241241
+ "AW" + "ABW" // Aruba
242-
+ "AX" + "ALA" // \u00c5land Islands
242+
+ "AX" + "ALA" // Åland Islands
243243
+ "AZ" + "AZE" // Azerbaijan, Republic of
244244
+ "BA" + "BIH" // Bosnia and Herzegovina
245245
+ "BB" + "BRB" // Barbados

src/java.base/share/classes/java/util/PropertyResourceBundle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
* Keys are case-sensitive.
8282
* {@snippet lang=properties :
8383
* # MessageFormat pattern
84-
* s1=Die Platte \"{1}\" enth\u00E4lt {0}.
84+
* s1=Die Platte \"{1}\" enthält {0}.
8585
* # location of {0} in pattern
8686
* s2=1
8787
* # sample disk name
@@ -93,7 +93,7 @@
9393
* # third ChoiceFormat choice
9494
* s6={0,number} Dateien
9595
* # sample date
96-
* s7=3. M\u00E4rz 1996
96+
* s7=3. März 1996
9797
* }
9898
*
9999
* @apiNote

src/java.base/share/classes/sun/security/util/DomainName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
* co.uk
6262
* k12.ak.us
6363
* com.tw
64-
* \u7db2\u8def.tw
64+
* 網路.tw
6565
*
6666
* Public suffixes effectively denote registration authorities.
6767
*

src/java.desktop/share/classes/javax/swing/Action.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public interface Action extends ActionListener {
263263
* commonly used to specify a mnemonic. For example:
264264
* <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A)</code>
265265
* sets the mnemonic of <code>myAction</code> to 'a', while
266-
* <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('\u0444'))</code>
266+
* <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('ф'))</code>
267267
* sets the mnemonic of <code>myAction</code> to Cyrillic letter "Ef".
268268
*
269269
* @since 1.3

test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void keyTyped(KeyEvent e) {
8787
public void keyPressed(KeyEvent e) {
8888
printKey(e);
8989
int keychar = e.getKeyChar();
90-
if (keychar == 27) { // Escape character is 27 or \u0021
90+
if (keychar == 27) { // Escape character is 27 or \u001b
9191
escapeKeyTypedReceived = true;
9292
}
9393
}

test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public Component getListCellRendererComponent(JList<?> list,
185185
+ "Step 3: Compare the list of printers in \"Before\" and "
186186
+ "\"After\" lists.\n"
187187
+ " Added printers are highlighted with "
188-
+ "green color, removed ones \u2014 with "
188+
+ "green color, removed ones with "
189189
+ "red color.\n"
190190
+ "Step 4: Click Pass if the list of printers is correctly "
191191
+ "updated.\n"

test/jdk/java/nio/file/Path/UriImportExport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static void main(String[] args) throws Exception {
128128
testUri("file:///foo/bar/doesnotexist");
129129
testUri("file:/foo/bar/doesnotexist");
130130

131-
// file:///foo/bar/\u0440\u0443\u0441\u0441\u043A\u0438\u0439 (Russian)
131+
// file:///foo/bar/русский (Russian)
132132
testUri("file:///foo/bar/%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9");
133133

134134
// invalid

test/jdk/java/util/Currency/ValidateISO4217.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public class ValidateISO4217 {
131131
*/
132132
{"GS", "GBP", "826", "2"}, // South Georgia And The South Sandwich Islands
133133
/* Not defined in ISO 4217 list, but defined in .properties file. */
134-
{"AX", "EUR", "978", "2"}, // \u00c5LAND ISLANDS
134+
{"AX", "EUR", "978", "2"}, // ÅLAND ISLANDS
135135
{"PS", "ILS", "376", "2"}, // Palestinian Territory, Occupied
136136
/* Not defined in ISO 4217 list, but added in ISO 3166 country code list */
137137
{"JE", "GBP", "826", "2"}, // Jersey

test/jdk/java/util/Locale/LocaleProvidersFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void windowsJapaneseDateFields() throws Throwable {
8585

8686
/*
8787
* 8027289: Ensure if underlying system format locale is zh_CN, the Window's currency
88-
* symbol under HOST provider is \u00A5, the yen (yuan) sign.
88+
* symbol under HOST provider is ¥, the yen (yuan) sign.
8989
*/
9090
@Test
9191
@EnabledOnOs(WINDOWS)

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ List<String> openFiles(List<Path> testFiles) throws IOException {
135135

136136
// To test unicode arguments on Windows manually:
137137
// 1. add the following argument ("Hello" in Bulgarian) to the
138-
// additionalArgs list: "\u0417\u0434\u0440\u0430\u0432\u0435\u0439\u0442\u0435"
138+
// additionalArgs list: "Здравейте"
139139
// 2. in Control Panel -> Region -> Administrative -> Language for non-Unicode programs
140140
// change the system locale to "Bulgarian (Bulgaria)"
141141
// 3. reboot Windows and re-run the test

test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class C {
3434

3535
/**
36-
* Here is a relative link in a field:\u0130
36+
* Here is a relative link in a field:
3737
* <a href="relative-field-link.html">relative field link</a>.
3838
*/
3939
public C field = null;

test/langtools/tools/javac/api/guide/Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @bug 6427274 6347778 6469079
2727
* @summary Various bugs fixed while writing Compiler API Guide
28-
* @author Peter von der Ah\u0081
28+
* @author Peter von der Ahé
2929
* @library ../lib
3030
* @modules java.compiler
3131
* jdk.compiler

0 commit comments

Comments
 (0)