OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BindException.java, [...]: Big import statement and @author tag cleanup. 

2004-10-17  Michael Koch  <konqueror@gmx.de>

	* 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
This commit is contained in:
Michael Koch 2004-10-17 08:29:57 +00:00 committed by Michael Koch
parent 3238d4f99a
commit 05dfb0b0e3
35 changed files with 140 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libjava/ChangeLog
View File

@ -1,3 +1,41 @@
2004-10-17 Michael Koch <konqueror@gmx.de>
* 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 <konqueror@gmx.de>
* gnu/java/security/OID.java,

4
libjava/java/net/BindException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @since 1.1
* @status updated to 1.4
*/

4
libjava/java/net/ConnectException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @since 1.1
* @status updated to 1.4
*/

2
libjava/java/net/ContentHandler.java
View File

@ -55,7 +55,7 @@ import java.io.IOException;
* indirectly through methods in other classes.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
*/
public abstract class ContentHandler
{

2
libjava/java/net/ContentHandlerFactory.java
View File

@ -49,7 +49,7 @@ package java.net;
* handler for that type.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
*/
public interface ContentHandlerFactory
{

2
libjava/java/net/DatagramPacket.java
View File

@ -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 <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @author Aarom M. Renn (arenn@urbanophile.com) (Documentation comments)
* @date April 28, 1999.
*/

1
libjava/java/net/DatagramSocket.java
View File

@ -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;

2
libjava/java/net/DatagramSocketImpl.java
View File

@ -53,7 +53,7 @@ import java.io.IOException;
* Status: Believed complete and correct.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @since 1.1
*/
public abstract class DatagramSocketImpl implements SocketOptions

4
libjava/java/net/DatagramSocketImplFactory.java
View File

@ -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;
* <code>DatagramSocketImpl</code> object.
* This should not be needed by ordinary applications.
*
* @author Michael Koch <konqueror@gmx.de>
* @author Michael Koch (konqueror@gmx.de)
* @since 1.3
*/
public interface DatagramSocketImplFactory

2
libjava/java/net/FileNameMap.java
View File

@ -48,7 +48,7 @@ package java.net;
* the MIME type associated with that filename.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @since 1.1
*/
public interface FileNameMap

18
libjava/java/net/HttpURLConnection.java
View File

@ -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;
}
}

4
libjava/java/net/MalformedURLException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @status updated to 1.4
*/
public class MalformedURLException extends IOException

2
libjava/java/net/MulticastSocket.java
View File

@ -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 <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @author Aaron M. Renn (arenn@urbanophile.com) (Documentation comments)
* @since 1.1
* @date May 18, 1999.

5
libjava/java/net/NetworkInterface.java
View File

@ -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 <konqueror@gmx.de>
* @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.
}
}

4
libjava/java/net/NoRouteToHostException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @since 1.1
* @status updated to 1.4
*/

69
libjava/java/net/PasswordAuthentication.java
View File

@ -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 <code>PasswordAuthentication</code> object from the
* specified username and password.
*
* @param username The username for this object
* @param password The password for this object
*/
* Creates a new <code>PasswordAuthentication</code> 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
}

2
libjava/java/net/PortUnreachableException.java
View File

@ -42,7 +42,7 @@ package java.net;
* This exception signals that an ICMP port unreachable datagram has been
* received.
*
* @author Eric Blake <ebb9@email.byu.edu>
* @author Eric Blake (ebb9@email.byu.edu)
* @since 1.4
* @status updated to 1.4
*/

4
libjava/java/net/ProtocolException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @status updated to 1.4
*/
public class ProtocolException extends IOException

2
libjava/java/net/ServerSocket.java
View File

@ -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;

1
libjava/java/net/Socket.java
View File

@ -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;

2
libjava/java/net/SocketException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Per Bothner
* @status updated to 1.4
*/

2
libjava/java/net/SocketImpl.java
View File

@ -62,7 +62,7 @@ import java.io.OutputStream;
* a factory.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Per Bothner <bothner@cygnus.com>
* @author Per Bothner (bothner@cygnus.com)
*/
public abstract class SocketImpl implements SocketOptions
{

2
libjava/java/net/SocketImplFactory.java
View File

@ -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 <bothner@cygnus.com>
* @author Per Bothner (bothner@cygnus.com)
*/
public interface SocketImplFactory
{

2
libjava/java/net/SocketOptions.java
View File

@ -51,7 +51,7 @@ package java.net;
* @since 1.2
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @status should be completely JDK 1.4 compatible
*/
public interface SocketOptions

24
libjava/java/net/SocketPermission.java
View File

@ -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;
}
}

2
libjava/java/net/SocketTimeoutException.java
View File

@ -43,7 +43,7 @@ import java.io.InterruptedIOException;
/**
* This exception signals that a socket read or accept timed out.
*
* @author Eric Blake <ebb9@email.byu.edu>
* @author Eric Blake (ebb9@email.byu.edu)
* @since 1.4
* @status updated to 1.4
*/

18
libjava/java/net/URI.java
View File

@ -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;
}
/**

2
libjava/java/net/URISyntaxException.java
View File

@ -41,7 +41,7 @@ package java.net;
/**
* This exception is thrown when a String cannot be parsed as a URI.
*
* @author Eric Blake <ebb9@email.byu.edu>
* @author Eric Blake (ebb9@email.byu.edu)
* @see URI
* @since 1.4
* @status updated to 1.4

9
libjava/java/net/URL.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
*
* @see URLStreamHandler
*/

2
libjava/java/net/URLDecoder.java
View File

@ -57,7 +57,7 @@ import java.io.UnsupportedEncodingException;
*
* @since 1.2
*
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @author Aaron M. Renn (arenn@urbanophile.com) (documentation comments)
* @author Mark Wielaard (mark@klomp.org)
*/

2
libjava/java/net/URLEncoder.java
View File

@ -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 <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
* @author Mark Wielaard (mark@klomp.org)
*/
public class URLEncoder

4
libjava/java/net/URLStreamHandler.java
View File

@ -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.

2
libjava/java/net/URLStreamHandlerFactory.java
View File

@ -49,7 +49,7 @@ package java.net;
* <code>URLStreamHandler</code> object.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy <warrenl@cygnus.com>
* @author Warren Levy (warrenl@cygnus.com)
*/
public interface URLStreamHandlerFactory
{

2
libjava/java/net/UnknownHostException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Per Bothner
* @status updated to 1.4
*/

4
libjava/java/net/UnknownServiceException.java
View File

@ -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 <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Warren Levy (warrenl@cygnus.com)
* @status updated to 1.4
*/
public class UnknownServiceException extends IOException