More libgcj merging

[Mark Wielaard]

Hi,

The following classes were also easy to merge.
It were mostly comment merges.

FilterOutputStream has a small spec fix.

FilterReader and FilterWriter now explicitly set the lock object as the
libgcj version did. It seems reasonable but I could not find this specified
in the online spec and my Java Class Libraries book also doesn't mention it.
They do it slightly different. FilterReader takes the lock object of the
given Reader, FilterWriter takes the given Writer itself as lock.
Does anybody have an opinion what or why we should lock on which object?

Some of the java.net classes have already been partly merged but this work
has never been completed. I have only (re)merged the classes that were almost
identical.

Here is the ChangeLog entry:

2001-09-30  Mark Wielaard  <address@hidden>

        * java/io/FileWriter.java: Merged with libgcj.
        * java/io/FilterInputStream.java: Ditto.
        * java/io/FilterOutputStream.java: Ditto.
        (write (byte[],int,int): Explicitly call write(int) on every byte.
        * java/io/FilterReader.java: Ditto.
        (FilterReader): call super(in.lock).
        * java/io/FilterWriter.java: Merged with libgcj.
        (FilterWriter): call super(in).
        * java/io/Writer.java: Merged with libgcj.
        * java/lang/Compiler.java: Ditto.
        * java/lang/Process.java: Ditto.
        * java/lang/Void.java: Ditto.
        * java/net/ContentHandler.java: Ditto.
        * java/net/DatagramPacket.java: Ditto.
        * java/net/MulticastSocket.java: Merged (almost) with libgcj.
        Note that the contructor super() calls are still different

I have committed this to the Classpath CVS.

Cheers,

Mark
-- 
Stuff to read:
    <http://www.toad.com/gnu/whatswrong.html>
  What's Wrong with Copy Protection, by John Gilmore