Patch: FYI: java.net mergelets

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in.

This adds the missing public java.net classes from Classpath.
I also went ahead and replaced the other new java.net files with their
Classpath versions.  This fixed a couple minor bugs.

There's still a bunch of java.net merging to do.
I'll update the merge status page shortly.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Added
	SocketAddress.java, InetSocketAddress.java.
	* java/net/PortUnreachableException.java: Merged with Classpath.
	* java/net/SocketTimeoutException.java: Likewise.
	* java/net/URISyntaxException.java: Likewise.
	* java/net/SocketAddress.java: New class from Classpath.
	* java/net/InetSocketAddress.java: Likewise.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.237
diff -u -r1.237 Makefile.am
--- Makefile.am 20 Aug 2002 01:33:15 -0000 1.237
+++ Makefile.am 21 Aug 2002 18:47:30 -0000
@@ -1886,6 +1886,7 @@
 java/net/FileNameMap.java \
 java/net/HttpURLConnection.java	\
 java/net/InetAddress.java \
+java/net/InetSocketAddress.java \
 java/net/JarURLConnection.java \
 java/net/MalformedURLException.java \
 java/net/MulticastSocket.java \
@@ -1898,6 +1899,7 @@
 java/net/ProtocolException.java	\
 java/net/ServerSocket.java \
 java/net/Socket.java \
+java/net/SocketAddress.java \
 java/net/SocketException.java \
 java/net/SocketImpl.java \
 java/net/SocketImplFactory.java	\
Index: java/net/InetSocketAddress.java
===================================================================
RCS file: java/net/InetSocketAddress.java
diff -N java/net/InetSocketAddress.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/net/InetSocketAddress.java 21 Aug 2002 18:47:35 -0000
@@ -0,0 +1,128 @@
+/* InetSocketAddress.java -- 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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.
+
+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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.net;
+
+/** 
+ * InetSocketAddress instances represent socket addresses
+ * in the java.nio package. They encapsulate a InetAddress and
+ * a port number.
+ */
+
+public class InetSocketAddress extends SocketAddress
+{
+    InetAddress addr;
+    int port;
+    
+    public InetSocketAddress(InetAddress addr, int port)
+    {
+	this.addr = addr;
+	this.port = port;
+    }
+
+    public InetSocketAddress(int port)
+    {
+	this.port = port;
+	try {
+	    this.addr = InetAddress.getLocalHost();
+	} catch (Exception e) {
+	}
+    }
+
+
+    public InetSocketAddress(String hostname, int port)
+    {
+	this.port = port;
+	try {
+	    this.addr = InetAddress.getByName(hostname);
+	} catch (Exception e) {
+	}
+    }
+ 
+    /** 
+     * Test if obj is a InetSocketAddress and
+     * has the same address & port
+     */
+    public boolean equals(Object obj)
+    {
+	if (obj instanceof InetSocketAddress)
+	    {
+		InetSocketAddress a = (InetSocketAddress) obj;
+		return addr.equals(a.addr) && a.port == port;
+	    }
+	return false;
+    }
+
+    public InetAddress getAddress()
+    {
+	return addr;
+    }
+
+    public String getHostName()
+    {
+	return addr.getHostName();
+    }
+
+    public int getPort()
+    {
+	return port;
+    }
+    
+    /**
+     * TODO: see what sun does here.
+     */
+    public int hashCode()
+    {
+	return port + addr.hashCode();
+    }
+
+    /**
+     * TODO: see what sun does here.
+     */
+    public boolean isUnresolved()
+    {
+	return addr == null;
+    }
+    
+    /**
+     * TODO: see what sun does here.
+     */
+    public String toString()
+    {
+	return "SA:"+addr+":"+port;
+    }
+}
Index: java/net/PortUnreachableException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/PortUnreachableException.java,v
retrieving revision 1.1
diff -u -r1.1 PortUnreachableException.java
--- java/net/PortUnreachableException.java 20 Aug 2002 01:33:15 -0000 1.1
+++ java/net/PortUnreachableException.java 21 Aug 2002 18:47:36 -0000
@@ -1,4 +1,4 @@
-/* PortUnreachableException.java
+/* PortUnreachableException.java -- received an ICMP port unreachable datagram
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@
 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
@@ -37,19 +37,22 @@
 
 package java.net;
 
-import java.io.IOException;
-
 /**
- * This exception indicates that a URL passed to an object was not in a
- * valid format.
+ * This exception signals that an ICMP port unreachable datagram has been
+ * received.
  *
- * @author Michael Koch <konqueror@gmx.de>
+ * @author Eric Blake <ebb9@email.byu.edu>
  * @since 1.4
- * @status should be completely JDK 1.4 compatible
+ * @status updated to 1.4
  */
