Makefile.in: Rebuilt.

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

From-SVN: r56494

1 files changed, 128 insertions, 0 deletions

diff --git a/libjava/java/net/InetSocketAddress.java b/libjava/java/net/InetSocketAddress.java
new file mode 100644
index 0000000..c542b80
--- /dev/null
+++ b/libjava/java/net/InetSocketAddress.java
@@ -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;
+    }
+}