DataInput.java: Merge with Classpath.

	* java/io/DataInput.java:  Merge with Classpath.
	* java/io/DataOutput.java:  Idem.
	* java/io/FilenameFilter.java:  Idem.
	* java/io/Serializable.java:  Idem.
	* java/lang/Cloneable.java:  Idem.
	* java/lang/Comparable.java:  Idem.
	* java/lang/Runnable.java:  Idem.
	* java/lang/reflect/Member.java:  Idem.
	* java/net/ContentHandlerFactory.java:  Idem.
	* java/net/FileNameMap.java:  Idem.
	* java/net/SocketImplFactory.java:  Idem.
	* java/net/SocketOptions.java:  Idem.
	* java/net/URLStreamHandlerFactory.java:  Idem.

From-SVN: r45910

5 files changed, 297 insertions, 84 deletions

diff --git a/libjava/java/net/ContentHandlerFactory.java b/libjava/java/net/ContentHandlerFactory.java
index d272761..95198a6 100644
--- a/libjava/java/net/ContentHandlerFactory.java
+++ b/libjava/java/net/ContentHandlerFactory.java
@@ -1,19 +1,31 @@
-// ContentHandlerFactory.java - Abstract Content Handler factory.
+/* ContentHandlerFactory.java -- Interface for creating content handlers
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-/* Copyright (C) 1999  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
 
-package java.net;
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date March 5, 1999.
- */
+
+package java.net;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -21,7 +33,26 @@ package java.net;
  * Status:  Believed complete and correct.
  */
 
-public abstract interface ContentHandlerFactory
+/**
+  * 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.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  * @author Warren Levy <warrenl@cygnus.com>
+  */
+public interface ContentHandlerFactory
 {
-  public ContentHandler createContentHandler(String mimetype);
-}
+/**
+  * 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);
+
+} // interface ContentHandlerFactory
+
diff --git a/libjava/java/net/FileNameMap.java b/libjava/java/net/FileNameMap.java
index cc70aa2..42b5f87 100644
--- a/libjava/java/net/FileNameMap.java
+++ b/libjava/java/net/FileNameMap.java
@@ -1,19 +1,31 @@
-// FileNameMap.java - Abstract interface to map from a File Name to MIME type.
+/* FileNameMap.java -- Maps filenames to MIME types
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-/* Copyright (C) 1999  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
 
-package java.net;
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date March 5, 1999.
- */
+
+package java.net;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -21,7 +33,25 @@ package java.net;
  * Status:  Believed complete and correct.
  */
 
-public abstract interface FileNameMap
+/**
+  * This interface has one method which, when passed a filename, returns
+  * the MIME type associated with that filename.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  * @author Warren Levy <warrenl@cygnus.com>
+  */
+public interface FileNameMap
 {
-  public 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.
+  */
+String
+getContentTypeFor(String filename);
+
+} // interface FileNameMap
+
diff --git a/libjava/java/net/SocketImplFactory.java b/libjava/java/net/SocketImplFactory.java
index defce2e..73f66ec 100644
--- a/libjava/java/net/SocketImplFactory.java
+++ b/libjava/java/net/SocketImplFactory.java
@@ -1,25 +1,52 @@
-// SocketImplFactory.java - Abstract socket implementation factory.
+/* SocketImplFactory.java -- Interface to create a SocketImpl object
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-/* Copyright (C) 1999  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
 
-package java.net;
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-/**
-  * @author Per Bothner <bothner@cygnus.com>
-  * @date January 6, 1999.
-  */
+
+package java.net;
 
 /** Written using on-line Java Platform 1.2 API Specification.
   * Status:  Believed complete and correct.
   */
 
-public abstract interface SocketImplFactory
+/**
+  * This interface defines one method which returns a SocketImpl 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
 {
-  public SocketImpl createSocketImpl ();
-}
+/**
+  * This method returns an instance of the SocketImpl object
+  *
+  * @return A SocketImpl object
+  */
+SocketImpl
+createSocketImpl();
+
+} // interface SocketImplFactory
+
diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java
index d0e00d9..f83fb50 100644
--- a/libjava/java/net/SocketOptions.java
+++ b/libjava/java/net/SocketOptions.java
@@ -1,40 +1,135 @@
-// SocketOptions.java - Interface for get/set socket options.
+/* SocketOptions.java -- Implements options for sockets (duh!)
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-/* Copyright (C) 1999  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
 
-package java.net;
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date May 3, 1999.
- */
+package java.net;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification.
  * Status:  Believed complete and correct.
  */
 
