Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de> * java/net/Authenticator.java, 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/Inet4Address.java, java/net/Inet6Address.java, java/net/InetAddress.java, java/net/InetSocketAddress.java, java/net/JarURLConnection.java, java/net/MalformedURLException.java, java/net/MulticastSocket.java, java/net/NetPermission.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/SocketAddress.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/URLClassLoader.java, java/net/URLConnection.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: Fixed javadocs, coding style and argument names all over. From-SVN: r80900
This commit is contained in:
parent
cf6f7d5589
commit
f6d49f66ec
45 changed files with 1979 additions and 1905 deletions
|
@ -7,7 +7,7 @@ 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
|
||||
|
@ -35,12 +35,12 @@ 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.ObjectStreamException;
|
||||
import java.util.Arrays;
|
||||
|
||||
|
||||
/**
|
||||
* @author Michael Koch
|
||||
* @date August 3, 2002.
|
||||
|
@ -53,7 +53,6 @@ import java.util.Arrays;
|
|||
* RFC 2365 (http://www.ietf.org/rfc/rfc2365.txt)
|
||||
* Status: Believed complete and correct.
|
||||
*/
|
||||
|
||||
public final class Inet4Address extends InetAddress
|
||||
{
|
||||
static final long serialVersionUID = 3286316764910316507L;
|
||||
|
@ -61,20 +60,20 @@ public final class Inet4Address extends InetAddress
|
|||
/**
|
||||
* needed for serialization
|
||||
*/
|
||||
private Object writeReplace () throws ObjectStreamException
|
||||
private Object writeReplace() throws ObjectStreamException
|
||||
{
|
||||
return new InetAddress (addr, hostName);
|
||||
return new InetAddress(addr, hostName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Inet4Address
|
||||
*
|
||||
*
|
||||
* @param addr The IP address
|
||||
* @param host The Hostname
|
||||
*/
|
||||
Inet4Address(byte[] addr, String host)
|
||||
{
|
||||
super (addr, host);
|
||||
super(addr, host);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -82,37 +81,37 @@ public final class Inet4Address extends InetAddress
|
|||
*
|
||||
* @since 1.1
|
||||
*/
|
||||
public boolean isMulticastAddress ()
|
||||
public boolean isMulticastAddress()
|
||||
{
|
||||
return (addr [0] & 0xF0) == 0xE0;
|
||||
return (addr[0] & 0xF0) == 0xE0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if this address is a loopback address
|
||||
*/
|
||||
public boolean isLoopbackAddress ()
|
||||
public boolean isLoopbackAddress()
|
||||
{
|
||||
return addr [0] == 0x7F;
|
||||
return addr[0] == 0x7F;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if this address is a wildcard address
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isAnyLocalAddress ()
|
||||
public boolean isAnyLocalAddress()
|
||||
{
|
||||
byte[] anylocal = { 0, 0, 0, 0 };
|
||||
|
||||
|
||||
return Arrays.equals(addr, anylocal);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if this address is a link local address
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isLinkLocalAddress ()
|
||||
public boolean isLinkLocalAddress()
|
||||
{
|
||||
// XXX: This seems to not exist with IPv4 addresses
|
||||
return false;
|
||||
|
@ -120,36 +119,36 @@ public final class Inet4Address extends InetAddress
|
|||
|
||||
/**
|
||||
* Checks if this address is a site local address
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isSiteLocalAddress ()
|
||||
public boolean isSiteLocalAddress()
|
||||
{
|
||||
// 10.0.0.0/8
|
||||
if (addr [0] == 0x0A)
|
||||
if (addr[0] == 0x0A)
|
||||
return true;
|
||||
|
||||
// XXX: Suns JDK 1.4.1 (on Linux) seems to have a bug here:
|
||||
// it says 172.16.0.0 - 172.255.255.255 are site local addresses
|
||||
//
|
||||
// 172.16.0.0/12
|
||||
if (addr [0] == 0xAC && (addr [1] & 0xF0) == 0x01)
|
||||
if (addr[0] == 0xAC && (addr[1] & 0xF0) == 0x01)
|
||||
return true;
|
||||
|
||||
// 192.168.0.0/16
|
||||
if (addr [0] == 0xC0 && addr [1] == 0xA8)
|
||||
if (addr[0] == 0xC0 && addr[1] == 0xA8)
|
||||
return true;
|
||||
|
||||
|
||||
// XXX: Do we need to check more addresses here ?
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if this multicast address has global scope
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isMCGlobal ()
|
||||
public boolean isMCGlobal()
|
||||
{
|
||||
// XXX: This seems to net exist with IPv4 addresses
|
||||
return false;
|
||||
|
@ -157,120 +156,118 @@ public final class Inet4Address extends InetAddress
|
|||
|
||||
/**
|
||||
* Checks if this multicast address has node scope
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isMCNodeLocal ()
|
||||
public boolean isMCNodeLocal()
|
||||
{
|
||||
// XXX: This seems to net exist with IPv4 addresses
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if this multicast address has link scope
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isMCLinkLocal ()
|
||||
public boolean isMCLinkLocal()
|
||||
{
|
||||
if (!isMulticastAddress ())
|
||||
if (! isMulticastAddress())
|
||||
return false;
|
||||
|
||||
return (addr [0] == 0xE0)
|
||||
&& (addr [1] == 0x00)
|
||||
&& (addr [2] == 0x00);
|
||||
|
||||
return (addr[0] == 0xE0) && (addr[1] == 0x00) && (addr[2] == 0x00);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if this multicast address has site scope
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isMCSiteLocal ()
|
||||
public boolean isMCSiteLocal()
|
||||
{
|
||||
// XXX: This seems to net exist with IPv4 addresses
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if this multicast address has organization scope
|
||||
*
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
public boolean isMCOrgLocal ()
|
||||
public boolean isMCOrgLocal()
|
||||
{
|
||||
// XXX: This seems to net exist with IPv4 addresses
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the address of the current instance
|
||||
*/
|
||||
public byte[] getAddress ()
|
||||
public byte[] getAddress()
|
||||
{
|
||||
return addr;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the address as string
|
||||
*
|
||||
*
|
||||
* @since 1.0.2
|
||||
*/
|
||||
public String getHostAddress ()
|
||||
public String getHostAddress()
|
||||
{
|
||||
StringBuffer sbuf = new StringBuffer (40);
|
||||
StringBuffer sbuf = new StringBuffer(40);
|
||||
int len = addr.length;
|
||||
int i = 0;
|
||||
|
||||
for ( ; ; )
|
||||
|
||||
for (;;)
|
||||
{
|
||||
sbuf.append (addr [i] & 0xFF);
|
||||
sbuf.append(addr[i] & 0xFF);
|
||||
i++;
|
||||
|
||||
|
||||
if (i == len)
|
||||
break;
|
||||
|
||||
sbuf.append ('.');
|
||||
|
||||
sbuf.append('.');
|
||||
}
|
||||
|
||||
return sbuf.toString ();
|
||||
|
||||
return sbuf.toString();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Computes the hashcode of the instance
|
||||
*/
|
||||
public int hashCode ()
|
||||
public int hashCode()
|
||||
{
|
||||
int hash = 0;
|
||||
int len = addr.length;
|
||||
int i = len > 4 ? len - 4 : 0;
|
||||
|
||||
for ( ; i < len; i++)
|
||||
hash = (hash << 8) | (addr [i] & 0xFF);
|
||||
|
||||
|
||||
for (; i < len; i++)
|
||||
hash = (hash << 8) | (addr[i] & 0xFF);
|
||||
|
||||
return hash;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Compare the current Inet4Address instance with obj
|
||||
*
|
||||
*
|
||||
* @param obj Object to compare with
|
||||
*/
|
||||
public boolean equals (Object obj)
|
||||
public boolean equals(Object obj)
|
||||
{
|
||||
if (! (obj instanceof InetAddress))
|
||||
return false;
|
||||
|
||||
|
||||
byte[] addr1 = addr;
|
||||
byte[] addr2 = ((InetAddress) obj).addr;
|
||||
|
||||
|
||||
if (addr1.length != addr2.length)
|
||||
return false;
|
||||
|
||||
for (int i = addr1.length; --i >= 0; )
|
||||
if (addr1 [i] != addr2 [i])
|
||||
return false;
|
||||
|
||||
|
||||
for (int i = addr1.length; --i >= 0;)
|
||||
if (addr1[i] != addr2[i])
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
} // class Inet4Address
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue