src/java.base/share/classes/java/io/FileReader.java

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 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
*** 23,85 ****
   * questions.
   */
  
  package java.io;
  
  
  /**
!  * Convenience class for reading character files.  The constructors of this
!  * class assume that the default character encoding and the default byte-buffer
!  * size are appropriate.  To specify these values yourself, construct an
!  * InputStreamReader on a FileInputStream.
!  *
!  * <p>{@code FileReader} is meant for reading streams of characters.
!  * For reading streams of raw bytes, consider using a
!  * {@code FileInputStream}.
   *
   * @see InputStreamReader
   * @see FileInputStream
   *
   * @author      Mark Reinhold
   * @since       1.1
   */
  public class FileReader extends InputStreamReader {
  
     /**
!     * Creates a new {@code FileReader}, given the name of the
!     * file to read from.
      *
!     * @param fileName the name of the file to read from
      * @exception  FileNotFoundException  if the named file does not exist,
      *                   is a directory rather than a regular file,
      *                   or for some other reason cannot be opened for
      *                   reading.
      */
      public FileReader(String fileName) throws FileNotFoundException {
          super(new FileInputStream(fileName));
      }
  
     /**
!     * Creates a new {@code FileReader}, given the {@code File}
!     * to read from.
      *
!     * @param file the {@code File} to read from
      * @exception  FileNotFoundException  if the file does not exist,
      *                   is a directory rather than a regular file,
      *                   or for some other reason cannot be opened for
      *                   reading.
      */
      public FileReader(File file) throws FileNotFoundException {
          super(new FileInputStream(file));
      }
  
     /**
!     * Creates a new {@code FileReader}, given the
!     * {@code FileDescriptor} to read from.
      *
!     * @param fd the FileDescriptor to read from
      */
      public FileReader(FileDescriptor fd) {
          super(new FileInputStream(fd));
      }
  
  }
--- 23,122 ----
   * questions.
   */
  
  package java.io;
  
+ import java.nio.charset.Charset;
  
  /**
!  * Reads text from character files using a default buffer size. Decoding from bytes
!  * to characters uses either a specified {@linkplain java.nio.charset.Charset charset}
!  * or the platform's
!  * {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
!  *
!  * <p>
!  * The {@code FileReader} is meant for reading streams of characters. For reading
!  * streams of raw bytes, consider using a {@code FileInputStream}.
   *
   * @see InputStreamReader
   * @see FileInputStream
   *
   * @author      Mark Reinhold
   * @since       1.1
   */
  public class FileReader extends InputStreamReader {
  
     /**
!     * Creates a new {@code FileReader}, given the name of the file to read,
!     * using the platform's
!     * {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
      *
!     * @param fileName the name of the file to read
      * @exception  FileNotFoundException  if the named file does not exist,
      *                   is a directory rather than a regular file,
      *                   or for some other reason cannot be opened for
      *                   reading.
      */
      public FileReader(String fileName) throws FileNotFoundException {
          super(new FileInputStream(fileName));
      }
  
     /**
!     * Creates a new {@code FileReader}, given the {@code File} to read,
!     * using the platform's
!     * {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
      *
!     * @param file the {@code File} to read
      * @exception  FileNotFoundException  if the file does not exist,
      *                   is a directory rather than a regular file,
      *                   or for some other reason cannot be opened for
      *                   reading.
      */
      public FileReader(File file) throws FileNotFoundException {
          super(new FileInputStream(file));
      }
  
     /**
!     * Creates a new {@code FileReader}, given the {@code FileDescriptor} to read,
!     * using the platform's
!     * {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
      *
!     * @param fd the {@code FileDescriptor} to read
      */
      public FileReader(FileDescriptor fd) {
          super(new FileInputStream(fd));
      }
  
+    /**
+     * Creates a new {@code FileReader}, given the name of the file to read
+     * and the {@linkplain java.nio.charset.Charset charset}.
+     *
+     * @param fileName the name of the file to read
+     * @param charset the {@linkplain java.nio.charset.Charset charset}
+     * @exception  IOException  if the named file does not exist,
+     *                   is a directory rather than a regular file,
+     *                   or for some other reason cannot be opened for
+     *                   reading.
+     *
+     * @since 11
+     */
+     public FileReader(String fileName, Charset charset) throws IOException {
+         super(new FileInputStream(fileName), charset);
+     }
+ 
+    /**
+     * Creates a new {@code FileReader}, given the {@code File} to read and
+     * the {@linkplain java.nio.charset.Charset charset}.
+     *
+     * @param file the {@code File} to read
+     * @param charset the {@linkplain java.nio.charset.Charset charset}
+     * @exception  IOException  if the file does not exist,
+     *                   is a directory rather than a regular file,
+     *                   or for some other reason cannot be opened for
+     *                   reading.
+     *
+     * @since 11
+     */
+     public FileReader(File file, Charset charset) throws IOException {
+         super(new FileInputStream(file), charset);
+     }
  }