PushbackInputStream.java, [...]: Merged new versions from classpath.

2003-05-25  Michael Koch  <konqueror@gmx.de>

	* java/io/PushbackInputStream.java,
	java/net/Authenticator.java,
	java/net/ContentHandler.java,
	java/net/ContentHandlerFactory.java,
	java/net/DatagramSocket.java,
	java/net/DatagramSocketImpl.java,
	java/net/DatagramSocketImplFactory.java,
	java/net/FileNameMap.java,
	java/net/SocketImplFactory.java,
	java/net/SocketOptions.java,
	java/net/URLStreamHandlerFactory.java:
	Merged new versions from classpath.

From-SVN: r67165

libjava/ChangeLog

 2003-05-25  Michael Koch  <konqueror@gmx.de>
 
+	* java/io/PushbackInputStream.java,
+	java/net/Authenticator.java,
+	java/net/ContentHandler.java,
+	java/net/ContentHandlerFactory.java,
+	java/net/DatagramSocket.java,
+	java/net/DatagramSocketImpl.java,
+	java/net/DatagramSocketImplFactory.java,
+	java/net/FileNameMap.java,
+	java/net/SocketImplFactory.java,
+	java/net/SocketOptions.java,
+	java/net/URLStreamHandlerFactory.java:
+	Merged new versions from classpath.
+
+2003-05-25  Michael Koch  <konqueror@gmx.de>
+
 	* java/awt/Checkbox.java,
 	java/awt/Dialog.java,
 	java/awt/Font.java,

libjava/java/io/PushbackInputStream.java

@@ -74,8 +74,8 @@ public class PushbackInputStream extends FilterInputStream
 
   /**
    * This method initializes a <code>PushbackInputStream</code> to
-   * read from the * specified subordinate <code>InputStream</code>
-   * with a default pushback buffer * size of 1.
+   * read from the specified subordinate <code>InputStream</code>
+   * with a default pushback buffer size of 1.
    *
    * @param in The subordinate stream to read from
    */
@@ -302,7 +302,7 @@ public class PushbackInputStream extends FilterInputStream
    * <code>skip</code> method on the underlying <code>InputStream</code> to 
    * skip additional bytes if necessary.
    *
-   * @param num_bytes The requested number of bytes to skip
+   * @param numBytes The requested number of bytes to skip
    *
    * @return The actual number of bytes skipped.
    *

libjava/java/net/ContentHandler.java

 /* ContentHandler.java -- Abstract class for handling content from URL's
-   Copyright (C) 1998, 1999 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,65 +59,69 @@ import java.io.IOException;
   */
 public abstract class ContentHandler
 {
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * Default, no-argument constructor.
-  */
-public ContentHandler() { }
-
-/*************************************************************************/
-
-/**
-  * This method reads from the <code>InputStream</code> of the passed in URL 
-  * connection and uses the data downloaded to create an <code>Object</code> 
-  * represening the content.  For example, if the URL is pointing to a GIF 
-  * file, this method might return an <code>Image</code> object.  This method 
-  * must be implemented by subclasses.
-  *
-  * @param urlc A <code>URLConnection</code> object to read data from.
-  *
-  * @return An object representing the data read
-  *
-  * @exception IOException If an error occurs
-  */
-public abstract Object getContent(URLConnection urlc) throws IOException;
-
-/*************************************************************************/
-
-/**
-  * This method reads from the <code>InputStream</code> of the passed in URL
-  * connection and uses the data downloaded to create an <code>Object</code>
-  * represening the content.  For example, if the URL is pointing to a GIF 
-  * file, this method might return an <code>Image</code> object.  This method 
-  * must be implemented by subclasses. If the object doesnt match any type in
-  * classes it returns null.
-  *
-  * @param urlc A <code>URLConnection</code> object to read data from.
-  *
-  * @return An object representing the data read
-  *
-  * @exception IOException If an error occurs
-  *
-  * @since 1.3
-  */
-public Object getContent(URLConnection urlc, Class[] classes)
-  throws IOException
-{
-  Object obj = getContent (urlc);
-
-  for (int i = 0; i < classes.length; i++)
-    {
-      if (classes [i].isInstance (obj))
-        return obj;
-    }
-
-  return null;
-}
+  /*
+   * Constructors
+   */
+
+  /**
+    * Default, no-argument constructor.
+    */
+  public ContentHandler() 
+  { 
+  }
+
+  /*
+   * Instance Methods
+   */
+
+  /**
+    * This method reads from the <code>InputStream</code> of the passed in URL 
+    * connection and uses the data downloaded to create an <code>Object</code> 
+    * represening the content.  For example, if the URL is pointing to a GIF 
+    * file, this method might return an <code>Image</code> object.  This method 
+    * must be implemented by subclasses.
+    *
+    * @param urlc A <code>URLConnection</code> object to read data from.
+    *
+    * @return An object representing the data read
+    *
+    * @exception IOException If an error occurs
+    */
+  public abstract Object getContent(URLConnection urlc) 
+    throws IOException;
+
+  /**
+    * This method reads from the <code>InputStream</code> of the passed in URL
+    * connection and uses the data downloaded to create an <code>Object</code>
+    * represening the content.  For example, if the URL is pointing to a GIF 
+    * file, this method might return an <code>Image</code> object.  This method 
+    * must be implemented by subclasses.  This method uses the list of
+    * supplied classes as candidate types.  If the data read doesn't match 
+    * any of the supplied type, <code>null</code> is returned.
+    *
+    * @param urlc A <code>URLConnection</code> object to read data from.
+    * @param classes An array of types of objects that are candidate types
+    * for the data to be read.
+    *
+    * @return An object representing the data read, or <code>null</code>
+    * if the data does not match any of the candidate types.
+    *
+    * @exception IOException If an error occurs
+    *
+    * @since 1.3
+    */
+  public Object getContent(URLConnection urlc, Class[] classes)
+    throws IOException
+  {
+    Object obj = getContent (urlc);
+
+    for (int i = 0; i < classes.length; i++)
+      {
+        if (classes [i].isInstance (obj))
+          return obj;
+      }
+
+    return null;
+  }
 
 } // class ContentHandler