-public class PortUnreachableException extends IOException
+public class PortUnreachableException extends SocketException
 {
   /**
+   * Compatible with JDK 1.0+.
+   */
+  private static final long serialVersionUID = 8462541992376507323L;
+
+  /**
    * Create a new instance without a descriptive error message.
    */
   public PortUnreachableException()
@@ -66,3 +69,4 @@
     super(message);
   }
 } // class PortUnreachableException
+
Index: java/net/SocketAddress.java
===================================================================
RCS file: java/net/SocketAddress.java
diff -N java/net/SocketAddress.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/net/SocketAddress.java 21 Aug 2002 18:47:36 -0000
@@ -0,0 +1,54 @@
+/* SocketAddress.java -- 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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.
+
+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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.net;
+
+import java.io.*;
+
+/** 
+ * Abstract base class for InetSocketAddress.
+ * InetSocketAddress is to my knowledge the only derived
+ * class. [Ronald]
+ */
+
+public abstract class SocketAddress implements Serializable
+{
+    public SocketAddress()
+    {
+    }
+}
+
Index: java/net/SocketTimeoutException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/SocketTimeoutException.java,v
retrieving revision 1.1
diff -u -r1.1 SocketTimeoutException.java
--- java/net/SocketTimeoutException.java 20 Aug 2002 01:33:15 -0000 1.1
+++ java/net/SocketTimeoutException.java 21 Aug 2002 18:47:36 -0000
@@ -1,4 +1,4 @@
-/* SocketTimeoutException.java
+/* SocketTimeoutException.java -- the socket timed out
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@
 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
@@ -37,19 +37,22 @@
 
 package java.net;
 
-import java.io.IOException;
+import java.io.InterruptedIOException;
 
 /**
- * This exception indicates that a generic error occurred related to an
- * operation on a socket.  Check the descriptive message (if any) for
- * details on the nature of this error
+ * This exception signals that a socket read or accept timed out.
  *
- * @author Michael Koch <konqueror@gmx.de>
+ * @author Eric Blake <ebb9@email.byu.edu>
  * @since 1.4
- * @status should be completele JDK 1.4 compatible
+ * @status updated to 1.4
  */
