Reformat JDBC classes and add new JDK 1.4 classes and methods.

	* java/sql/ParameterMetaData.java, java/sql/SQLPermission.java,
	java/sql/Savepoint.java: New files.
	* java/sql/Array.java, java/sql/BatchUpdateException.java,
	java/sql/Blob.java, java/sql/CallableStatement.java,
	java/sql/Clob.java, java/sql/Connection.java,
	java/sql/DataTruncation.java, java/sql/DatabaseMetaData.java,
	java/sql/Date.java, java/sql/Driver.java,
	java/sql/DriverManager.java,
	java/sql/DriverPropertyInfo.java, java/sql/PreparedStatement.java,
	java/sql/Ref.java, java/sql/ResultSet.java,
	java/sql/ResultSetMetaData.java, java/sql/SQLData.java
	java/sql/SQLException.java, java/sql/SQLInput.java,
	java/sql/SQLOutput.java, java/sql/SQLWarning.java
	java/sql/Statement.java, java/sql/Struct.java, java/sql/Time.java,
	java/sql/Timestamp.java, java/sql/Types.java: Updated to JDBC 3.0
	(JDK 1.4) specification.
	* javax/sql/ConnectionEvent.java,
	javax/sql/ConnectionEventListener.java,
	javax/sql/ConnectionPoolDataSource.java,
	javax/sql/DataSource.java, javax/sql/PooledConnection.java,
	javax/sql/RowSetEvent.java, javax/sql/RowSetInternal.java,
	javax/sql/RowSet.java, javax/sql/RowSetListener.java,
	javax/sql/RowSetMetaData.java, javax/sql/RowSetReader.java,
	javax/sql/RowSetWriter.java, javax/sql/XAConnection.java,
	javax/sql/XADataSource.java: New files.
	* Makefile.am: Add new files.
	* Makefile.in: Rebuilt.


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

1 files changed, 207 insertions, 253 deletions

diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java
index 742aeee46a3..c42ff3ca9e9 100644
--- a/libjava/java/sql/Timestamp.java
+++ b/libjava/java/sql/Timestamp.java
@@ -41,261 +41,215 @@ package java.sql;
 import java.text.SimpleDateFormat;
 
 /**
-  * This class is a wrapper around java.util.Date to allow the JDBC
-  * driver to identify the value as a SQL Timestamp.  Note that this
-  * class also adds an additional field for nano-seconds, and so 
-  * is not completely identical to <code>java.util.Date</code> as
-  * the <code>java.sql.Date</code> and <code>java.sql.Time</code>
-  * classes are.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This class is a wrapper around java.util.Date to allow the JDBC
+ * driver to identify the value as a SQL Timestamp.  Note that this
+ * class also adds an additional field for nano-seconds, and so 
+ * is not completely identical to <code>java.util.Date</code> as
+ * the <code>java.sql.Date</code> and <code>java.sql.Time</code>
+ * classes are.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public class Timestamp extends java.util.Date
 {
+  static final long serialVersionUID = 3581463369166924961L;
 
-/*
- * Class Variables
- */
-
-/**
-  * Used for parsing and formatting this date.
-  */
+  /**
+   * Used for parsing and formatting this date.
+   */
   // Millisecond will have to be close enough for now.