libjava/java/net/ContentHandlerFactory.java

 /* ContentHandlerFactory.java -- Interface for creating content handlers
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,25 +45,24 @@ package java.net;
  */
 
 /**
-  * This interface maps MIME types to ContentHandler objects.  It consists
-  * of one method that, when passed a MIME type, returns a handler for that
-  * type.
+  * This interface maps MIME types to <code>ContentHandler</code> objects.  
+  * It consists of one method that, when passed a MIME type, returns a 
+  * handler for that type.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Warren Levy <warrenl@cygnus.com>
   */
 public interface ContentHandlerFactory
 {
-/**
-  * This method is passed a MIME type as a string and is responsible for
-  * returning the appropriate ContentType object.
-  *
-  * @param mime_type The MIME type to map to a ContentHandler
-  *
-  * @return The ContentHandler for the passed in MIME type
-  */
-ContentHandler
-createContentHandler(String mime_type);
+  /**
+    * This method is passed a MIME type as a string and is responsible for
+    * returning the appropriate <code>ContentHandler</code> object.
+    *
+    * @param mimeType The MIME type to map to a <code>ContentHandler</code>
+    *
+    * @return The <code>ContentHandler</code> for the passed in MIME type
+    */
+  public ContentHandler createContentHandler(String mimeType);
 
 } // interface ContentHandlerFactory
 

libjava/java/net/DatagramSocket.java

 /* DatagramSocket.java -- A class to model UDP sockets
-   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -94,9 +94,11 @@ public class DatagramSocket
   private boolean closed = false;
 
   /**
-   * Creates a DatagramSocket from a specified DatagramSocketImpl instance
+   * Creates a <code>DatagramSocket</code> from a specified 
+   * <code>DatagramSocketImpl</code> instance
    *
-   * @param impl The DatagramSocketImpl the socket will be created from
+   * @param impl The <code>DatagramSocketImpl</code> the socket will be 
+   * created from
    * 
    * @since 1.4
    */
@@ -113,7 +115,7 @@ public class DatagramSocket
    *
    * @exception SocketException If an error occurs.
    * @exception SecurityException If a security manager exists and
