diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5724512702e95c2de1f641c12eb7090ae910030f..f4001489d427e7e4c38cbdeccc1bb4562a564105 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,20 @@
+2002-08-27 Michael Koch <konqueror@gmx.de>
+
+ * java/net/BindException.java,
+ java/net/JarURLConnection.java,
+ java/net/FileNameMap.java,
+ java/net/HttpURLConnection.java,
+ java/net/InetSocketAddress.java,
+ java/net/DatagramPacket.java,
+ java/net/DatagramSocket.java,
+ java/net/DatagramSocketImpl.java,
+ java/net/MulticastSocket.java,
+ java/net/PasswordAuthentication.java,
+ java/net/ServerSocket.java,
+ java/net/Socket.java,
+ java/net/URLClassLoader.java,
+ java/net/URLConnection.java: add/update of some @since/@deprecated
+
2002-08-27 Tony Kimball <alk@pobox.com>
Tom Tromey <tromey@redhat.com>
diff --git a/libjava/java/net/BindException.java b/libjava/java/net/BindException.java
index 3d11c4a4b04e25ae762a1a8499a6776f49bb99d7..cfc36b312f6eb6f3dfc02e2221501f513897ca95 100644
--- a/libjava/java/net/BindException.java
+++ b/libjava/java/net/BindException.java
@@ -43,6 +43,7 @@ package java.net;
*
* @author Aaron M. Renn <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
+ * @since 1.1
* @status updated to 1.4
*/
public class BindException extends SocketException
diff --git a/libjava/java/net/DatagramPacket.java b/libjava/java/net/DatagramPacket.java
index a2482f9237f5350c539c222cebc76dd9f3799a36..2140f454f435ad8cafd1a5146763d92a2bfecc5d 100644
--- a/libjava/java/net/DatagramPacket.java
+++ b/libjava/java/net/DatagramPacket.java
@@ -103,7 +103,7 @@ public final class DatagramPacket
* @param offset The offset into the buffer to start writing.
* @param length The maximum number of bytes to read.
*
- * @since Java 1.2
+ * @since 1.2
*/
public DatagramPacket(byte[] buf, int offset, int length)
{
@@ -146,7 +146,7 @@ public final class DatagramPacket
* @param addr The address to send to
* @param port The port to send to
*
- * @since Java 1.2
+ * @since 1.2
*/
public DatagramPacket(byte[] buf, int offset, int length,
InetAddress address, int port)
@@ -230,7 +230,7 @@ public final class DatagramPacket
*
* @return The buffer offset.
*
- * @since Java 1.2
+ * @since 1.2
*/
public synchronized int getOffset()
{
@@ -251,6 +251,8 @@ public final class DatagramPacket
* This sets the address to which the data packet will be transmitted.
*
* @param addr The destination address
+ *
+ * @since 1.1
*/
public synchronized void setAddress(InetAddress iaddr)
{
@@ -264,6 +266,8 @@ public final class DatagramPacket
* This sets the port to which the data packet will be transmitted.
*
* @param port The destination port
+ *
+ * @since 1.1
*/
public synchronized void setPort(int iport)
{
@@ -277,6 +281,8 @@ public final class DatagramPacket
* Sets the data buffer for this packet.
*
* @param buf The new buffer for this packet
+ *
+ * @since 1.1
*/
public synchronized void setData(byte[] buf)
{
@@ -295,7 +301,7 @@ public final class DatagramPacket
* @param offset The offset into the buffer to start reading data from.
* @param length The number of bytes of data in the buffer.
*
- * @since Java 1.2
+ * @since 1.2
*/
public synchronized void setData(byte[] buf, int offset, int length)
{
@@ -320,6 +326,8 @@ public final class DatagramPacket
* Sets the length of the data in the buffer.
*
* @param length The new length. (Where len <= buf.length)
+ *
+ * @since 1.1
*/
public synchronized void setLength(int length)
{
diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index 064e8e78983a3662869b0942875da1c42eecc8d6..7fc21ff73f4d1ffd47cc61c6cfa4f453a9c58f0b 100644
--- a/libjava/java/net/DatagramSocket.java
+++ b/libjava/java/net/DatagramSocket.java
@@ -117,6 +117,9 @@ public class DatagramSocket
return impl.getLocalPort();
}
+ /**
+ * @since 1.1
+ */
public synchronized int getSoTimeout() throws SocketException
{
Object timeout = impl.getOption(SocketOptions.SO_TIMEOUT);
@@ -152,6 +155,9 @@ public class DatagramSocket
impl.send(p);
}
+ /**
+ * @since 1.1
+ */
public synchronized void setSoTimeout(int timeout) throws SocketException
{
if (timeout < 0)
diff --git a/libjava/java/net/DatagramSocketImpl.java b/libjava/java/net/DatagramSocketImpl.java
index e929e5006ffce3e4f5fa1a217cf1814bb6a103d1..260088dfe058ee8efd4261fdf1e37a7d40f033ec 100644
--- a/libjava/java/net/DatagramSocketImpl.java
+++ b/libjava/java/net/DatagramSocketImpl.java
@@ -53,6 +53,7 @@ import java.io.FileDescriptor;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
+ * @since 1.1
*/
public abstract class DatagramSocketImpl implements SocketOptions
{
diff --git a/libjava/java/net/FileNameMap.java b/libjava/java/net/FileNameMap.java
index e29c81265fa0aafad6331ee4e751ec9389686551..538dbe8e19a80a2d78d1abd0c8fdf9da2fc29e62 100644
--- a/libjava/java/net/FileNameMap.java
+++ b/libjava/java/net/FileNameMap.java
@@ -50,6 +50,7 @@ package java.net;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
+ * @since 1.1
*/
public interface FileNameMap
{
diff --git a/libjava/java/net/HttpURLConnection.java b/libjava/java/net/HttpURLConnection.java
index 84e9468dfc29ae0439675b44acdeba31b6441255..c106ed26fc246ff305299e5cddcf5cd76058b956 100644
--- a/libjava/java/net/HttpURLConnection.java
+++ b/libjava/java/net/HttpURLConnection.java
@@ -15,6 +15,7 @@ import java.io.*;
/**
* @author Warren Levy <warrenl@cygnus.com>
+ * @since 1.1
* @date March 29, 1999.
*/
diff --git a/libjava/java/net/InetSocketAddress.java b/libjava/java/net/InetSocketAddress.java
index c542b8002254fb7041d61a0a1e662abb305a8faf..6db6baff9dd0c08494908f5e6c700ccd681080a6 100644
--- a/libjava/java/net/InetSocketAddress.java
+++ b/libjava/java/net/InetSocketAddress.java
@@ -41,6 +41,8 @@ package java.net;
* InetSocketAddress instances represent socket addresses
* in the java.nio package. They encapsulate a InetAddress and
* a port number.
+ *
+ * @since 1.4
*/
public class InetSocketAddress extends SocketAddress
diff --git a/libjava/java/net/JarURLConnection.java b/libjava/java/net/JarURLConnection.java
index a2b3434352dfe07d1168d591cc260c9502437df9..f0b3b5df34390336b7e608116f5ed9e6d4501bea 100644
--- a/libjava/java/net/JarURLConnection.java
+++ b/libjava/java/net/JarURLConnection.java
@@ -18,6 +18,7 @@ import java.util.Hashtable;
/**
* @author Kresten Krab Thorup <krab@gnu.org>
+ * @since 1.2
* @date Aug 10, 1999.
*/
diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java
index 4528de1ebed96e44c7f038836b999f0c914ac428..7381a866d557906790da30c0e32931a1117a23ef 100644
--- a/libjava/java/net/MulticastSocket.java
+++ b/libjava/java/net/MulticastSocket.java
@@ -60,6 +60,7 @@ import java.io.IOException;
*
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com) (Documentation comments)
+ * @since 1.1
* @date May 18, 1999.
*/
public class MulticastSocket extends DatagramSocket
diff --git a/libjava/java/net/PasswordAuthentication.java b/libjava/java/net/PasswordAuthentication.java
index e6d87a5431c4517db6d8d09011fa48633769c811..0c4faa543986a58d70de954bcd3b375a602c5eb9 100644
--- a/libjava/java/net/PasswordAuthentication.java
+++ b/libjava/java/net/PasswordAuthentication.java
@@ -41,6 +41,7 @@ package java.net;
* This class serves a container for username/password pairs.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
+ * @since 1.2
*/
public final class PasswordAuthentication
{
diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index f383c448e9464a7ebee1d34a6b6f2bd7250525cd..788057d13848612ec91df6b5e863d3103d561cfb 100644
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -129,6 +129,8 @@ public class ServerSocket
* @param bindAddr The address to bind to, or null to bind to all addresses
*
* @exception IOException If an error occurs
+ *
+ * @since 1.1
*/
public ServerSocket (int port, int backlog, InetAddress bindAddr)
throws java.io.IOException
@@ -192,6 +194,8 @@ public class ServerSocket
* @param socket The socket that is used for the accepted connection
*
* @exception IOException If an error occurs
+ *
+ * @since 1.1
*/
protected final void implAccept (Socket s) throws IOException
{
@@ -217,6 +221,8 @@ public class ServerSocket
* @param timeout The new SO_TIMEOUT value
*
* @exception IOException If an error occurs
+ *
+ * @since 1.1
*/
public void setSoTimeout (int timeout) throws SocketException
{
@@ -235,6 +241,8 @@ public class ServerSocket
* @return The value of SO_TIMEOUT
*
* @exception IOException If an error occurs
+ *
+ * @since 1.1
*/
public int getSoTimeout () throws IOException
{
diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java
index aa929b0b68307fb2368c9d0ef870f789ce862ede..6c0df5402b4ff3bb39999b14eaa5cf9e8c53470b 100644
--- a/libjava/java/net/Socket.java
+++ b/libjava/java/net/Socket.java
@@ -534,7 +534,7 @@ public class Socket
*
* @exception SocketException If an error occurs or Socket not connected
*
- * @since Java 1.2
+ * @since 1.2
*/
public void setSendBufferSize (int size) throws SocketException
{
@@ -556,7 +556,7 @@ public class Socket
*
* @exception SocketException If an error occurs or socket not connected
*
- * @since Java 1.2
+ * @since 1.2
*/
public int getSendBufferSize () throws SocketException
{
@@ -580,7 +580,7 @@ public class Socket
*
* @exception SocketException If an error occurs or Socket is not connected
*
- * @since Java 1.2
+ * @since 1.2
*/
public void setReceiveBufferSize (int size) throws SocketException
{
@@ -602,7 +602,7 @@ public class Socket
*
* @exception SocketException If an error occurs or Socket is not connected
*
- * @since Java 1.2
+ * @since 1.2
*/
public int getReceiveBufferSize () throws SocketException
{
diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java
index eeec8821316836193bc1646b341f9e92fb2fa602..4fce6250e4afae8f2afdf2309ec002ee2bfe63e3 100644
--- a/libjava/java/net/URLClassLoader.java
+++ b/libjava/java/net/URLClassLoader.java
@@ -13,6 +13,9 @@ import java.util.jar.*;
import java.util.Enumeration;
import java.util.Vector;
+/**
+ * @since 1.2
+ */
public class URLClassLoader extends ClassLoader
{
// The URLStreamHandlerFactory
diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java
index 6ee41aa57761bbca803161a39bce52adefb9f5ea..b3bebba00f20ded4ce2f2031f6be941a39968ff1 100644
--- a/libjava/java/net/URLConnection.java
+++ b/libjava/java/net/URLConnection.java
@@ -300,6 +300,9 @@ public abstract class URLConnection
// default request properties.
}
+ /**
+ * @deprecated 1.3
+ */
public static String getDefaultRequestProperty(String key)
{
// Overridden by subclasses that support default request properties.
@@ -346,13 +349,17 @@ public abstract class URLConnection
// TODO12: protected void parseURL(URL u, String spec, int start, int limit)
- // JDK1.2
+ /**
+ * @since 1.2
+ */
public static FileNameMap getFileNameMap()
{
return fileNameMap;
}
- // JDK1.2
+ /**
+ * @since 1.2
+ */
public static void setFileNameMap(FileNameMap map)
{
// Throw an exception if an extant security mgr precludes