-public abstract interface SocketOptions
+/**
+  * This interface is used by <code>SocketImpl</code> and 
+  * <code>DatagramSocketImpl</code> to implement options
+  * on sockets.  
+  *
+  * @since 1.2
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  * @author Warren Levy <warrenl@cygnus.com>
+  */
+public interface SocketOptions
 {
-  public static final int TCP_NODELAY = 0x1;
-  public static final int SO_BINDADDR = 0xF;
-  public static final int SO_REUSEADDR = 0x4;
-  public static final int IP_MULTICAST_IF = 0x10;
-  public static final int SO_LINGER = 0x80;
-  public static final int SO_TIMEOUT = 0x1006;
-
-  // JDK1.2
-  public static final int SO_SNDBUF = 0x1001;
-
-  // JDK1.2
-  public static final int SO_RCVBUF = 0x1002;
-
-  public void setOption(int optID, Object value) throws SocketException;
-  public Object getOption(int optID) throws SocketException;
-}
+
+/*************************************************************************/
+
+/*
+ * Static Variables
+ */
+
+/**
+  * Option id for the SO_LINGER value
+  */
+static final int SO_LINGER = 0x80; // 128
+
+/**
+  * Option id for the SO_TIMEOUT value
+  */
+static final int SO_TIMEOUT = 0x1006; // 4102
+
+/**
+  * Retrieve the local address to which the socket is bound.
+  */
+static final int SO_BINDADDR = 0x0F; // 15
+
+/**
+  * Option id for the send buffer size
+  * @since 1.2
+  */
+static final int SO_SNDBUF = 0x1001; // 4097
+
+/**
+  * Option id for the receive buffer size
+  * @since 1.2
+  */
+static final int SO_RCVBUF = 0x1002; // 4098
+
+/**
+  * Sets the SO_REUSEADDR parameter on a socket
+  */
+static final int SO_REUSEADDR = 0x04; // 4
+
+/**
+  * Option id for the TCP_NODELAY value
+  */
+static final int TCP_NODELAY = 0x01; // 1
+
+/**
+  * Options id for the IP_MULTICAST_IF value
+  */
+static final int IP_MULTICAST_IF = 0x10; // 16
+
+/*************************************************************************/
+
+/*
+ * Interface Methods
+ */
+
+/**
+  * 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> 
+  * parameter is one of the defined constants in this interface.
+  *
+  * @param option_id 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;
+
+/*************************************************************************/
+
+/**
+  * 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.
+  *
+  * @param option_id The option identifier
+  *
+  * @return The current value of the option
+  *
+  * @exception SocketException If an error occurs
+  */
+Object
+getOption(int option_id) throws SocketException;
+
+} // interface SocketOptions
+
diff --git a/libjava/java/net/URLStreamHandlerFactory.java b/libjava/java/net/URLStreamHandlerFactory.java
index a1b85bb..26eb0e3 100644
--- a/libjava/java/net/URLStreamHandlerFactory.java
+++ b/libjava/java/net/URLStreamHandlerFactory.java
@@ -1,19 +1,30 @@
-// URLStreamHandlerFactory.java - Abstract URL Stream Handler factory.
+/* URLStreamHandlerFactory.java -- Maps protocols to URLStreamHandlers
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-/* Copyright (C) 1999  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
 
-package java.net;
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date March 5, 1999.
- */
+package java.net;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -21,7 +32,26 @@ package java.net;
  * Status:  Believed complete and correct.
  */
 
-public abstract interface URLStreamHandlerFactory
+/**
+ * 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.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Warren Levy <warrenl@cygnus.com>
+ */
+public interface URLStreamHandlerFactory
 {
-  public URLStreamHandler createURLStreamHandler(String protocol);
-}
+/**
+  * 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);
+
+} // interface URLStreamHandlerFactory
+