-   * its checkListen method doesn't allow the operation.
+   * its <code>checkListen</code> method doesn't allow the operation.
    */
   public DatagramSocket() throws SocketException
   {
@@ -127,7 +129,7 @@ public class DatagramSocket
    * @param port The local port number to bind to.
    *
    * @exception SecurityException If a security manager exists and its
-   * checkListen method doesn't allow the operation.
+   * <code>checkListen</code> method doesn't allow the operation.
    * @exception SocketException If an error occurs.
    */
   public DatagramSocket(int port) throws SocketException
@@ -190,7 +192,7 @@ public class DatagramSocket
    * @param laddr The local address to bind to.
    *
    * @exception SecurityException If a security manager exists and its
-   * checkListen method doesn't allow the operation.
+   * <code>checkListen</code> method doesn't allow the operation.
    * @exception SocketException If an error occurs.
    *
    * @since 1.4

libjava/java/net/DatagramSocketImpl.java

 /* DatagramSocketImpl.java -- Abstract class for UDP socket implementations
-   Copyright (C) 1998, 1999 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 2000, 2001, 
+                 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -102,8 +103,8 @@ public abstract class DatagramSocketImpl implements SocketOptions
    * Takes a peek at the next packet received in order to retrieve the
    * address of the sender
    *
-   * @param i The InetAddress to fill in with the information about the
-   *          sender if the next packet
+   * @param i The <code>InetAddress</code> to fill in with the information 
+   *          about the sender if the next packet
    *
    * @return The port number of the sender of the packet
    *
@@ -118,7 +119,7 @@ public abstract class DatagramSocketImpl implements SocketOptions
    * Takes a peek at the next packet received.  This packet is not consumed.
    * With the next peekData/receive operation this packet will be read again.
    * 
-   * @param p The DatagramPacket to fill in with the data sent.
+   * @param p The <code>DatagramPacket</code> to fill in with the data sent.
    *
    * @return The port number of the sender of the packet.
    * 
@@ -147,7 +148,7 @@ public abstract class DatagramSocketImpl implements SocketOptions
   /**
    * Receives a packet of data from the network  Will block until a packet
    * arrives.  The packet info in populated into the passed in
-   * DatagramPacket object.
+   * <code>DatagramPacket</code> object.
    *
    * @param p A place to store the incoming packet.
    *
@@ -161,7 +162,7 @@ public abstract class DatagramSocketImpl implements SocketOptions
   /**
    * Connects the socket to a host specified by address and port.
    *
-   * @param address The InetAddress of the host to connect to
+   * @param address The <code>InetAddress</code> of the host to connect to
    * @param port The port number of the host to connect to
    *
    * @exception SocketException If an error occurs
@@ -288,26 +289,26 @@ public abstract class DatagramSocketImpl implements SocketOptions
    * Sets the specified option on a socket to the passed in object.  For
    * options that take an integer argument, the passed in object is an
    * <code>Integer</code>.  For options that are set to on or off, the
-   * value passed will be a <code>Boolean</code>.   The <code>option_id</code>
+   * value passed will be a <code>Boolean</code>.   The <code>optionId</code>
    * parameter is one of the defined constants in the superinterface.
    *
-   * @param option_id The identifier of the option
+   * @param optionId The identifier of the option
    * @param val The value to set the option to
    *
    * @exception SocketException If an error occurs
    * @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
    */
-  public abstract void setOption(int option_id, Object val)
+  public abstract void setOption(int optionId, Object val)
     throws SocketException;
 
   /**
    * Returns the current setting of the specified option.  The
    * <code>Object</code> returned will be an <code>Integer</code> for options
    * that have integer values.  For options that are set to on or off, a
-   * <code>Boolean</code> will be returned.   The <code>option_id</code>
+   * <code>Boolean</code> will be returned.   The <code>optionId</code>
    * is one of the defined constants in the superinterface.
    *
-   * @param option_id The option identifier
+   * @param optionId The option identifier
    *
    * @return The current value of the option
    *

libjava/java/net/DatagramSocketImplFactory.java

 /* DatagramSocketImplFactory.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,7 +42,8 @@ package java.net;
   */
 
 /**
-  * This interface defines one method which returns a DatagramSocketImpl object.
+  * This interface defines one method which returns a 
+  * <code>DatagramSocketImpl</code> object.
   * This should not be needed by ordinary applications.
   *
   * @author Michael Koch <konqueror@gmx.de>
@@ -55,5 +56,5 @@ public interface DatagramSocketImplFactory
    *
    * @return A DatagramSocketImpl object
    */
-  DatagramSocketImpl createDatagramSocketImpl();
+  public DatagramSocketImpl createDatagramSocketImpl();
 } // interface DatagramSocketImplFactory

