2003-04-06 Michael Koch <konqueror@gmx.de>

	* java/sql/Date.java,
	java/sql/Time.java:
	Merged latest version from libgcj.

2 files changed, 15 insertions, 8 deletions

diff --git a/java/sql/Date.java b/java/sql/Date.java
index 59c8f1a3f..360376c25 100644
--- a/java/sql/Date.java
+++ b/java/sql/Date.java
@@ -86,9 +86,11 @@ public class Date extends java.util.Date
    * date in JDBC format into a Java date.
    *
    * @param str The string to parse.
-   * @return The resulting <code>java.sql.Date</code> value. 
+   * @return The resulting <code>java.sql.Date</code> value.
+   *
+   * @deprecated
    */
-  public static Date valueOf(String str)
+  public static Date valueOf (String str)
   {
     try
       {
@@ -105,9 +107,11 @@ public class Date extends java.util.Date
    * This method returns this date in JDBC format.
    *
    * @return This date as a string.
+   *
+   * @deprecated
    */
   public String toString()
   {
-    return(sdf.format(this));
+    return sdf.format(this);
   }
 }
diff --git a/java/sql/Time.java b/java/sql/Time.java
index 81f5d8cbf..7d515c25c 100644
--- a/java/sql/Time.java
+++ b/java/sql/Time.java
@@ -61,9 +61,11 @@ public class Time extends java.util.Date
    * date in JDBC format into a Java date.
    *
    * @param str The string to parse.
-   * @return The resulting <code>java.sql.Time</code> value. 
+   * @return The resulting <code>java.sql.Time</code> value.
+   *
+   * @deprecated
    */
-  public static Time valueOf(String str)
+  public static Time valueOf (String str)
   {
     try
       {
@@ -110,11 +112,12 @@ public class Time extends java.util.Date
    * This method returns this date in JDBC format.
    *
    * @return This date as a string.
+   *
+   * @deprecated
    */
-  public String
-  toString()
+  public String toString ()
   {
-    return sdf.format(this);
+    return sdf.format (this);
   }
 
 }