diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/net/PlainDatagramSocketImpl.java | 47 |
2 files changed, 29 insertions, 23 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 848decd..0c2af35 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-03-11 Michael Koch <konqueror@gmx.de> + * gnu/java/net/PlainDatagramSocketImpl.java: + Reformated to match classpath's version more. + +2004-03-11 Michael Koch <konqueror@gmx.de> + * gnu/java/awt/peer/ClasspathFontPeer.java: Fixed javadoc to be correct xhtml. * gnu/java/awt/peer/gtk/GtkArgList.java diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java index a314651..83d8072 100644 --- a/libjava/gnu/java/net/PlainDatagramSocketImpl.java +++ b/libjava/gnu/java/net/PlainDatagramSocketImpl.java @@ -135,13 +135,13 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception SocketException If an error occurs */ - protected native void bind(int lport, InetAddress laddr) - throws SocketException; + protected native void bind(int port, InetAddress addr) + throws SocketException; - protected native void connect (InetAddress i, int port) - throws SocketException; + protected native void connect(InetAddress addr, int port) + throws SocketException; - protected native void disconnect (); + protected native void disconnect(); /** * Creates a new datagram socket @@ -150,9 +150,9 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl */ protected native void create() throws SocketException; - protected native int peek(InetAddress i) throws IOException; + protected native int peek(InetAddress addr) throws IOException; - protected native int peekData (DatagramPacket dp) throws IOException; + protected native int peekData(DatagramPacket packet) throws IOException; /** * Sets the Time to Live value for the socket @@ -188,7 +188,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception IOException IOException If an error occurs */ - protected native void receive(DatagramPacket p) throws IOException; + protected native void receive(DatagramPacket packet) throws IOException; /** * Sets the value of an option on the socket @@ -198,7 +198,8 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception SocketException If an error occurs */ - public native void setOption(int optID, Object value) throws SocketException; + public native void setOption(int option_id, Object val) + throws SocketException; /** * Retrieves the value of an option on the socket @@ -209,8 +210,9 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception SocketException If an error occurs */ - public native Object getOption(int optID) throws SocketException; - + public native Object getOption(int option_id) + throws SocketException; + /** * Joins or leaves a broadcasting group on a given network interface. * If the network interface is <code>null</code> the group is join/left on @@ -222,8 +224,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception IOException If an error occurs. */ - private native void mcastGrp(InetAddress inetAddr, - NetworkInterface netIf, + private native void mcastGrp(InetAddress inetAddr, NetworkInterface netIf, boolean join) throws IOException; @@ -267,9 +268,9 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception IOException If an error occurs */ - protected void join(InetAddress inetaddr) throws IOException + protected void join(InetAddress addr) throws IOException { - mcastGrp(inetaddr, null, true); + mcastGrp(addr, null, true); } /** @@ -279,20 +280,20 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl * * @exception IOException If an error occurs */ - protected void leave(InetAddress inetaddr) throws IOException + protected void leave(InetAddress addr) throws IOException { - mcastGrp(inetaddr, null, false); + mcastGrp(addr, null, false); } - protected void joinGroup (SocketAddress mcastaddr, NetworkInterface netIf) - throws IOException + protected void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf) + throws IOException { - mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, true); + mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, true); } - protected void leaveGroup (SocketAddress mcastaddr, NetworkInterface netIf) - throws IOException + protected void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf) + throws IOException { - mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, false); + mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, false); } } |