-public class SocketTimeoutException extends IOException
+public class SocketTimeoutException extends InterruptedIOException
 {
+  /**
+   * Compatible with JDK 1.4+.
+   */
+  private static final long serialVersionUID = -8846654841826352300L;
+
   /**
    * Create a new instance without a descriptive error message.
    */
Index: java/net/URISyntaxException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URISyntaxException.java,v
retrieving revision 1.1
diff -u -r1.1 URISyntaxException.java
--- java/net/URISyntaxException.java 20 Aug 2002 01:33:15 -0000 1.1
+++ java/net/URISyntaxException.java 21 Aug 2002 18:47:36 -0000
@@ -1,4 +1,4 @@
-/* URISyntaxException.java
+/* URISyntaxException.java -- a string could not be parsed as a URI
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@
 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
@@ -38,59 +38,70 @@
 package java.net;
 
 /**
- * This exception indicates that a generic error occurred related to an
- * operation on a socket.  Check the descriptive message (if any) for
- * details on the nature of this error
+ * This exception is thrown when a String cannot be parsed as a URI.
  *
- * @author Michael Koch <konqueror@gmx.de>
+ * @author Eric Blake <ebb9@email.byu.edu>
+ * @see URI
  * @since 1.4
- * @status Should be completely JDK 1.4 compatible
+ * @status updated to 1.4
  */
 public class URISyntaxException extends Exception
 {
-  private String input;
-  private String reason;
-  private int index;
- 
-  /**
-   * @param input Input that cause the exception
-   * @param reason Reason of the exception
-   * @param index Position of the index or -1 if unknown
-   *
-   * @exception NullPointerException
-   * @exception IllegalArgumentException
-   */
-  public URISyntaxException(String input, String reason, int index)
-  {
-    if (input == null || reason == null)
-      throw new NullPointerException();
-    
-    if (index < -1)
-      throw new IllegalArgumentException();
+  /**
+   * Compatible with JDK 1.4+.
+   */
+  private static final long serialVersionUID = 2137979680897488891L;
 
-    this.input = input;
-    this.reason = reason;
-    this.index = index;
-  }
+  /**
+   * The failed input.
+   *
+   * @serial the bad URI
+   */
+  private final String input;
 
   /**
-   * @param input Input that cause the exception
-   * @param reason Reason of the exception
+   * The index of failure.
    *
-   * @exception NullPointerException
+   * @serial the location of the problem
    */
-  public URISyntaxException(String input, String reason)
+  private final int index;
+
+  /**
+   * Create an exception from the invalid string, with the index set to -1.
+   *
+   * @param input the bad URI
+   * @param msg the descriptive error message
+   * @throws NullPointerException if input or msg are null
+   */
+  public URISyntaxException(String input, String msg)
   {
-    if (input == null || reason == null)
-      throw new NullPointerException();
-    
-    this.input = input;
-    this.reason = reason;
-    this.index = -1;
+    this(input, msg, -1);
+  }
+
+  /**
+   * Create an exception from the invalid string, with the index of the
+   * point of failure.
+   *
+   * @param input the bad URI
+   * @param msg the descriptive error message
+   * @param index the index of the parse error, or -1
+   * @throws NullPointerException if input or msg are null
+   * @throws IllegalArgumentException if index &lt; -1
+   */
+  public URISyntaxException(String input, String msg, int index)
+  {
+    // The toString() hack checks for null.
+    super(msg.toString());
+    this.input = input.toString();
+    this.index = index;
+    if (index < -1)
+      throw new IllegalArgumentException();
   }
 
   /**
-   * @return Returns the input that caused this exception
+   * Returns the bad input string.
+   *
+   * @return the bad URI, guaranteed non-null
    */
   public String getInput()
   {
@@ -98,15 +109,19 @@
   }
 
   /**
-   * @return Returns the reason of this exception
+   * Returns the reason for the failure.
+   *
+   * @return the message, guaranteed non-null
    */
   public String getReason()
   {
-    return reason;
+    return super.getMessage();
   }
 
   /**
-   * @return Returns the index/position of this exception or -1 if unknown
+   * Returns the index of the failure, or -1.
+   *
+   * @return the index of failure
    */
   public int getIndex()
   {
@@ -114,12 +129,15 @@
   }
 
   /**
-   * This function returns an error message including input and reason.
-   * 
-   * @return Returns a exception message
+   * Returns a message describing the parse error, as if by
+   * <code>getReason() + (getIndex() &gt;= 0 ? " at index " + getIndex() : "")
+   * + ": " + getInput()</code>.
+   *
+   * @return the message string
    */
   public String getMessage()
   {
-    return input + ":" + reason;
+    return super.getMessage() + (index >= 0 ? " at index " + index : "")
+      + ": " + input;
   }
-} // class URISyntaxException
+}