* java/io/BufferedReader.java: Re-merged with Classpath.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45307 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8fe5f92..8ee275a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-30  Tom Tromey  <tromey@redhat.com>
+
+       * java/io/BufferedReader.java: Re-merged with Classpath.
+
 2001-08-28  Per Bothner  <per@bothner.com>
 
        * java/math/BigInteger.java (init(int,Random)):  New method.

diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java
index 6c54f03..9db2e5c 100644 (file)
--- a/libjava/java/io/BufferedReader.java
+++ b/libjava/java/io/BufferedReader.java
@@ -1,11 +1,30 @@
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* BufferedReader.java
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
  
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
+
 package java.io;
 
 /* Written using "Java Class Libraries", 2nd edition, plus online
@@ -53,6 +72,8 @@ public class BufferedReader extends Reader
      guaranteed to be >= the read-limit requested in the call to mark. */
   int markPos = -1;
 
+  static final int DEFAULT_BUFFER_SIZE = 8192;
+
   /**
     * Create a new <code>BufferedReader</code> that will read from the 
     * specified subordinate stream with a default buffer size of 4096 chars.
@@ -61,7 +82,7 @@ public class BufferedReader extends Reader
     */
   public BufferedReader(Reader in)
   {
-    this(in, 8192);
+    this(in, DEFAULT_BUFFER_SIZE);
   }
 
   /**