2003-03-18 Michael Koch <konqueror@gmx.de>

	* java/io/BufferedOutputStream.java,
	java/io/DataInput.java,
	java/io/DataInputStream.java,
	java/io/DataOutput.java,
	java/io/Externalizable.java:
	More merges from classpath.


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

1 files changed, 160 insertions, 171 deletions

diff --git a/libjava/java/io/DataOutput.java b/libjava/java/io/DataOutput.java
index 2538c32efc1..4721f526ac7 100644
--- a/libjava/java/io/DataOutput.java
+++ b/libjava/java/io/DataOutput.java
@@ -53,176 +53,165 @@ package java.io;
 public interface DataOutput
 {
 
-/**
-  * This method writes a Java boolean value to an output stream
-  *
-  * @param value The boolean value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeBoolean(boolean value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java byte value to an output stream
-  *
-  * @param value The int value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeByte(int value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java char value to an output stream
-  *
-  * @param value The char value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeChar(int value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java int value to an output stream as a 16 bit value
-  *
-  * @param value The int value to write as a 16-bit value
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeShort(int value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java int value to an output stream
-  *
-  * @param value The int value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeInt(int value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java long value to an output stream
-  *
-  * @param value The long value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeLong(long value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java float value to an output stream
-  *
-  * @param value The float value to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeFloat(float value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a Java double value to an output stream
-  *
-  * @param value The double value to write
-  *
-  * @exception IOException If any other error occurs
-  */
-void
-writeDouble(double value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a String to an output stream as an array of bytes
-  *
-  * @param value The String to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeBytes(String value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a String to an output stream as an array of char's
-  *
-  * @param value The String to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeChars(String value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes a String to an output stream encoded in
-  * UTF-8 format.
-  *
-  * @param value The String to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-writeUTF(String value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes an 8-bit value (passed into the method as a Java
-  * int) to an output stream.
-  *
-  * @param value The byte to write to the output stream
-  *
-  * @exception IOException If an error occurs
-  */
-void
-write(int value) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the raw byte array passed in to the output stream.
-  *
-  * @param buf The byte array to write
-  *
-  * @exception IOException If an error occurs
-  */
-void
-write(byte[] buf) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method writes raw bytes from the passed array <code>buf</code> starting
-  * <code>offset</code> bytes into the buffer.  The number of bytes written will be
-  * exactly <code>len</code>. 
-  *
-  * @param buf The buffer from which to write the data
-  * @param offset The offset into the buffer to start writing data from
-  * @param len The number of bytes to write from the buffer to the output stream
-  *
-  * @exception IOException If any other error occurs
-  */
-void
-write(byte[] buf, int offset, int len) throws IOException;
+  /**
+    * This method writes a Java boolean value to an output stream
+    *
+    * @param value The boolean value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeBoolean(boolean value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java byte value to an output stream
+    *
+    * @param value The int value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeByte(int value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java char value to an output stream
+    *
+    * @param value The char value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeChar(int value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java int value to an output stream as a 16 bit value
+    *
+    * @param value The int value to write as a 16-bit value
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeShort(int value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java int value to an output stream
+    *
+    * @param value The int value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeInt(int value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java long value to an output stream
+    *
+    * @param value The long value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeLong(long value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java float value to an output stream
+    *
+    * @param value The float value to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeFloat(float value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a Java double value to an output stream
+    *
+    * @param value The double value to write
+    *
+    * @exception IOException If any other error occurs
+    */
+  void writeDouble(double value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a String to an output stream as an array of bytes
+    *
+    * @param value The String to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeBytes(String value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a String to an output stream as an array of char's
+    *
+    * @param value The String to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeChars(String value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes a String to an output stream encoded in
+    * UTF-8 format.
+    *
+    * @param value The String to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void writeUTF(String value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes an 8-bit value (passed into the method as a Java
+    * int) to an output stream.
+    *
+    * @param value The byte to write to the output stream
+    *
+    * @exception IOException If an error occurs
+    */
+  void write(int value) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes the raw byte array passed in to the output stream.
+    *
+    * @param buf The byte array to write
+    *
+    * @exception IOException If an error occurs
+    */
+  void write(byte[] buf) throws IOException;
+
+  /*************************************************************************/
+
+  /**
+    * This method writes raw bytes from the passed array <code>buf</code> 
+    * starting
+    * <code>offset</code> bytes into the buffer.  The number of bytes 
+    * written will be * exactly <code>len</code>. 
+    *
+    * @param buf The buffer from which to write the data
+    * @param offset The offset into the buffer to start writing data from
+    * @param len The number of bytes to write from the buffer to the output 
+    * stream
+    *
+    * @exception IOException If any other error occurs
+    */
+  void write(byte[] buf, int offset, int len) throws IOException;
 
 } // interface DataOutput
+