1 files changed, 212 insertions, 297 deletions
diff --git a/libjava/java/sql/SQLOutput.java b/libjava/java/sql/SQLOutput.java
index d2dc71d..730e0c0 100644
--- a/libjava/java/sql/SQLOutput.java
+++ b/libjava/java/sql/SQLOutput.java
@@ -1,5 +1,5 @@
 /* SQLOutput.java -- Write SQL values to a stream
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,302 +41,217 @@ package java.sql;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 
 /**
-  * This interface provides methods for writing Java types to a SQL stream.
-  * It is used for implemented custom type mappings for user defined data
-  * types.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-public interface SQLOutput
+ * This interface provides methods for writing Java types to a SQL stream.
+ * It is used for implemented custom type mappings for user defined data
+ * types.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
+public interface SQLOutput 
 {
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>String</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeString(String value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>boolean</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeBoolean(boolean value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>byte</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeByte(byte value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>short</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeShort(short value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>int</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeInt(int value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>long</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeLong(long value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>float</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeFloat(float value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>double</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeDouble(double value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>BigDecimal</code>
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeBigDecimal(BigDecimal value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>byte</code> array
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeBytes(byte[] value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>java.sql.Date</code> 
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeDate(java.sql.Date value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>java.sql.Time</code> 
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeTime(java.sql.Time value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>java.sql.Timestamp</code> 
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeTimestamp(java.sql.Timestamp value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java character stream
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeCharacterStream(Reader value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified uninterpreted binary byte stream
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  * 
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeBinaryStream(InputStream value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified ASCII text stream
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  * 
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeAsciiStream(InputStream value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java <code>SQLData</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeObject(SQLData value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java SQL <code>Ref</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeRef(Ref value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java SQL <code>Blob</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeBlob(Blob value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java SQL <code>Clob</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeClob(Clob value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java SQL <code>Struct</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeStruct(Struct value) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method writes the specified Java SQL <code>Array</code> object
-  * to the SQL stream.
-  *
-  * @param value The value to write to the stream.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-writeArray(Array value) throws SQLException;
-
-} // interface SQLOutput
-
+  /**
+   * This method writes the specified Java <code>String</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeString(String x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>boolean</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeBoolean(boolean x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>byte</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeByte(byte x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>short</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeShort(short x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>int</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeInt(int x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>long</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeLong(long x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>float</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeFloat(float x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>double</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeDouble(double x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>BigDecimal</code>
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeBigDecimal(BigDecimal x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>byte</code> array
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeBytes(byte[] x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>java.sql.Date</code> 
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeDate(Date x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>java.sql.Time</code> 
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeTime(Time x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>java.sql.Timestamp</code> 
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeTimestamp(Timestamp x) throws SQLException;
+
+  /**
+   * This method writes the specified Java character stream
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeCharacterStream(Reader x) throws SQLException;
+
+  /**
+   * This method writes the specified ASCII text stream
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeAsciiStream(InputStream x) throws SQLException;
+
+  /**
+   * This method writes the specified uninterpreted binary byte stream
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeBinaryStream(InputStream x) throws SQLException;
+
+  /**
+   * This method writes the specified Java <code>SQLData</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeObject(SQLData x) throws SQLException;
+
+  /**
+   * This method writes the specified Java SQL <code>Ref</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeRef(Ref x) throws SQLException;
+
+  /**
+   * This method writes the specified Java SQL <code>Blob</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeBlob(Blob x) throws SQLException;
+
+  /**
+   * This method writes the specified Java SQL <code>Clob</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeClob(Clob x) throws SQLException;
+
+  /**
+   * This method writes the specified Java SQL <code>Struct</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeStruct(Struct x) throws SQLException;
+
+  /**
+   * This method writes the specified Java SQL <code>Array</code> object
+   * to the SQL stream.
+   *
+   * @param value The value to write to the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void writeArray(Array x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void writeURL(URL x) throws SQLException;
+}