Merge upstream-jdk

corretto · Sep 15, 2023 · 9989557 · 9989557
2 parents 97e0a5f + 4070829
commit 9989557
Show file tree

Hide file tree

Showing 616 changed files with 34,158 additions and 30,680 deletions.
diff --git a/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -25,6 +25,7 @@
 
 package build.tools.compileproperties;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +34,9 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -220,8 +224,8 @@ private static boolean createFile(String propertiesPath, String outputPath,
             System.out.println("parsing: " + propertiesPath);
         }
         Properties p = new Properties();
-        try {
-            p.load(new FileInputStream(propertiesPath));
+        try (BufferedReader input = Files.newBufferedReader(Path.of(propertiesPath))) {
+            p.load(input);
         } catch ( FileNotFoundException e ) {
             ok = false;
             error("Cannot find file " + propertiesPath, e);
@@ -267,7 +271,7 @@ private static boolean createFile(String propertiesPath, String outputPath,
             Writer writer = null;
             try {
                 writer = new BufferedWriter(
-                        new OutputStreamWriter(new FileOutputStream(outputPath), "8859_1"));
+                        new OutputStreamWriter(new FileOutputStream(outputPath), StandardCharsets.US_ASCII));
                 MessageFormat format = new MessageFormat(FORMAT);
                 writer.write(format.format(new Object[] { packageString, className, superClass, data }));
             } catch ( IOException e ) {

diff --git a/make/langtools/tools/compileproperties/CompileProperties.java b/make/langtools/tools/compileproperties/CompileProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -25,6 +25,7 @@
 
 package compileproperties;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +34,9 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -199,8 +203,8 @@ private boolean createFile(String propertiesPath, String outputPath,
         boolean ok = true;
         log.verbose("parsing: " + propertiesPath);
         Properties p = new Properties();
-        try {
-            p.load(new FileInputStream(propertiesPath));
+        try (BufferedReader input = Files.newBufferedReader(Path.of(propertiesPath))) {
+            p.load(input);
         } catch ( FileNotFoundException e ) {
             ok = false;
             log.error("Cannot find file " + propertiesPath, e);
@@ -246,7 +250,7 @@ private boolean createFile(String propertiesPath, String outputPath,
             Writer writer = null;
             try {
                 writer = new BufferedWriter(
-                        new OutputStreamWriter(new FileOutputStream(outputPath), "8859_1"));
+                        new OutputStreamWriter(new FileOutputStream(outputPath), StandardCharsets.US_ASCII));
                 MessageFormat format = new MessageFormat(FORMAT);
                 writer.write(format.format(new Object[] { packageString, className, superClass, data }));
             } catch ( IOException e ) {

diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgef\u00FChrt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
+warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgeführt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
 
diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=\u3053\u308C\u306F\u30C7\u30E2\u7528\u306E\u5165\u529B\u30E1\u30BD\u30C3\u30C9\u3067\u3059\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3068\u3057\u3066\u5358\u4F53\u3067\u5B9F\u884C\u3059\u308B\n\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u5165\u529B\u30E1\u30BD\u30C3\u30C9\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306F\u3001\u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n\u306B\u3042\u308BREADME.html\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002
+warning=これはデモ用の入力メソッドです。アプリケーションとして単体で実行する\nことはできません。この入力メソッドの使用方法については、このディレクトリ\nにあるREADME.htmlをご覧ください。
 
diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=\u8FD9\u662F\u6F14\u793A\u8F93\u5165\u6CD5; \u4E0D\u80FD\u5C06\u5176\u76F4\u63A5\u4F5C\u4E3A\u5E94\u7528\u7A0B\u5E8F\u6765\u8FD0\u884C\u3002\n\u8BF7\u9605\u8BFB\u6B64\u76EE\u5F55\u4E2D\u7684 README.html \u6587\u4EF6\u4EE5\u4E86\u89E3\u5982\u4F55\u4F7F\u7528\n\u6B64\u8F93\u5165\u6CD5\u3002
+warning=这是演示输入法; 不能将其直接作为应用程序来运行。\n请阅读此目录中的 README.html 文件以了解如何使用\n此输入法。
 
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
@@ -45,7 +45,7 @@ ElementTreeFrameTitle=Elemente
 # exit ->  Notepad.exitAction
 
 fileLabel=Datei
-openLabel=\u00D6ffnen
+openLabel=Öffnen
 openImage=resources/open.gif
 newLabel=Neu
 newImage=resources/new.gif
@@ -65,9 +65,9 @@ cutLabel=Ausschneiden
 cutImage=resources/cut.gif
 copyLabel=Kopieren
 copyImage=resources/copy.gif
-pasteLabel=Einf\u00FCgen
+pasteLabel=Einfügen
 pasteImage=resources/paste.gif
-undoLabel=R\u00FCckg\u00E4ngig
+undoLabel=Rückgängig
 redoLabel=Wiederherstellen
 
 #
@@ -86,8 +86,8 @@ showElementTreeLabel=Elemente anzeigen
 # with the menu items.
 
 newTooltip=Neue Datei erstellen
-openTooltip=Datei \u00F6ffnen
+openTooltip=Datei öffnen
 saveTooltip=In Datei speichern
 cutTooltip=Auswahl in Zwischenablage verschieben
 copyTooltip=Auswahl in Zwischenablage kopieren
-pasteTooltip=Zwischenablage in Auswahl einf\u00FCgen
+pasteTooltip=Zwischenablage in Auswahl einfügen
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties b/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties
@@ -31,8 +31,8 @@
 #
 # Resource strings for Notepad example
 
-Title=\u30E1\u30E2\u5E33
-ElementTreeFrameTitle=\u8981\u7D20
+Title=メモ帳
+ElementTreeFrameTitle=要素
 
 # file Menu definition
 #
@@ -44,14 +44,14 @@ ElementTreeFrameTitle=\u8981\u7D20
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
 
-fileLabel=\u30D5\u30A1\u30A4\u30EB
-openLabel=\u958B\u304F
+fileLabel=ファイル
+openLabel=開く
 openImage=resources/open.gif
-newLabel=\u65B0\u898F
+newLabel=新規
 newImage=resources/new.gif
-saveLabel=\u4FDD\u5B58
+saveLabel=保存
 saveImage=resources/save.gif
-exitLabel=\u7D42\u4E86
+exitLabel=終了
 
 #
 # edit Menu definition
@@ -60,23 +60,23 @@ exitLabel=\u7D42\u4E86
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
 
-editLabel=\u7DE8\u96C6
-cutLabel=\u5207\u53D6\u308A
+editLabel=編集
+cutLabel=切取り
 cutImage=resources/cut.gif
-copyLabel=\u30B3\u30D4\u30FC
+copyLabel=コピー
 copyImage=resources/copy.gif
-pasteLabel=\u8CBC\u4ED8\u3051
+pasteLabel=貼付け
 pasteImage=resources/paste.gif
-undoLabel=\u5143\u306B\u623B\u3059
-redoLabel=\u518D\u5B9F\u884C
+undoLabel=元に戻す
+redoLabel=再実行
 
 #
 # debug Menu definition
 #
 
-debugLabel=\u30C7\u30D0\u30C3\u30B0
-dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
-showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
+debugLabel=デバッグ
+dumpLabel=モデルをSystem.errにダンプ
+showElementTreeLabel=要素の表示
 
 # toolbar definition
 #
@@ -85,9 +85,9 @@ showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
 # are of course sharable, and in this case are shared
 # with the menu items.
 
-newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B
-openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
-saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
-cutTooltip=\u9078\u629E\u3092\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u79FB\u52D5
-copyTooltip=\u9078\u629E\u3092\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u30B3\u30D4\u30FC
-pasteTooltip=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u3092\u9078\u629E\u306B\u8CBC\u4ED8\u3051
+newTooltip=ファイルを新規作成する
+openTooltip=ファイルを開く
+saveTooltip=ファイルに保存
+cutTooltip=選択をクリップボードに移動
+copyTooltip=選択をクリップボードにコピー
+pasteTooltip=クリップボードを選択に貼付け
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties b/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties
@@ -31,8 +31,8 @@
 #
 # Resource strings for Notepad example
 
-Title=\u8BB0\u4E8B\u672C
-ElementTreeFrameTitle=\u5143\u7D20
+Title=记事本
+ElementTreeFrameTitle=元素
 
 # file Menu definition
 #
@@ -44,14 +44,14 @@ ElementTreeFrameTitle=\u5143\u7D20
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
 
-fileLabel=\u6587\u4EF6
-openLabel=\u6253\u5F00
+fileLabel=文件
+openLabel=打开
 openImage=resources/open.gif
-newLabel=\u65B0\u5EFA
+newLabel=新建
 newImage=resources/new.gif
-saveLabel=\u4FDD\u5B58
+saveLabel=保存
 saveImage=resources/save.gif
-exitLabel=\u9000\u51FA
+exitLabel=退出
 
 #
 # edit Menu definition
@@ -60,23 +60,23 @@ exitLabel=\u9000\u51FA
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
 
-editLabel=\u7F16\u8F91
-cutLabel=\u526A\u5207
+editLabel=编辑
+cutLabel=剪切
 cutImage=resources/cut.gif
-copyLabel=\u590D\u5236
+copyLabel=复制
 copyImage=resources/copy.gif
-pasteLabel=\u7C98\u8D34
+pasteLabel=粘贴
 pasteImage=resources/paste.gif
-undoLabel=\u64A4\u6D88
-redoLabel=\u91CD\u505A
+undoLabel=撤消
+redoLabel=重做
 
 #
 # debug Menu definition
 #
 
-debugLabel=\u8C03\u8BD5
-dumpLabel=\u5C06\u6A21\u578B\u8F6C\u50A8\u5230 System.err
-showElementTreeLabel=\u663E\u793A\u5143\u7D20
+debugLabel=调试
+dumpLabel=将模型转储到 System.err
+showElementTreeLabel=显示元素
 
 # toolbar definition
 #
@@ -85,9 +85,9 @@ showElementTreeLabel=\u663E\u793A\u5143\u7D20
 # are of course sharable, and in this case are shared
 # with the menu items.
 
-newTooltip=\u521B\u5EFA\u65B0\u6587\u4EF6
-openTooltip=\u6253\u5F00\u6587\u4EF6
-saveTooltip=\u4FDD\u5B58\u6587\u4EF6
-cutTooltip=\u526A\u5207\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
-copyTooltip=\u590D\u5236\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
-pasteTooltip=\u7C98\u8D34\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
+newTooltip=创建新文件
+openTooltip=打开文件
+saveTooltip=保存文件
+cutTooltip=剪切选定内容到剪帖板中
+copyTooltip=复制选定内容到剪帖板中
+pasteTooltip=粘贴选定内容到剪帖板中
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
@@ -36,7 +36,7 @@ Title=Stylepad
 # Menu labels
 colorLabel=Farbe
 Red=Rot
-Green=Gr\u00FCn
+Green=Grün
 Blue=Blau
 
 boldLabel=Fett
@@ -75,11 +75,11 @@ underlineImage=resources/underline.gif
 underlineTooltip=Unterstrichen
 foregroundImage=resources/fg.gif
 leftImage=resources/left.gif
-leftTooltip=Linksb\u00FCndig
+leftTooltip=Linksbündig
 centerImage=resources/center.gif
 centerTooltip=Zentriert
 rightImage=resources/right.gif
-rightTooltip=Rechtsb\u00FCndig
+rightTooltip=Rechtsbündig
 bulletsImage=resources/bullets.gif
 
 # wonderland example images