[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4267 
Date: 2004/01/03 02:54:38
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-03  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2003-12-28  Guilhem Lavaux <guilhem at kaffe.org>

        * java/io/LineNumberReader.java
        (countLines): Removed.
        (fill): New private method.
        (mark): Changed logic to use savedLineNumber and matchedNewLine.
        (reset): Likewise.
        (read): Likewise.
        (skipRedundantLF): Likewise.

Members: 
	ChangeLog:1.1854->1.1855 
	libraries/javalib/java/io/LineNumberReader.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1854 kaffe/ChangeLog:1.1855
--- kaffe/ChangeLog:1.1854	Sat Jan  3 02:32:49 2004
+++ kaffe/ChangeLog	Sat Jan  3 02:54:38 2004
@@ -2,6 +2,20 @@
 
 	Resynced with GNU Classpath.
 
+	2003-12-28  Guilhem Lavaux <guilhem at kaffe.org>
+
+        * java/io/LineNumberReader.java
+        (countLines): Removed.
+        (fill): New private method.
+        (mark): Changed logic to use savedLineNumber and matchedNewLine.
+        (reset): Likewise.
+        (read): Likewise.
+        (skipRedundantLF): Likewise.
+
+2004-01-03  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2003-12-26  Michael Koch  <konqueror at gmx.de>
 
         * java/beans/BeanDescriptor.java,
Index: kaffe/libraries/javalib/java/io/LineNumberReader.java
diff -u kaffe/libraries/javalib/java/io/LineNumberReader.java:1.5 kaffe/libraries/javalib/java/io/LineNumberReader.java:1.6
--- kaffe/libraries/javalib/java/io/LineNumberReader.java:1.5	Sun Nov  2 13:29:37 2003
+++ kaffe/libraries/javalib/java/io/LineNumberReader.java	Sat Jan  3 02:54:40 2004
@@ -54,7 +54,8 @@
  *
  * @author Per Bothner <bothner at cygnus.com>
  * @author Aaron M. Renn (arenn at urbanophile.com)
- * @date April 22, 1998.  
+ * @author Guilhem Lavaux <guilhem at kaffe.org>
+ * @date December 28, 2003.
  */
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 beta from http://www.javasoft.com.
@@ -147,7 +148,7 @@
   {
     if (readLimit < 0)
       throw new IllegalArgumentException("Read-ahead limit is negative");
-	      
+
     synchronized (lock)
       {
 	// This is basically the same as BufferedReader.mark.
@@ -401,7 +402,7 @@
 
     int skipped;
     char[] buf = new char[1];
-    
+
     for (skipped = 0; skipped < count; skipped++)
       {
         int ch = read(buf, 0, 1);