summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-04-06 09:17:54 +0000
committerMichael Koch <konqueror@gmx.de>2003-04-06 09:17:54 +0000
commit737b603e38127bba08d5e4cb8e1fef94d6025d27 (patch)
tree252f4ebfa8ed4ba5cb084d402ead3f6a0812c5d3
parenta1302a38379058664bab2ac0bfc8f60b7a5ba496 (diff)
downloadclasspath-737b603e38127bba08d5e4cb8e1fef94d6025d27.tar.gz
2003-04-06 Michael Koch <konqueror@gmx.de>
* java/sql/Date.java, java/sql/Time.java: Merged latest version from libgcj.
-rw-r--r--ChangeLog6
-rw-r--r--java/sql/Date.java10
-rw-r--r--java/sql/Time.java13
3 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 45dc79c0a..74bde8939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-06 Michael Koch <konqueror@gmx.de>
+
+ * java/sql/Date.java,
+ java/sql/Time.java:
+ Merged latest version from libgcj.
+
2003-04-05 C. Brian Jones <cbj@gnu.org>
* vm/reference/java/lang/VMClass.java (getInstance): removed
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);
}
}