summaryrefslogtreecommitdiff
path: root/java/sql
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-09-10 15:31:29 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-09-10 15:31:29 +0000
commitd5a985a529854e100f7c37d30c35a12916b97717 (patch)
tree41e28377abd8d12d36dc11e4592fdb25ce8506f7 /java/sql
parent988ea14cc6a504c6d5c7b9bfcbc01ca2b0a4e432 (diff)
downloadclasspath-d5a985a529854e100f7c37d30c35a12916b97717.tar.gz
2005-09-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of generics-branch for 2005/08/14 - 2005/09/07.
Diffstat (limited to 'java/sql')
-rw-r--r--java/sql/Date.java6
-rw-r--r--java/sql/Time.java6
2 files changed, 2 insertions, 10 deletions
diff --git a/java/sql/Date.java b/java/sql/Date.java
index 48a274f33..d429cc826 100644
--- a/java/sql/Date.java
+++ b/java/sql/Date.java
@@ -1,5 +1,5 @@
/* Date.java -- Wrapper around java.util.Date
- Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -154,8 +154,6 @@ public class Date extends java.util.Date
*
* @param str The string to parse.
* @return The resulting <code>java.sql.Date</code> value.
- *
- * @deprecated
*/
public static Date valueOf (String str)
{
@@ -178,8 +176,6 @@ 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()
{
diff --git a/java/sql/Time.java b/java/sql/Time.java
index eb6ef2d65..57551528b 100644
--- a/java/sql/Time.java
+++ b/java/sql/Time.java
@@ -1,5 +1,5 @@
/* Time.java -- Wrapper around java.util.Date
- Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -139,8 +139,6 @@ public class Time extends java.util.Date
*
* @param str The string to parse.
* @return The resulting <code>java.sql.Time</code> value.
- *
- * @deprecated
*/
public static Time valueOf (String str)
{
@@ -193,8 +191,6 @@ 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 ()
{