libjava/java/net/FileNameMap.java

 /* FileNameMap.java -- Maps filenames to MIME types
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,16 +54,15 @@ package java.net;
   */
 public interface FileNameMap
 {
-/**
-  * This method is passed a filename and is responsible for determining
-  * the appropriate MIME type for that file.
-  *
-  * @param filename The name of the file to generate a MIME type for.
-  *
-  * @return The MIME type for the filename passed in.
-  */
-String
-getContentTypeFor(String filename);
+  /**
+    * This method is passed a filename and is responsible for determining
+    * the appropriate MIME type for that file.
+    *
+    * @param filename The name of the file to generate a MIME type for.
+    *
+    * @return The MIME type for the filename passed in.
+    */
+  public String getContentTypeFor(String filename);
 
 } // interface FileNameMap
 

libjava/java/net/SocketImplFactory.java

 /* SocketImplFactory.java -- Interface to create a SocketImpl object
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,21 +43,20 @@ package java.net;
   */
 
 /**
-  * This interface defines one method which returns a SocketImpl object.
-  * This should not be needed by ordinary applications.
+  * This interface defines one method which returns a <code>SocketImpl</code>
+  * object.  This should not be needed by ordinary applications.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Per Bothner <bothner@cygnus.com>
   */
 public interface SocketImplFactory
 {
-/**
-  * This method returns an instance of the SocketImpl object
-  *
-  * @return A SocketImpl object
-  */
-SocketImpl
-createSocketImpl();
+  /**
+    * This method returns an instance of the <code>SocketImpl</code> object
+    *
+    * @return A <code>SocketImpl</code> object
+    */
+  public SocketImpl createSocketImpl();
 
 } // interface SocketImplFactory
 

libjava/java/net/SocketOptions.java

 /* SocketOptions.java -- Implements options for sockets (duh!)
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 
+                 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -138,30 +139,30 @@ public interface SocketOptions
    * Sets the specified option on a socket to the passed in object.  For
    * options that take an integer argument, the passed in object is an
    * <code>Integer</code>.  For options that are set to on or off, the
-   * value passed will be a <code>Boolean</code>.   The <code>option_id</code>
+   * value passed will be a <code>Boolean</code>.   The <code>optionId</code>
    * parameter is one of the defined constants in this interface.
    *
-   * @param option_id The identifier of the option
+   * @param optionId The identifier of the option
    * @param val The value to set the option to
    *
    * @exception SocketException If an error occurs
    */
-  void setOption(int option_id, Object val) throws SocketException;
+  void setOption(int optionId, Object val) throws SocketException;
 
   /**
    * Returns the current setting of the specified option.  The
    * <code>Object</code> returned will be an <code>Integer</code> for options
    * that have integer values.  For options that are set to on or off, a
-   * <code>Boolean</code> will be returned.   The <code>option_id</code>
-   * is one of the defined constants in this interface.
+   * <code>Boolean</code> will be returned.   The <code>optionId</code>
+   * parameter is one of the defined constants in this interface.
    *
-   * @param option_id The option identifier
+   * @param optionId The option identifier
    *
    * @return The current value of the option
    *
    * @exception SocketException If an error occurs
    */
-  Object getOption(int option_id) throws SocketException;
+  Object getOption(int optionId) throws SocketException;
 
 } // interface SocketOptions
 

libjava/java/net/URLStreamHandlerFactory.java

 /* URLStreamHandlerFactory.java -- Maps protocols to URLStreamHandlers
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,23 +46,22 @@ package java.net;
 /**
  * This interface contains one method which maps the protocol portion of
  * a URL (eg, "http" in "http://www.urbanophile.com/arenn/") to a 
- * URLStreamHandler object.
+ * <code>URLStreamHandler</code> object.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Warren Levy <warrenl@cygnus.com>
  */
 public interface URLStreamHandlerFactory
 {
-/**
-  * This method maps the protocol portion of a URL to a URLStreamHandler
-  * object.
-  *
-  * @param protocol The protocol name to map ("http", "ftp", etc).
-  *
-  * @return The URLStreamHandler for the specified protocol
-  */
-URLStreamHandler
-createURLStreamHandler(String protocol);
+  /**
+    * This method maps the protocol portion of a URL to a 
+    * <code>URLStreamHandler</code> object.
+    *
+    * @param protocol The protocol name to map ("http", "ftp", etc).
+    *
+    * @return The <code>URLStreamHandler</code> for the specified protocol
+    */
+  public URLStreamHandler createURLStreamHandler(String protocol);
 
 } // interface URLStreamHandlerFactory