From 05dfb0b0e3c41fa4e3342402af348ef993e65335 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 17 Oct 2004 08:29:57 +0000 Subject: [PATCH] BindException.java, [...]: Big import statement and @author tag cleanup. 2004-10-17 Michael Koch * java/net/BindException.java, java/net/ConnectException.java, java/net/ContentHandler.java, java/net/ContentHandlerFactory.java, java/net/DatagramPacket.java, java/net/DatagramSocket.java, java/net/DatagramSocketImpl.java, java/net/DatagramSocketImplFactory.java, java/net/FileNameMap.java, java/net/HttpURLConnection.java, java/net/MalformedURLException.java, java/net/MulticastSocket.java, java/net/NetworkInterface.java, java/net/NoRouteToHostException.java, java/net/PasswordAuthentication.java, java/net/PortUnreachableException.java, java/net/ProtocolException.java, java/net/ServerSocket.java, java/net/Socket.java, java/net/SocketException.java, java/net/SocketImpl.java, java/net/SocketImplFactory.java, java/net/SocketOptions.java, java/net/SocketPermission.java, java/net/SocketTimeoutException.java, java/net/URI.java, java/net/URISyntaxException.java, java/net/URL.java, java/net/URLDecoder.java, java/net/URLEncoder.java, java/net/URLStreamHandler.java, java/net/URLStreamHandlerFactory.java, java/net/UnknownHostException.java, java/net/UnknownServiceException.java: Big import statement and @author tag cleanup. From-SVN: r89168 --- libjava/ChangeLog | 38 ++++++++++ libjava/java/net/BindException.java | 4 +- libjava/java/net/ConnectException.java | 4 +- libjava/java/net/ContentHandler.java | 2 +- libjava/java/net/ContentHandlerFactory.java | 2 +- libjava/java/net/DatagramPacket.java | 2 +- libjava/java/net/DatagramSocket.java | 1 + libjava/java/net/DatagramSocketImpl.java | 2 +- .../java/net/DatagramSocketImplFactory.java | 4 +- libjava/java/net/FileNameMap.java | 2 +- libjava/java/net/HttpURLConnection.java | 18 ++--- libjava/java/net/MalformedURLException.java | 4 +- libjava/java/net/MulticastSocket.java | 2 +- libjava/java/net/NetworkInterface.java | 5 +- libjava/java/net/NoRouteToHostException.java | 4 +- libjava/java/net/PasswordAuthentication.java | 69 ++++++++----------- .../java/net/PortUnreachableException.java | 2 +- libjava/java/net/ProtocolException.java | 4 +- libjava/java/net/ServerSocket.java | 2 + libjava/java/net/Socket.java | 1 + libjava/java/net/SocketException.java | 2 +- libjava/java/net/SocketImpl.java | 2 +- libjava/java/net/SocketImplFactory.java | 2 +- libjava/java/net/SocketOptions.java | 2 +- libjava/java/net/SocketPermission.java | 24 +++---- libjava/java/net/SocketTimeoutException.java | 2 +- libjava/java/net/URI.java | 18 ++--- libjava/java/net/URISyntaxException.java | 2 +- libjava/java/net/URL.java | 9 +-- libjava/java/net/URLDecoder.java | 2 +- libjava/java/net/URLEncoder.java | 2 +- libjava/java/net/URLStreamHandler.java | 4 +- libjava/java/net/URLStreamHandlerFactory.java | 2 +- libjava/java/net/UnknownHostException.java | 2 +- libjava/java/net/UnknownServiceException.java | 4 +- 35 files changed, 140 insertions(+), 111 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9c1d187e5b8..fb55ee6a3cc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,41 @@ +2004-10-17 Michael Koch + + * java/net/BindException.java, + java/net/ConnectException.java, + java/net/ContentHandler.java, + java/net/ContentHandlerFactory.java, + java/net/DatagramPacket.java, + java/net/DatagramSocket.java, + java/net/DatagramSocketImpl.java, + java/net/DatagramSocketImplFactory.java, + java/net/FileNameMap.java, + java/net/HttpURLConnection.java, + java/net/MalformedURLException.java, + java/net/MulticastSocket.java, + java/net/NetworkInterface.java, + java/net/NoRouteToHostException.java, + java/net/PasswordAuthentication.java, + java/net/PortUnreachableException.java, + java/net/ProtocolException.java, + java/net/ServerSocket.java, + java/net/Socket.java, + java/net/SocketException.java, + java/net/SocketImpl.java, + java/net/SocketImplFactory.java, + java/net/SocketOptions.java, + java/net/SocketPermission.java, + java/net/SocketTimeoutException.java, + java/net/URI.java, + java/net/URISyntaxException.java, + java/net/URL.java, + java/net/URLDecoder.java, + java/net/URLEncoder.java, + java/net/URLStreamHandler.java, + java/net/URLStreamHandlerFactory.java, + java/net/UnknownHostException.java, + java/net/UnknownServiceException.java: + Big import statement and @author tag cleanup. + 2004-10-17 Michael Koch * gnu/java/security/OID.java, diff --git a/libjava/java/net/BindException.java b/libjava/java/net/BindException.java index 00885e8f21c..fcb4f9d22d4 100644 --- a/libjava/java/net/BindException.java +++ b/libjava/java/net/BindException.java @@ -42,8 +42,8 @@ package java.net; * This exception indicates that an error occurred while attempting to bind * socket to a particular port. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @since 1.1 * @status updated to 1.4 */ diff --git a/libjava/java/net/ConnectException.java b/libjava/java/net/ConnectException.java index 2dd35e72d0f..2a3ec940d3f 100644 --- a/libjava/java/net/ConnectException.java +++ b/libjava/java/net/ConnectException.java @@ -43,8 +43,8 @@ package java.net; * connect to a remote host. Often this indicates that the remote host * refused the connection (ie, is not listening on the target socket). * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @since 1.1 * @status updated to 1.4 */ diff --git a/libjava/java/net/ContentHandler.java b/libjava/java/net/ContentHandler.java index 5e3de23d4dc..a3b946cd951 100644 --- a/libjava/java/net/ContentHandler.java +++ b/libjava/java/net/ContentHandler.java @@ -55,7 +55,7 @@ import java.io.IOException; * indirectly through methods in other classes. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) */ public abstract class ContentHandler { diff --git a/libjava/java/net/ContentHandlerFactory.java b/libjava/java/net/ContentHandlerFactory.java index cdfbca285d3..fa8e8188f16 100644 --- a/libjava/java/net/ContentHandlerFactory.java +++ b/libjava/java/net/ContentHandlerFactory.java @@ -49,7 +49,7 @@ package java.net; * handler for that type. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) */ public interface ContentHandlerFactory { diff --git a/libjava/java/net/DatagramPacket.java b/libjava/java/net/DatagramPacket.java index 549a3609a3d..087a80630b6 100644 --- a/libjava/java/net/DatagramPacket.java +++ b/libjava/java/net/DatagramPacket.java @@ -62,7 +62,7 @@ package java.net; * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * Status: Believed complete and correct. * - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @author Aarom M. Renn (arenn@urbanophile.com) (Documentation comments) * @date April 28, 1999. */ diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java index c84efdaf2cd..e00425f29c9 100644 --- a/libjava/java/net/DatagramSocket.java +++ b/libjava/java/net/DatagramSocket.java @@ -40,6 +40,7 @@ package java.net; import gnu.java.net.PlainDatagramSocketImpl; import gnu.java.nio.DatagramChannelImpl; + import java.io.IOException; import java.nio.channels.DatagramChannel; import java.nio.channels.IllegalBlockingModeException; diff --git a/libjava/java/net/DatagramSocketImpl.java b/libjava/java/net/DatagramSocketImpl.java index 0c21e2410d8..b48019f77c1 100644 --- a/libjava/java/net/DatagramSocketImpl.java +++ b/libjava/java/net/DatagramSocketImpl.java @@ -53,7 +53,7 @@ import java.io.IOException; * Status: Believed complete and correct. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @since 1.1 */ public abstract class DatagramSocketImpl implements SocketOptions diff --git a/libjava/java/net/DatagramSocketImplFactory.java b/libjava/java/net/DatagramSocketImplFactory.java index 16a0a2ec1aa..54764577d3b 100644 --- a/libjava/java/net/DatagramSocketImplFactory.java +++ b/libjava/java/net/DatagramSocketImplFactory.java @@ -1,4 +1,4 @@ -/* DatagramSocketImplFactory.java +/* DatagramSocketImplFactory.java -- Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ package java.net; * DatagramSocketImpl object. * This should not be needed by ordinary applications. * - * @author Michael Koch + * @author Michael Koch (konqueror@gmx.de) * @since 1.3 */ public interface DatagramSocketImplFactory diff --git a/libjava/java/net/FileNameMap.java b/libjava/java/net/FileNameMap.java index fbc6059c564..37033c2b136 100644 --- a/libjava/java/net/FileNameMap.java +++ b/libjava/java/net/FileNameMap.java @@ -48,7 +48,7 @@ package java.net; * the MIME type associated with that filename. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @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 e603d2b929d..c4c99378e62 100644 --- a/libjava/java/net/HttpURLConnection.java +++ b/libjava/java/net/HttpURLConnection.java @@ -1,5 +1,5 @@ -/* HttpURLConnection.java - Subclass of communications links using - Hypertext Transfer Protocol. +/* HttpURLConnection.java -- Subclass of communications links using + Hypertext Transfer Protocol. Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation This file is part of GNU Classpath. @@ -291,7 +291,7 @@ public abstract class HttpURLConnection extends URLConnection /** * This is a list of valid request methods, separated by "|" characters. */ - private static String valid_methods = + private static final String valid_methods = "|GET|POST|HEAD|OPTIONS|PUT|DELETE|TRACE|"; // Instance Variables @@ -537,7 +537,7 @@ public abstract class HttpURLConnection extends URLConnection public InputStream getErrorStream() { if (! connected) - return (null); + return null; int code; try @@ -550,10 +550,10 @@ public abstract class HttpURLConnection extends URLConnection } if (code == -1) - return (null); + return null; if (((code / 100) != 4) || ((code / 100) != 5)) - return (null); + return null; try { @@ -561,14 +561,14 @@ public abstract class HttpURLConnection extends URLConnection int i = pbis.read(); if (i == -1) - return (null); + return null; pbis.unread(i); - return (pbis); + return pbis; } catch (IOException e) { - return (null); + return null; } } diff --git a/libjava/java/net/MalformedURLException.java b/libjava/java/net/MalformedURLException.java index c9a50fa8650..6fdf12ae507 100644 --- a/libjava/java/net/MalformedURLException.java +++ b/libjava/java/net/MalformedURLException.java @@ -44,8 +44,8 @@ import java.io.IOException; * This exception indicates that a URL passed to an object was not in a * valid format. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @status updated to 1.4 */ public class MalformedURLException extends IOException diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java index c177531f22f..65e63253cc2 100644 --- a/libjava/java/net/MulticastSocket.java +++ b/libjava/java/net/MulticastSocket.java @@ -60,7 +60,7 @@ import java.util.Enumeration; * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * Status: Believed complete and correct. * - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @author Aaron M. Renn (arenn@urbanophile.com) (Documentation comments) * @since 1.1 * @date May 18, 1999. diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java index ab6d7b4263f..defd3482583 100644 --- a/libjava/java/net/NetworkInterface.java +++ b/libjava/java/net/NetworkInterface.java @@ -1,4 +1,4 @@ -/* NetworkInterface.java +/* NetworkInterface.java -- Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Vector; * For example, an ethernet interface may be named "eth0" and have the * address 192.168.1.101 assigned to it. * - * @author Michael Koch + * @author Michael Koch (konqueror@gmx.de) * @since 1.4 */ public final class NetworkInterface @@ -113,6 +113,7 @@ public final class NetworkInterface } catch (SecurityException e) { + // Ignore. } } diff --git a/libjava/java/net/NoRouteToHostException.java b/libjava/java/net/NoRouteToHostException.java index d1338938659..5427fb58e3d 100644 --- a/libjava/java/net/NoRouteToHostException.java +++ b/libjava/java/net/NoRouteToHostException.java @@ -42,8 +42,8 @@ package java.net; * This exception indicates that there is no TCP/IP route to the requested * host. This is often due to a misconfigured routing table. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @since 1.1 * @status updated to 1.4 */ diff --git a/libjava/java/net/PasswordAuthentication.java b/libjava/java/net/PasswordAuthentication.java index 910803a8f3a..671783d845c 100644 --- a/libjava/java/net/PasswordAuthentication.java +++ b/libjava/java/net/PasswordAuthentication.java @@ -39,69 +39,54 @@ package java.net; /** - * This class serves a container for username/password pairs. - * - * @author Aaron M. Renn (arenn@urbanophile.com) - * @since 1.2 - */ + * This class serves a container for username/password pairs. + * + * @author Aaron M. Renn (arenn@urbanophile.com) + * + * @since 1.2 + */ public final class PasswordAuthentication { - /* - * Instance Variables - */ - /** - * The username - */ + * The username + */ private String username; /** - * The password - */ + * The password + */ private char[] password; - /*************************************************************************/ - - /* - * Constructors - */ - /** - * Creates a new PasswordAuthentication object from the - * specified username and password. - * - * @param username The username for this object - * @param password The password for this object - */ + * Creates a new PasswordAuthentication object from the + * specified username and password. + * + * @param username The username for this object + * @param password The password for this object + */ public PasswordAuthentication(String username, char[] password) { this.username = username; this.password = password; } - /*************************************************************************/ - - /* - * Instance Methods - */ - /** - * Returns the username associated with this object - * - * @return The username - */ + * Returns the username associated with this object + * + * @return The username + */ public String getUserName() { - return (username); + return username; } /** - * Returns the password associated with this object - * - * @return The password - */ + * Returns the password associated with this object + * + * @return The password + */ public char[] getPassword() { - return (password); + return password; } -} // class PasswordAuthentication +} diff --git a/libjava/java/net/PortUnreachableException.java b/libjava/java/net/PortUnreachableException.java index def02636e58..f3ba17b7d4a 100644 --- a/libjava/java/net/PortUnreachableException.java +++ b/libjava/java/net/PortUnreachableException.java @@ -42,7 +42,7 @@ package java.net; * This exception signals that an ICMP port unreachable datagram has been * received. * - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.4 * @status updated to 1.4 */ diff --git a/libjava/java/net/ProtocolException.java b/libjava/java/net/ProtocolException.java index d058113495e..7f14ab25d87 100644 --- a/libjava/java/net/ProtocolException.java +++ b/libjava/java/net/ProtocolException.java @@ -45,8 +45,8 @@ import java.io.IOException; * exception occurred. Look in the descriptive message (if any) for * details on what went wrong. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @status updated to 1.4 */ public class ProtocolException extends IOException diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java index e507f0b3b09..b0576bf4cd5 100644 --- a/libjava/java/net/ServerSocket.java +++ b/libjava/java/net/ServerSocket.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.net; import gnu.java.net.PlainSocketImpl; + import java.io.IOException; import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.ServerSocketChannel; @@ -340,6 +341,7 @@ public class ServerSocket } catch (IOException e2) { + // Ignore. } throw e; diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 80caced4e33..bebd73d5479 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.net; import gnu.java.net.PlainSocketImpl; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/libjava/java/net/SocketException.java b/libjava/java/net/SocketException.java index 6b863606630..f130d52f281 100644 --- a/libjava/java/net/SocketException.java +++ b/libjava/java/net/SocketException.java @@ -45,7 +45,7 @@ import java.io.IOException; * operation on a socket. Check the descriptive message (if any) for * details on the nature of this error * - * @author Aaron M. Renn + * @author Aaron M. Renn (arenn@urbanophile.com) * @author Per Bothner * @status updated to 1.4 */ diff --git a/libjava/java/net/SocketImpl.java b/libjava/java/net/SocketImpl.java index 8cfb9ef5a1d..4016a2fb69f 100644 --- a/libjava/java/net/SocketImpl.java +++ b/libjava/java/net/SocketImpl.java @@ -62,7 +62,7 @@ import java.io.OutputStream; * a factory. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Per Bothner + * @author Per Bothner (bothner@cygnus.com) */ public abstract class SocketImpl implements SocketOptions { diff --git a/libjava/java/net/SocketImplFactory.java b/libjava/java/net/SocketImplFactory.java index 84e92a521f1..99374dedc4d 100644 --- a/libjava/java/net/SocketImplFactory.java +++ b/libjava/java/net/SocketImplFactory.java @@ -46,7 +46,7 @@ package java.net; * object. This should not be needed by ordinary applications. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Per Bothner + * @author Per Bothner (bothner@cygnus.com) */ public interface SocketImplFactory { diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java index 7ccd887cc68..b266919f5ec 100644 --- a/libjava/java/net/SocketOptions.java +++ b/libjava/java/net/SocketOptions.java @@ -51,7 +51,7 @@ package java.net; * @since 1.2 * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @status should be completely JDK 1.4 compatible */ public interface SocketOptions diff --git a/libjava/java/net/SocketPermission.java b/libjava/java/net/SocketPermission.java index e9d1402a7d4..0cd18c772e0 100644 --- a/libjava/java/net/SocketPermission.java +++ b/libjava/java/net/SocketPermission.java @@ -151,13 +151,13 @@ public final class SocketPermission extends Permission implements Serializable public boolean equals(Object obj) { if (! (obj instanceof SocketPermission)) - return (false); + return false; if (((SocketPermission) obj).hostport.equals(hostport)) if (((SocketPermission) obj).actions.equals(actions)) - return (true); + return true; - return (false); + return false; } /** @@ -216,7 +216,7 @@ public final class SocketPermission extends Permission implements Serializable else if (actions.indexOf("resolve") != -1) sb.append("resolve"); - return (sb.toString()); + return sb.toString(); } /** @@ -229,7 +229,7 @@ public final class SocketPermission extends Permission implements Serializable { // FIXME: Implement - return (null); + return null; } /** @@ -265,14 +265,14 @@ public final class SocketPermission extends Permission implements Serializable if (perm instanceof SocketPermission) p = (SocketPermission) perm; else - return (false); + return false; // Next check the actions String ourlist = getActions(); String theirlist = p.getActions(); if (! ourlist.startsWith(theirlist)) - return (false); + return false; // Now check ports int ourfirstport = 0; @@ -347,7 +347,7 @@ public final class SocketPermission extends Permission implements Serializable // Now check them if ((theirfirstport < ourfirstport) || (theirlastport > ourlastport)) - return (false); + return false; // Finally we can check the hosts String ourhost; @@ -369,7 +369,7 @@ public final class SocketPermission extends Permission implements Serializable // Are they equal? if (ourhost.equals(theirhost)) - return (true); + return true; // Try the canonical names String ourcanonical = null; @@ -392,17 +392,17 @@ public final class SocketPermission extends Permission implements Serializable } if (ourcanonical.equals(theircanonical)) - return (true); + return true; // Well, last chance. Try for a wildcard if (ourhost.indexOf("*.") != -1) { String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1)); if (theircanonical.endsWith(wild_domain)) - return (true); + return true; } // Didn't make it - return (false); + return false; } } diff --git a/libjava/java/net/SocketTimeoutException.java b/libjava/java/net/SocketTimeoutException.java index e375065b344..35bae90ac15 100644 --- a/libjava/java/net/SocketTimeoutException.java +++ b/libjava/java/net/SocketTimeoutException.java @@ -43,7 +43,7 @@ import java.io.InterruptedIOException; /** * This exception signals that a socket read or accept timed out. * - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.4 * @status updated to 1.4 */ diff --git a/libjava/java/net/URI.java b/libjava/java/net/URI.java index dc95e6ecbaa..01381cd8a81 100644 --- a/libjava/java/net/URI.java +++ b/libjava/java/net/URI.java @@ -1,4 +1,4 @@ -/* URI.java - An URI class +/* URI.java - An URI class -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -134,14 +134,14 @@ public final class URI implements Comparable, Serializable { this.string = (String) is.readObject(); try - { - parseURI(this.string); - } + { + parseURI(this.string); + } catch (URISyntaxException x) - { - // Should not happen. - throw new RuntimeException(x); - } + { + // Should not happen. + throw new RuntimeException(x); + } } private void writeObject(ObjectOutputStream os) throws IOException @@ -618,7 +618,7 @@ public final class URI implements Comparable, Serializable */ public boolean isAbsolute() { - return (scheme != null); + return scheme != null; } /** diff --git a/libjava/java/net/URISyntaxException.java b/libjava/java/net/URISyntaxException.java index 89a0be69823..f170d7373d1 100644 --- a/libjava/java/net/URISyntaxException.java +++ b/libjava/java/net/URISyntaxException.java @@ -41,7 +41,7 @@ package java.net; /** * This exception is thrown when a String cannot be parsed as a URI. * - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @see URI * @since 1.4 * @status updated to 1.4 diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java index 7bbbd982deb..0817126da10 100644 --- a/libjava/java/net/URL.java +++ b/libjava/java/net/URL.java @@ -39,13 +39,14 @@ exception statement from your version. */ package java.net; import gnu.java.net.URLParseError; -import java.security.AccessController; -import java.security.PrivilegedAction; + import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.HashMap; import java.util.StringTokenizer; @@ -116,8 +117,8 @@ import java.util.StringTokenizer; * done, then the above information is superseded and the behavior of this * class in loading protocol handlers is dependent on that factory. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * * @see URLStreamHandler */ diff --git a/libjava/java/net/URLDecoder.java b/libjava/java/net/URLDecoder.java index d2c403a585f..f9ae588f26d 100644 --- a/libjava/java/net/URLDecoder.java +++ b/libjava/java/net/URLDecoder.java @@ -57,7 +57,7 @@ import java.io.UnsupportedEncodingException; * * @since 1.2 * - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @author Aaron M. Renn (arenn@urbanophile.com) (documentation comments) * @author Mark Wielaard (mark@klomp.org) */ diff --git a/libjava/java/net/URLEncoder.java b/libjava/java/net/URLEncoder.java index fbabb0f89b8..75127af1a0f 100644 --- a/libjava/java/net/URLEncoder.java +++ b/libjava/java/net/URLEncoder.java @@ -60,7 +60,7 @@ import java.io.UnsupportedEncodingException; * This method is very useful for encoding strings to be sent to CGI scripts * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) * @author Mark Wielaard (mark@klomp.org) */ public class URLEncoder diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index aca62612f66..2e91eb64014 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -180,8 +180,8 @@ public abstract class URLStreamHandler } catch (NumberFormatException e) { - ; // Ignore invalid port values; port is already set to u's - // port. + // Ignore invalid port values; port is already set to u's + // port. } // Now we must cut the port number in the original string. diff --git a/libjava/java/net/URLStreamHandlerFactory.java b/libjava/java/net/URLStreamHandlerFactory.java index f43828cc5e9..ce6ba89c5e6 100644 --- a/libjava/java/net/URLStreamHandlerFactory.java +++ b/libjava/java/net/URLStreamHandlerFactory.java @@ -49,7 +49,7 @@ package java.net; * URLStreamHandler object. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy + * @author Warren Levy (warrenl@cygnus.com) */ public interface URLStreamHandlerFactory { diff --git a/libjava/java/net/UnknownHostException.java b/libjava/java/net/UnknownHostException.java index fefdadcd50f..39eb94c09f0 100644 --- a/libjava/java/net/UnknownHostException.java +++ b/libjava/java/net/UnknownHostException.java @@ -46,7 +46,7 @@ import java.io.IOException; * DNS problem has occurred, but most often means that the host was not * correctly specified. * - * @author Aaron M. Renn + * @author Aaron M. Renn (arenn@urbanophile.com) * @author Per Bothner * @status updated to 1.4 */ diff --git a/libjava/java/net/UnknownServiceException.java b/libjava/java/net/UnknownServiceException.java index 8cf1909f774..12f16f506ad 100644 --- a/libjava/java/net/UnknownServiceException.java +++ b/libjava/java/net/UnknownServiceException.java @@ -46,8 +46,8 @@ import java.io.IOException; * the MIME type returned from a URL could not be determined or that an * attempt was made to write to a read-only URL. * - * @author Aaron M. Renn - * @author Warren Levy + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) * @status updated to 1.4 */ public class UnknownServiceException extends IOException