-private static SimpleDateFormat parse_sdf = 
-  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSS");
-
-private static SimpleDateFormat format_sdf =
-  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-/**
-  * This is the serialization UID for this class.
-  */
-private static final long serialVersionUID = 3581463369166924961L;
-
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
-  * @serial The nanosecond value for this object
-  */
-private int nanos;
-
-/*************************************************************************/
-
-/*
- * Class Methods
- */
-
-/**
-  * This method returns a new instance of this class by parsing a
-  * date in JDBC format into a Java date.
-  *
-  * @param str The string to parse.
-  *
-  * @return The resulting <code>java.sql.Timestamp</code> value. 
-  */
-public static Timestamp
-valueOf(String str)
-{
-  try
-    {
-      Date d = (Date)parse_sdf.parseObject(str);
-      return(new Timestamp(d.getTime()));
-    }
-  catch(Exception e)
-    {
-      return(null);
-    }
-}
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * This method initializes a new instance of this class with the
-  * specified year, month, and day.
-  *
-  * @param year The year for this Timestamp (year - 1900)
-  * @param month The month for this Timestamp (0-11)
-  * @param day The day for this Timestamp (1-31)
-  * @param hour The hour for this Timestamp (0-23)
-  * @param minute The minute for this Timestamp (0-59)
-  * @param second The second for this Timestamp (0-59)
-  * @param nanos The nanosecond value for this Timestamp (0 to 999,999,9999)
-  *
-  * @deprecated
-  */
-public 
-Timestamp(int year, int month, int day, int hour, int minute, int second,
-          int nanos)
-{
-  super(year, month, day, hour, minute, second);
-
-  this.nanos = nanos;
-}
-
-/*************************************************************************/
-
-/**
-  * This method initializes a new instance of this class with the
-  * specified time value representing the number of seconds since 
-  * Jan 1, 1970 at 12:00 midnight GMT.
-  *
-  * @param time The time value to intialize this <code>Time</code> to.
-  */
-public
-Timestamp(long date)
-{
-  super(date);
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-/**
-  * This method returns this date in JDBC format.
-  *
-  * @return This date as a string.
-  */
-public String
-toString()
-{
-  return(format_sdf.format(this) + "." + getNanos());
+  private static SimpleDateFormat parse_sdf = 
+    new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSS");
+
+  private static SimpleDateFormat format_sdf =
+    new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+  /**
+    * The nanosecond value for this object
+    */
+  private int nanos;
+
+  /**
+   * This method returns a new instance of this class by parsing a
+   * date in JDBC format into a Java date.
+   *
+   * @param str The string to parse.
+   * @return The resulting <code>java.sql.Timestamp</code> value. 
+   */
+  public static Timestamp valueOf(String str)
+  {
+    try
+      {
+	Date d = (Date) parse_sdf.parseObject(str);
+	return new Timestamp(d.getTime());
+      }
+    catch (Exception e)
+      {
+	return null;
+      }
+  }
+
+  /**
+   * This method initializes a new instance of this class with the
+   * specified year, month, and day.
+   *
+   * @param year The year for this Timestamp (year - 1900)
+   * @param month The month for this Timestamp (0-11)
+   * @param day The day for this Timestamp (1-31)
+   * @param hour The hour for this Timestamp (0-23)
+   * @param minute The minute for this Timestamp (0-59)
+   * @param second The second for this Timestamp (0-59)
+   * @param nanos The nanosecond value for this Timestamp (0 to 999,999,9999)
+   * @deprecated
+   */
+  public Timestamp(int year, int month, int day, int hour, int minute, 
+    int second, int nanos)
+  {
+    super(year, month, day, hour, minute, second);
+    this.nanos = nanos;
+  }
+
+  /**
+   * This method initializes a new instance of this class with the
+   * specified time value representing the number of seconds since 
+   * Jan 1, 1970 at 12:00 midnight GMT.
+   *
+   * @param time The time value to intialize this <code>Time</code> to.
+   */
+  public Timestamp(long date)
+  {
+    super(date);
+  }
+
+  /**
+   * This method returns this date in JDBC format.
+   *
+   * @return This date as a string.
+   */
+  public String toString()
+  {
+    return format_sdf.format(this) + "." + getNanos();
+  }
+
+  /**
+    * This method returns the nanosecond value for this object.
+    * @return The nanosecond value for this object.
+    */
+  public int getNanos()
+  {
+    return nanos;
+  }
+
+  /**
+   * This method sets the nanosecond value for this object.
+   *
+   * @param nanos The nanosecond value for this object.
+   */
+  public void setNanos(int nanos)
+  {
+    this.nanos = nanos;
+  }
+
+  /**
+   * This methods tests whether this object is earlier than the specified
+   * object.
+   *
+   * @param ts The other <code>Timestamp</code> to test against.
+   * @return <code>true</code> if this object is earlier than the other object,
+   *         <code>false</code> otherwise.
+   */
+  public boolean before(Timestamp ts)
+  {
+    if (ts.getTime() > getTime())
+      return true;
+
+    if (ts.getNanos() > getNanos())
+      return true;
+
+    return false;
+  }
+
+  /**
+   * This methods tests whether this object is later than the specified
+   * object.
+   *
+   * @param ts The other <code>Timestamp</code> to test against.
+   *
+   * @return <code>true</code> if this object is later than the other object,
+   * <code>false</code> otherwise.
+   */
+  public boolean after(Timestamp ts)
+  {
+    if (ts.getTime() < getTime())
+      return true;
+
+    if (ts.getNanos() < getNanos())
+      return true;
+
+    return false;
+  }
+
+  /**
+   * This method these the specified <code>Object</code> for equality
+   * against this object.  This will be true if an only if the specified
+   * object is an instance of <code>Timestamp</code> and has the same
+   * time value fields.
+   *
+   * @param obj The object to test against for equality.
+   *
+   * @return <code>true</code> if the specified object is equal to this
+   * object, <code>false</code> otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj == null)
+      return false;
+
+    if (!(obj instanceof Timestamp))
+      return false;
+
+    return equals((Timestamp) obj);
+  }
+
+  /**
+   * This method tests the specified timestamp for equality against this
+   * object.  This will be true if and only if the specified object is
+   * not <code>null</code> and contains all the same time value fields
+   * as this object.
+   *
+   * @param ts The <code>Timestamp</code> to test against for equality.
+   *
+   * @return <code>true</code> if the specified object is equal to this
+   * object, <code>false</code> otherwise.
+   */
+  public boolean equals(Timestamp ts)
+  {
+    if (ts == null)
+      return false;
+
+    if (ts.getTime() != getTime())
+      return false;
+
+    if (ts.getNanos() != getNanos())
+      return false;
+
+    return true;
+  }
+
+  /**
+   * @since 1.2
+   */
+   /*
+  public int compareTo(Timestamp ts)
+  {
+    
+  }*/
+  
+  /**
+   * @since 1.2
+   *//*
+  public int compareTo(Object obj)
+  {
+    return compareTo((Timestamp) obj);
+  }*/
 }
-
-/*************************************************************************/
-
-/**
-  * This method returns the nanosecond value for this object.
-  *
-  * @return The nanosecond value for this object.
-  */
-public int
-getNanos()
-{
-  return(nanos);
-}
-
-/*************************************************************************/
-
-/**
-  * This method sets the nanosecond value for this object.
-  *
-  * @param nanos The nanosecond value for this object.
-  */
-public void
-setNanos(int nanos)
-{
-  this.nanos = nanos;
-}
-
-/*************************************************************************/
-
-/**
-  * This methods tests whether this object is earlier than the specified
-  * object.
-  *
-  * @param ts The other <code>Timestamp</code> to test against.
-  *
-  * @return <code>true</code> if this object is earlier than the other object,
-  * <code>false</code> otherwise.
-  */
-public boolean
-before(Timestamp ts)
-{
-  if (ts.getTime() > getTime())
-    return(true);
-
-  if (ts.getNanos() > getNanos())
-    return(true);
-
-  return(false);
-}
-
-/*************************************************************************/
-
-/**
-  * This methods tests whether this object is later than the specified
-  * object.
-  *
-  * @param ts The other <code>Timestamp</code> to test against.
-  *
-  * @return <code>true</code> if this object is later than the other object,
-  * <code>false</code> otherwise.
-  */
-public boolean
-after(Timestamp ts)
-{
-  if (ts.getTime() < getTime())
-    return(true);
-
-  if (ts.getNanos() < getNanos())
-    return(true);
-
-  return(false);
-}
-
-/*************************************************************************/
-
-/**
-  * This method these the specified <code>Object</code> for equality
-  * against this object.  This will be true if an only if the specified
-  * object is an instance of <code>Timestamp</code> and has the same
-  * time value fields.
-  *
-  * @param obj The object to test against for equality.
-  *
-  * @return <code>true</code> if the specified object is equal to this
-  * object, <code>false</code> otherwise.
-  */
-public boolean
-equals(Object obj)
-{
-  if (obj == null)
-    return(false);
-
-  if (!(obj instanceof Timestamp))
-    return(false);
-
-  return(equals((Timestamp)obj));
-}
-
-/*************************************************************************/
-
-/**
-  * This method tests the specified timestamp for equality against this
-  * object.  This will be true if and only if the specified object is
-  * not <code>null</code> and contains all the same time value fields
-  * as this object.
-  *
-  * @param ts The <code>Timestamp</code> to test against for equality.
-  *
-  * @return <code>true</code> if the specified object is equal to this
-  * object, <code>false</code> otherwise.
-  */
-public boolean
-equals(Timestamp ts)
-{
-  if (ts == null)
-    return(false);
-
-  if (ts.getTime() != getTime())
-    return(false);
-
-  if (ts.getNanos() != getNanos())
-    return(false);
-
-  return(true);
-}
-
-} // class Timestamp
-