aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/net/SocketOptions.java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-05-25 11:40:19 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-05-25 11:40:19 +0000
commitc7684ffe55c75b893fe40988dbb8fcea9beae3ba (patch)
tree88ef0760e764ef489e276334b8e20f71e9f96390 /libjava/java/net/SocketOptions.java
parenteceea3010ff9d19a48d650e5dccb7105d66adbd2 (diff)
downloadgcc-c7684ffe55c75b893fe40988dbb8fcea9beae3ba.zip
gcc-c7684ffe55c75b893fe40988dbb8fcea9beae3ba.tar.gz
gcc-c7684ffe55c75b893fe40988dbb8fcea9beae3ba.tar.bz2
PushbackInputStream.java, [...]: Merged new versions from classpath.
2003-05-25 Michael Koch <konqueror@gmx.de> * java/io/PushbackInputStream.java, java/net/Authenticator.java, java/net/ContentHandler.java, java/net/ContentHandlerFactory.java, java/net/DatagramSocket.java, java/net/DatagramSocketImpl.java, java/net/DatagramSocketImplFactory.java, java/net/FileNameMap.java, java/net/SocketImplFactory.java, java/net/SocketOptions.java, java/net/URLStreamHandlerFactory.java: Merged new versions from classpath. From-SVN: r67165
Diffstat (limited to 'libjava/java/net/SocketOptions.java')
-rw-r--r--libjava/java/net/SocketOptions.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java
index f62afef..b0404e8 100644
--- a/libjava/java/net/SocketOptions.java
+++ b/libjava/java/net/SocketOptions.java
@@ -1,5 +1,6 @@
/* SocketOptions.java -- Implements options for sockets (duh!)
- Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001,
+ 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -138,30 +139,30 @@ public interface SocketOptions
* Sets the specified option on a socket to the passed in object. For
* options that take an integer argument, the passed in object is an
* <code>Integer</code>. For options that are set to on or off, the
- * value passed will be a <code>Boolean</code>. The <code>option_id</code>
+ * value passed will be a <code>Boolean</code>. The <code>optionId</code>
* parameter is one of the defined constants in this interface.
*
- * @param option_id The identifier of the option
+ * @param optionId The identifier of the option
* @param val The value to set the option to
*
* @exception SocketException If an error occurs
*/
- void setOption(int option_id, Object val) throws SocketException;
+ void setOption(int optionId, Object val) throws SocketException;
/**
* Returns the current setting of the specified option. The
* <code>Object</code> returned will be an <code>Integer</code> for options
* that have integer values. For options that are set to on or off, a
- * <code>Boolean</code> will be returned. The <code>option_id</code>
- * is one of the defined constants in this interface.
+ * <code>Boolean</code> will be returned. The <code>optionId</code>
+ * parameter is one of the defined constants in this interface.
*
- * @param option_id The option identifier
+ * @param optionId The option identifier
*
* @return The current value of the option
*
* @exception SocketException If an error occurs
*/
- Object getOption(int option_id) throws SocketException;
+ Object getOption(int optionId) throws SocketException;
} // interface SocketOptions