This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.net reformating
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 29 Sep 2003 13:25:55 +0200
- Subject: FYI: Patch: java.net reformating
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to reformat InetAddress and URL in
java.net.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQE/eBbDWSOgCCdjSDsRAh7eAKCKWY2uPh6yBxHPrCiWJHNIYR9BogCfUCN4
0Lanqnl2ik/xU6SjDV4YTrE=
=3ZsN
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2200
diff -u -b -B -r1.2200 ChangeLog
--- ChangeLog 28 Sep 2003 04:23:27 -0000 1.2200
+++ ChangeLog 29 Sep 2003 11:22:06 -0000
@@ -1,3 +1,8 @@
+2003-09-29 Michael Koch <konqueror@gmx.de>
+
+ * java/net/InetAddress.java,
+ java/net/URL.java: Reformated.
+
2003-09-28 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/text/DateFormat.java (format): Throw IllegalArgumentException
Index: java/net/InetAddress.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/InetAddress.java,v
retrieving revision 1.19
diff -u -b -B -r1.19 InetAddress.java
--- java/net/InetAddress.java 25 Sep 2003 08:22:56 -0000 1.19
+++ java/net/InetAddress.java 29 Sep 2003 11:22:06 -0000
@@ -138,7 +138,7 @@
*
* @since 1.1
*/
- public boolean isMulticastAddress ()
+ public boolean isMulticastAddress()
{
int len = addr.length;
@@ -156,7 +156,7 @@
*
* @since 1.4
*/
- public boolean isAnyLocalAddress ()
+ public boolean isAnyLocalAddress()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -168,7 +168,7 @@
*
* @since 1.4
*/
- public boolean isLoopbackAddress ()
+ public boolean isLoopbackAddress()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -181,7 +181,7 @@
*
* @since 1.4
*/
- public boolean isLinkLocalAddress ()
+ public boolean isLinkLocalAddress()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -195,7 +195,7 @@
*
* @since 1.4
*/
- public boolean isSiteLocalAddress ()
+ public boolean isSiteLocalAddress()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -226,7 +226,7 @@
*
* @since 1.4
*/
- public boolean isMCGlobal ()
+ public boolean isMCGlobal()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -240,7 +240,7 @@
*
* @since 1.4
*/
- public boolean isMCNodeLocal ()
+ public boolean isMCNodeLocal()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -254,12 +254,12 @@
*
* @since 1.4
*/
- public boolean isMCLinkLocal ()
+ public boolean isMCLinkLocal()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
- if (!isMulticastAddress ())
+ if (!isMulticastAddress())
return false;
return (addr [0] == 0xE0
@@ -272,7 +272,7 @@
*
* @since 1.4
*/
- public boolean isMCSiteLocal ()
+ public boolean isMCSiteLocal()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -287,7 +287,7 @@
*
* @since 1.4
*/
- public boolean isMCOrgLocal ()
+ public boolean isMCOrgLocal()
{
// This is the IPv4 implementation.
// Any class derived from InetAddress should override this.
@@ -299,7 +299,7 @@
/**
* Returns the hostname represented by this InetAddress
*/
- public String getHostName ()
+ public String getHostName()
{
if (hostName == null)
lookup (null, this, false);
@@ -312,9 +312,9 @@
*
* @since 1.4
*/
- public String getCanonicalHostName ()
+ public String getCanonicalHostName()
{
- SecurityManager sm = System.getSecurityManager ();
+ SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
try
@@ -323,23 +323,23 @@
}
catch (SecurityException e)
{
- return getHostAddress ();
+ return getHostAddress();
}
}
// Try to find the FDQN now
- InetAddress address = new InetAddress (getAddress (), null);
- return address.getHostName ();
+ InetAddress address = new InetAddress (getAddress(), null);
+ return address.getHostName();
}
/**
* Returns the IP address of this InetAddress as array of bytes
*/
- public byte[] getAddress ()
+ public byte[] getAddress()
{
// An experiment shows that JDK1.2 returns a different byte array each
// time. This makes sense, in terms of security.
- return (byte[]) addr.clone ();
+ return (byte[]) addr.clone();
}
/* Helper function due to a CNI limitation. */
@@ -351,7 +351,7 @@
/* Helper function due to a CNI limitation. */
private static SecurityException checkConnect (String hostname)
{
- SecurityManager s = System.getSecurityManager ();
+ SecurityManager s = System.getSecurityManager();
if (s == null)
return null;
@@ -372,56 +372,63 @@
*
* @since 1.0.2
*/
- public String getHostAddress ()
+ public String getHostAddress()
{
- StringBuffer sbuf = new StringBuffer (40);
+ StringBuffer sb = new StringBuffer (40);
int len = addr.length;
int i = 0;
+
if (len == 16)
{ // An IPv6 address.
- for (; ; i += 2)
+ for ( ; ; i += 2)
{
if (i >= 16)
- return sbuf.toString ();
+ return sb.toString();
+
int x = ((addr [i] & 0xFF) << 8) | (addr [i + 1] & 0xFF);
- boolean empty = sbuf.length () == 0;
+ boolean empty = sb.length() == 0;
+
if (empty)
{
if (i == 10 && x == 0xFFFF)
{ // IPv4-mapped IPv6 address.
- sbuf.append (":FFFF:");
+ sb.append (":FFFF:");
break; // Continue as IPv4 address;
}
else if (i == 12)
{ // IPv4-compatible IPv6 address.
- sbuf.append (':');
+ sb.append (':');
break; // Continue as IPv4 address.
}
else if (i > 0)
- sbuf.append ("::");
+ sb.append ("::");
}
else
- sbuf.append (':');
+ sb.append (':');
+
if (x != 0 || i >= 14)
- sbuf.append (Integer.toHexString (x).toUpperCase ());
+ sb.append (Integer.toHexString (x).toUpperCase());
}
}
+
for ( ; ; )
{
- sbuf.append (addr[i] & 0xFF);
+ sb.append (addr [i] & 0xff);
i++;
+
if (i == len)
break;
- sbuf.append ('.');
+
+ sb.append ('.');
}
- return sbuf.toString();
+ return sb.toString();
}
/**
* Returns a hashcode of the InetAddress
*/
- public int hashCode ()
+ public int hashCode()
{
// There hashing algorithm is not specified, but a simple experiment
// shows that it is equal to the address, as a 32-bit big-endian integer.
@@ -466,10 +473,10 @@
/**
* Returns then <code>InetAddress</code> as string
*/
- public String toString ()
+ public String toString()
{
String result;
- String address = getHostAddress ();
+ String address = getHostAddress();
if (hostName != null)
result = hostName + "/" + address;
@@ -542,13 +549,13 @@
public static InetAddress getByName (String hostname)
throws UnknownHostException
{
- SecurityManager s = System.getSecurityManager ();
+ SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect (hostname, -1);
// Default to current host if necessary
if (hostname == null)
- return getLocalHost ();
+ return getLocalHost();
// Assume that the host string is an IP address
byte[] address = aton (hostname);
@@ -590,7 +597,7 @@
public static InetAddress[] getAllByName (String hostname)
throws UnknownHostException
{
- SecurityManager s = System.getSecurityManager ();
+ SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect (hostname, -1);
@@ -607,17 +614,17 @@
return lookup (hostname, null, true);
}
- private static native String getLocalHostname ();
+ private static native String getLocalHostname();
/**
- * Returns the local host
+ * Returns the local host address.
*
* @exception UnknownHostException If no IP address for the host could
* be found
*/
- public static InetAddress getLocalHost () throws UnknownHostException
+ public static InetAddress getLocalHost() throws UnknownHostException
{
- SecurityManager s = System.getSecurityManager ();
+ SecurityManager s = System.getSecurityManager();
// Experimentation shows that JDK1.2 does cache the result.
// However, if there is a security manager, and the cached result
@@ -636,7 +643,7 @@
if (s == null && localhost != null)
return;
- String hostname = getLocalHostname ();
+ String hostname = getLocalHostname();
if (s != null)
{
@@ -677,7 +684,7 @@
/**
* Needed for serialization
*/
- private void readResolve () throws ObjectStreamException
+ private void readResolve() throws ObjectStreamException
{
// FIXME: implement this
}
@@ -685,7 +692,7 @@
private void readObject (ObjectInputStream ois)
throws IOException, ClassNotFoundException
{
- ois.defaultReadObject ();
+ ois.defaultReadObject();
addr = new byte [4];
addr [3] = (byte) address;
@@ -710,6 +717,6 @@
for (; i < len; i++)
address = address << 8 | (((int) addr [i]) & 0xFF);
- oos.defaultWriteObject ();
+ oos.defaultWriteObject();
}
}
Index: java/net/URL.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URL.java,v
retrieving revision 1.26
diff -u -b -B -r1.26 URL.java
--- java/net/URL.java 27 Sep 2003 13:09:19 -0000 1.26
+++ java/net/URL.java 29 Sep 2003 11:22:06 -0000
@@ -183,7 +183,8 @@
static
{
- String s = System.getProperty("gnu.java.net.nocache_protocol_handlers");
+ String s = System.getProperty ("gnu.java.net.nocache_protocol_handlers");
+
if (s == null)
cache_handlers = true;
else
@@ -761,7 +762,7 @@
// First, see if a protocol handler is in our cache.
if (cache_handlers)
{
- if ((ph = (URLStreamHandler) ph_cache.get(protocol)) != null)
+ if ((ph = (URLStreamHandler) ph_cache.get (protocol)) != null)
return ph;
}
@@ -831,7 +832,7 @@
if (ph != null
&& cache_handlers)
if (ph instanceof URLStreamHandler)
- ph_cache.put(protocol, ph);
+ ph_cache.put (protocol, ph);
else
ph = null;