+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,
* 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
*/
* 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
*/
* 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
{
* 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
{
* 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.
*/
import gnu.java.net.PlainDatagramSocketImpl;
import gnu.java.nio.DatagramChannelImpl;
+
import java.io.IOException;
import java.nio.channels.DatagramChannel;
import java.nio.channels.IllegalBlockingModeException;
* 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
-/* DatagramSocketImplFactory.java
+/* DatagramSocketImplFactory.java --
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* <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
* 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
-/* 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.
/**
* 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
public InputStream getErrorStream()
{
if (! connected)
- return (null);
+ return null;
int code;
try
}
if (code == -1)
- return (null);
+ return null;
if (((code / 100) != 4) || ((code / 100) != 5))
- return (null);
+ return null;
try
{
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;
}
}
* 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
* 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.
-/* NetworkInterface.java
+/* NetworkInterface.java --
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* 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
}
catch (SecurityException e)
{
+ // Ignore.
}
}
* 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
*/
/**
- * 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
- */
- private char[] password;
-
- /*************************************************************************/
-
- /*
- * Constructors
+ * The password
*/
+ private char[] password;
/**
- * 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
+}
* 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
*/
* 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
package java.net;
import gnu.java.net.PlainSocketImpl;
+
import java.io.IOException;
import java.nio.channels.IllegalBlockingModeException;
import java.nio.channels.ServerSocketChannel;
}
catch (IOException e2)
{
+ // Ignore.
}
throw e;
package java.net;
import gnu.java.net.PlainSocketImpl;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
* 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
*/
* 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
{
* 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
{
* @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
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;
}
/**
else if (actions.indexOf("resolve") != -1)
sb.append("resolve");
- return (sb.toString());
+ return sb.toString();
}
/**
{
// FIXME: Implement
- return (null);
+ return null;
}
/**
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;
// Now check them
if ((theirfirstport < ourfirstport) || (theirlastport > ourlastport))
- return (false);
+ return false;
// Finally we can check the hosts
String ourhost;
// Are they equal?
if (ourhost.equals(theirhost))
- return (true);
+ return true;
// Try the canonical names
String ourcanonical = null;
}
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;
}
}
/**
* 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
*/
-/* 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.
{
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
*/
public boolean isAbsolute()
{
- return (scheme != null);
+ return scheme != null;
}
/**
/**
* 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
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;
* 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
*/
*
* @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)
*/
* 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
}
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.
* <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
{
* 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
*/
* 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
git://gcc.gnu.org / gcc.git / commitdiff