JDK-18+14: Merge branch 'master' into fibers

Author: pron

make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -27,7 +27,6 @@
 
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.ZoneId;
@@ -79,8 +78,7 @@ private static void readLSRfile(String filename) throws Exception {
         String preferred = null;
         String prefix = null;
 
-        for (String line : Files.readAllLines(Paths.get(filename),
-                                              Charset.forName("UTF-8"))) {
+        for (String line : Files.readAllLines(Paths.get(filename))) {
             line = line.toLowerCase(Locale.ROOT);
             int index = line.indexOf(' ') + 1;
             if (line.startsWith("file-date:")) {

src/demo/share/jfc/Font2DTest/Font2DTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,6 +72,8 @@
 import javax.swing.*;
 import javax.swing.event.*;
 
+import static java.nio.charset.StandardCharsets.UTF_16;
+
 /**
  * Font2DTest.java
  *
@@ -589,7 +591,7 @@ private void readTextFile( String fileName ) {
             if (numBytes >= 2 &&
                 (( byteData[0] == (byte) 0xFF && byteData[1] == (byte) 0xFE ) ||
                  ( byteData[0] == (byte) 0xFE && byteData[1] == (byte) 0xFF )))
-              fileText = new String( byteData, "UTF-16" );
+              fileText = new String(byteData, UTF_16);
             /// Otherwise, use system default encoding
             else
               fileText = new String( byteData );
@@ -647,7 +649,7 @@ private void writeCurrentOptions( String fileName ) {
                 showFontInfoCBMI.getState() + "\n" +
                 rm.getSelectedItem() + "\n" +
                 range[0] + "\n" + range[1] + "\n" + curOptions + tFileName);
-            byte[] toBeWritten = completeOptions.getBytes( "UTF-16" );
+            byte[] toBeWritten = completeOptions.getBytes(UTF_16);
             bos.write( toBeWritten, 0, toBeWritten.length );
             bos.close();
         }
@@ -712,7 +714,7 @@ private void loadOptions( String fileName ) {
                 (byteData[0] != (byte) 0xFE || byteData[1] != (byte) 0xFF) )
               throw new Exception( "Not a Font2DTest options file" );
 
-            String options = new String( byteData, "UTF-16" );
+            String options = new String(byteData, UTF_16);
             StringTokenizer perLine = new StringTokenizer( options, "\n" );
             String title = perLine.nextToken();
             if ( !title.equals( "Font2DTest Option File" ))