From c08238f55a0b872efceb70ede271cc1dccf74282 Mon Sep 17 00:00:00 2001 From: mkoch Date: Sat, 11 Oct 2003 18:39:35 +0000 Subject: [PATCH] 2003-10-11 Michael Koch * java/net/ContentHandlerFactory.java, java/net/DatagramSocketImplFactory.java, java/net/FileNameMap.java, java/net/SocketImplFactory.java, java/net/SocketOptions.java, java/net/URLStreamHandlerFactory.java: Removed redundant modifiers. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72353 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 10 +++++++++ libjava/java/net/ContentHandlerFactory.java | 2 +- libjava/java/net/DatagramSocketImplFactory.java | 3 ++- libjava/java/net/FileNameMap.java | 2 +- libjava/java/net/SocketImplFactory.java | 2 +- libjava/java/net/SocketOptions.java | 28 ++++++++++++------------- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2090240..b4f242a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 2003-10-11 Michael Koch + * java/net/ContentHandlerFactory.java, + java/net/DatagramSocketImplFactory.java, + java/net/FileNameMap.java, + java/net/SocketImplFactory.java, + java/net/SocketOptions.java, + java/net/URLStreamHandlerFactory.java: + Removed redundant modifiers. + +2003-10-11 Michael Koch + * java/io/Externalizable.java, java/io/FileFilter.java, java/io/FilePermission.java, diff --git a/libjava/java/net/ContentHandlerFactory.java b/libjava/java/net/ContentHandlerFactory.java index 04fa3f1..7310f56 100644 --- a/libjava/java/net/ContentHandlerFactory.java +++ b/libjava/java/net/ContentHandlerFactory.java @@ -62,7 +62,7 @@ public interface ContentHandlerFactory * * @return The ContentHandler for the passed in MIME type */ - public ContentHandler createContentHandler(String mimeType); + ContentHandler createContentHandler(String mimeType); } // interface ContentHandlerFactory diff --git a/libjava/java/net/DatagramSocketImplFactory.java b/libjava/java/net/DatagramSocketImplFactory.java index ab39dd4..45bb189 100644 --- a/libjava/java/net/DatagramSocketImplFactory.java +++ b/libjava/java/net/DatagramSocketImplFactory.java @@ -56,5 +56,6 @@ public interface DatagramSocketImplFactory * * @return A DatagramSocketImpl object */ - public DatagramSocketImpl createDatagramSocketImpl(); + DatagramSocketImpl createDatagramSocketImpl(); + } // interface DatagramSocketImplFactory diff --git a/libjava/java/net/FileNameMap.java b/libjava/java/net/FileNameMap.java index b4f9e19..c6c5000 100644 --- a/libjava/java/net/FileNameMap.java +++ b/libjava/java/net/FileNameMap.java @@ -62,7 +62,7 @@ public interface FileNameMap * * @return The MIME type for the filename passed in. */ - public String getContentTypeFor(String filename); + String getContentTypeFor(String filename); } // interface FileNameMap diff --git a/libjava/java/net/SocketImplFactory.java b/libjava/java/net/SocketImplFactory.java index fc5de7a..2607411 100644 --- a/libjava/java/net/SocketImplFactory.java +++ b/libjava/java/net/SocketImplFactory.java @@ -56,7 +56,7 @@ public interface SocketImplFactory * * @return A SocketImpl object */ - public SocketImpl createSocketImpl(); + SocketImpl createSocketImpl(); } // interface SocketImplFactory diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java index b0404e8..149d7b7 100644 --- a/libjava/java/net/SocketOptions.java +++ b/libjava/java/net/SocketOptions.java @@ -60,80 +60,80 @@ public interface SocketOptions * Option id for the SO_KEEPALIVE value * @since 1.3 */ - static final int SO_KEEPALIVE = 0x8; + int SO_KEEPALIVE = 0x8; /** * Option id for the SO_LINGER value */ - static final int SO_LINGER = 0x80; // 128 + int SO_LINGER = 0x80; // 128 /** * Option id for the SO_TIMEOUT value */ - static final int SO_TIMEOUT = 0x1006; // 4102 + int SO_TIMEOUT = 0x1006; // 4102 /** * Retrieve the local address to which the socket is bound. */ - static final int SO_BINDADDR = 0x0F; // 15 + int SO_BINDADDR = 0x0F; // 15 /** * Option id for the send buffer size * @since 1.2 */ - static final int SO_SNDBUF = 0x1001; // 4097 + int SO_SNDBUF = 0x1001; // 4097 /** * Option id for the receive buffer size * @since 1.2 */ - static final int SO_RCVBUF = 0x1002; // 4098 + int SO_RCVBUF = 0x1002; // 4098 /** * Sets the SO_REUSEADDR parameter on a socket */ - static final int SO_REUSEADDR = 0x04; // 4 + int SO_REUSEADDR = 0x04; // 4 /** * Sets SO_BROADCAST for a socket * @since 1.4 */ - static final int SO_BROADCAST = 0x20; // 32 + int SO_BROADCAST = 0x20; // 32 /** * Sets SO_OOBINLINE for a socket * @since 1.4 */ - static final int SO_OOBINLINE = 0x1003; // 4099 + int SO_OOBINLINE = 0x1003; // 4099 /** * Option id for the TCP_NODELAY value */ - static final int TCP_NODELAY = 0x01; // 1 + int TCP_NODELAY = 0x01; // 1 /** * Options id for the IP_MULTICAST_IF value */ - static final int IP_MULTICAST_IF = 0x10; // 16 + int IP_MULTICAST_IF = 0x10; // 16 /** * same as above * @since 1.4 */ - static final int IP_MULTICAST_IF2 = 0x1F; // 31 + int IP_MULTICAST_IF2 = 0x1F; // 31 /** * This option enables or disables local loopback of multicast datagrams. * @since 1.4 */ - static final int IP_MULTICAST_LOOP = 0x12; // 18 + int IP_MULTICAST_LOOP = 0x12; // 18 /** * This option sets the type-of-service or traffic class field in the * IP header for a TCP or UDP socket. * @since 1.4 */ - static final int IP_TOS = 0x03; // 3 + int IP_TOS = 0x03; // 3 /** * Sets the specified option on a socket to the passed in object. For -- 2.7.4