[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: copyright year fixes and buffered input stream skip

[Kaffe CVS]

PatchSet 4500 
Date: 2004/03/10 16:42:12
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: copyright year fixes and buffered input stream skip fix

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

        Resynced with GNU Classpath

        2004-03-09  Guilhem Lavaux  <guilhem at kaffe.org>

        * java/io/BufferedInputStream.java (marktarget): New field for max
        mark limit.
        (CHUNKSIZE): New constant for incremental mark buffer allocation.
        (mark): Use new fields.
        (read): Likewise.
        (read(byte[],int,int)): Likewise.
        (skip): Likewise.
        (refill): Likewise.

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

        * java/text/AttributedString.java
        (addAttribute(AttributedCharacterIterator.Attribute,Object,int,int)):
        Use HashMap instead of Hashtable since value can be null, and
        you can not store a null value in a Hashtable.

        2004-03-08  Mark Wielaard  <mark at klomp.org>

        * java/beans/BeanDescriptor.java (BeanDescriptor):
        Set the FeatureDescriptor programmatic name.

Members: 
	ChangeLog:1.2080->1.2081 
	libraries/javalib/java/beans/BeanDescriptor.java:1.6->1.7 
	libraries/javalib/java/io/BufferedInputStream.java:1.13->1.14 
	libraries/javalib/java/text/AttributedString.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2080 kaffe/ChangeLog:1.2081
--- kaffe/ChangeLog:1.2080	Wed Mar 10 16:22:29 2004
+++ kaffe/ChangeLog	Wed Mar 10 16:42:12 2004
@@ -1,3 +1,30 @@
+2004-03-10  Dalibor Topic <robilad at kaffe.org>
+
+        Resynced with GNU Classpath
+
+	2004-03-09  Guilhem Lavaux  <guilhem at kaffe.org>
+
+        * java/io/BufferedInputStream.java (marktarget): New field for max
+        mark limit.
+        (CHUNKSIZE): New constant for incremental mark buffer allocation.
+        (mark): Use new fields.
+        (read): Likewise.
+        (read(byte[],int,int)): Likewise.
+        (skip): Likewise.
+        (refill): Likewise.
+
+	2004-03-08  Dalibor Topic  <robilad at kaffe.org>
+
+        * java/text/AttributedString.java
+        (addAttribute(AttributedCharacterIterator.Attribute,Object,int,int)):
+        Use HashMap instead of Hashtable since value can be null, and
+        you can not store a null value in a Hashtable.
+
+	2004-03-08  Mark Wielaard  <mark at klomp.org>
+
+        * java/beans/BeanDescriptor.java (BeanDescriptor):
+        Set the FeatureDescriptor programmatic name.
+
 2004-03-09  Dalibor Topic <robilad at kaffe.org>
 
 	* libraries/javalib/gnu/javax/rmi/CORBA/DelegateFactory.java
Index: kaffe/libraries/javalib/java/beans/BeanDescriptor.java
diff -u kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.6 kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.7
--- kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.6	Thu Jan 22 14:58:46 2004
+++ kaffe/libraries/javalib/java/beans/BeanDescriptor.java	Wed Mar 10 16:42:14 2004
@@ -1,5 +1,5 @@
 /* java.beans.BeanDescriptor
-   Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/BufferedInputStream.java
diff -u kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.13 kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.14
--- kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.13	Sat Mar  6 21:36:37 2004
+++ kaffe/libraries/javalib/java/io/BufferedInputStream.java	Wed Mar 10 16:42:15 2004
@@ -108,12 +108,12 @@
    * to allocate new chunks (specified by <code>CHUNKSIZE</code>) until the
    * the size specified by this field is achieved.
    */
-  protected int marktarget = 0;
+  private int marktarget = 0;
 
   /**
    * This is the number of bytes to allocate to reach marktarget.
    */
-  static final protected int CHUNKSIZE = 1024;
+  static final private int CHUNKSIZE = 1024;
 
   /**
    * This method initializes a new <code>BufferedInputStream</code> that will
@@ -231,7 +231,7 @@
     if (pos >= count && !refill())
       return -1;	// EOF
 
-    if (markpos >= 0 && pos - markpos > marklimit)
+    if (markpos >= 0 && pos - markpos > marktarget)
       markpos = -1;
 
     return ((int) buf[pos++]) & 0xFF;
@@ -270,7 +270,7 @@
     System.arraycopy(buf, pos, b, off, remain);
     pos += remain;
 
-    if (markpos >= 0 && pos - markpos > marklimit)
+    if (markpos >= 0 && pos - markpos > marktarget)
       markpos = -1;
 
     return remain;
@@ -324,7 +324,7 @@
 	pos += numread;
 	n -= numread;
 
-        if (markpos >= 0 && pos - markpos > marklimit)
+        if (markpos >= 0 && pos - markpos > marktarget)
           markpos = -1;
       }
 
Index: kaffe/libraries/javalib/java/text/AttributedString.java
diff -u kaffe/libraries/javalib/java/text/AttributedString.java:1.2 kaffe/libraries/javalib/java/text/AttributedString.java:1.3
--- kaffe/libraries/javalib/java/text/AttributedString.java:1.2	Thu Dec  4 15:07:16 2003
+++ kaffe/libraries/javalib/java/text/AttributedString.java	Wed Mar 10 16:42:15 2004
@@ -1,5 +1,5 @@
 /* AttributedString.java -- Models text with attributes
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.