13 files changed, 110 insertions, 89 deletions
diff --git a/libjava/gnu/gcj/runtime/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java
index d6d9a8075bc..90515830cfc 100644
--- a/libjava/gnu/gcj/runtime/FirstThread.java
+++ b/libjava/gnu/gcj/runtime/FirstThread.java
@@ -90,7 +90,7 @@ final class FirstThread extends Thread
   // classes are only referred to via Class.forName(), so we add an
   // explicit mention of them here.
   static final Class Kcert = java.security.cert.Certificate.class;
-  static final Class Kfile = gnu.gcj.protocol.file.Handler.class;
-  static final Class Khttp = gnu.gcj.protocol.http.Handler.class;
-  static final Class Kjar  = gnu.gcj.protocol.jar.Handler.class;
+  static final Class Kfile = gnu.java.net.protocol.file.Handler.class;
+  static final Class Khttp = gnu.java.net.protocol.http.Handler.class;
+  static final Class Kjar  = gnu.java.net.protocol.jar.Handler.class;
 }
diff --git a/libjava/gnu/gcj/protocol/core/Connection.java b/libjava/gnu/java/net/protocol/core/Connection.java
index 95d709630ac..2319c0be923 100644
--- a/libjava/gnu/gcj/protocol/core/Connection.java
+++ b/libjava/gnu/java/net/protocol/core/Connection.java
@@ -8,11 +8,14 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.core;
+package gnu.java.net.protocol.core;
 
 import gnu.gcj.Core;
-import java.net.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
@@ -31,7 +34,7 @@ class Connection extends URLConnection
 
   private Core core;
 
-  public Connection(URL url)
+  public Connection (URL url)
   {
     super(url);
   }
@@ -98,7 +101,7 @@ class Connection extends URLConnection
 	return null;
       }
     if (n < hdrVec.size())
-      return getField((String) hdrVec.elementAt(n));
+      return getField ((String) hdrVec.elementAt(n));
 
     return null;
   }
@@ -115,7 +118,7 @@ class Connection extends URLConnection
 	return null;
       }
     if (n < hdrVec.size())
-      return getKey((String) hdrVec.elementAt(n));
+      return getKey ((String) hdrVec.elementAt(n));
 
     return null;
   }
diff --git a/libjava/gnu/gcj/protocol/core/CoreInputStream.java b/libjava/gnu/java/net/protocol/core/CoreInputStream.java
index 3dd0524f162..421bb1c4765 100644
--- a/libjava/gnu/gcj/protocol/core/CoreInputStream.java
+++ b/libjava/gnu/java/net/protocol/core/CoreInputStream.java
@@ -8,11 +8,12 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.core;
+package gnu.java.net.protocol.core;
 
-import java.io.*;
 import gnu.gcj.Core;
 import gnu.gcj.RawData;
+import java.io.InputStream;
+import java.io.IOException;
 
 public class CoreInputStream extends InputStream
 {
@@ -82,7 +83,7 @@ public class CoreInputStream extends InputStream
     // be larger than an int since the result of subtracting 2 positive
     // ints will always fit in an int.  Since we have to return a long
     // anyway, numBytes might as well just be a long.
-    long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
+    long numBytes = Math.min ((long) (count - pos), n < 0 ? 0L : n);
     pos += numBytes;
     return numBytes;
   }
diff --git a/libjava/gnu/gcj/protocol/core/Handler.java b/libjava/gnu/java/net/protocol/core/Handler.java
index 474ae6fdab0..8726172d2cd 100644
--- a/libjava/gnu/gcj/protocol/core/Handler.java
+++ b/libjava/gnu/java/net/protocol/core/Handler.java
@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.core;
+package gnu.java.net.protocol.core;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.io.IOException;
 
 /**
  * @author Anthony Green <green@redhat.com>
  * @date August 13, 2001.
  */
-
 public class Handler extends URLStreamHandler
 {
   protected URLConnection openConnection(URL url) throws IOException
diff --git a/libjava/gnu/gcj/protocol/core/natCoreInputStream.cc b/libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
index 0a61ec074f4..4053efcd16a 100644
--- a/libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
+++ b/libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
@@ -18,28 +18,30 @@ details.  */
 
 #include <java/lang/NullPointerException.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <gnu/gcj/protocol/core/CoreInputStream.h>
+#include <gnu/java/net/protocol/core/CoreInputStream.h>
 
 jint
-gnu::gcj::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
+gnu::java::net::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
 {
-  return ((char *)ptr)[offset];
+  return ((char*) ptr) [offset];
 }
 
 jint
-gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
-							      jint offset,
-							      jint numBytes)
+gnu::java::net::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
+							            jint offset,
+							            jint numBytes)
 {
-  if (! dest)
-    throw new java::lang::NullPointerException; 
+  if (!dest)
+    throw new ::java::lang::NullPointerException;
+  
   jsize destSize = JvGetArrayLength (dest);
+  
   if (offset < 0 || numBytes < 0 || offset + numBytes < 0
       || offset + numBytes > destSize
       || pos + numBytes > count)
-    throw new java::lang::ArrayIndexOutOfBoundsException;
+    throw new ::java::lang::ArrayIndexOutOfBoundsException;
 
-  void *pcore = (void *) &((char*)ptr)[pos];
+  void *pcore = (void *) &((char*) ptr) [pos];
   void *pdest = (void *) (elements (dest) + offset);
 
   memcpy (pdest, pcore, numBytes);
diff --git a/libjava/gnu/gcj/protocol/file/Connection.java b/libjava/gnu/java/net/protocol/file/Connection.java
index 4fcdb11ed52..3bddd0ffe13 100644
--- a/libjava/gnu/gcj/protocol/file/Connection.java
+++ b/libjava/gnu/java/net/protocol/file/Connection.java
@@ -8,10 +8,19 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.file;
-
-import java.net.*;
-import java.io.*;
+package gnu.java.net.protocol.file;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
@@ -122,7 +131,7 @@ class Connection extends URLConnection
 	return null;
       }
     if (n < hdrVec.size())
-      return getField((String) hdrVec.elementAt(n));
+      return getField ((String) hdrVec.elementAt(n));
 
     return null;
   }
@@ -139,7 +148,7 @@ class Connection extends URLConnection
 	return null;
       }
     if (n < hdrVec.size())
-      return getKey((String) hdrVec.elementAt(n));
+      return getKey ((String) hdrVec.elementAt(n));
 
     return null;
   }
diff --git a/libjava/gnu/gcj/protocol/file/Handler.java b/libjava/gnu/java/net/protocol/file/Handler.java
index f48ef8e9f31..f85db447b59 100644
--- a/libjava/gnu/gcj/protocol/file/Handler.java
+++ b/libjava/gnu/java/net/protocol/file/Handler.java
@@ -8,12 +8,12 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.file;
+package gnu.java.net.protocol.file;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.io.IOException;
 
 /**
  * @author Warren Levy <warrenl@cygnus.com>
diff --git a/libjava/gnu/gcj/protocol/gcjlib/Connection.java b/libjava/gnu/java/net/protocol/gcjlib/Connection.java
index 0b763571f9c..b31db565776 100644
--- a/libjava/gnu/gcj/protocol/gcjlib/Connection.java
+++ b/libjava/gnu/java/net/protocol/gcjlib/Connection.java
@@ -9,18 +9,21 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.gcjlib;
-import java.io.*;
-import java.net.*;
+package gnu.java.net.protocol.gcjlib;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import gnu.gcj.Core;
-import gnu.gcj.protocol.core.CoreInputStream;
 import gnu.gcj.runtime.SharedLibHelper;
+import gnu.java.net.protocol.core.CoreInputStream;
 
 /**
  * @author Tom Tromey <tromey@redhat.com>
  * @date January 10, 2003
  */
-
 class Connection extends URLConnection
 {
   String solib;
@@ -30,12 +33,13 @@ class Connection extends URLConnection
   public Connection (URL url) throws MalformedURLException
   {
     super (url);
-    int index = url.getFile().indexOf("!/");
+    int index = url.getFile().indexOf ("!/");
+    
     if (index == -1)
-      throw new MalformedURLException("couldn't find !/ in gcjlib URL");
+      throw new MalformedURLException ("couldn't find !/ in gcjlib URL");
 
-    name = url.getFile().substring(index + 2);
-    solib = url.getFile().substring(0, index);
+    name = url.getFile().substring (index + 2);
+    solib = url.getFile().substring (0, index);
   }
 
   public void connect() throws IOException
diff --git a/libjava/gnu/gcj/protocol/gcjlib/Handler.java b/libjava/gnu/java/net/protocol/gcjlib/Handler.java
index fe767cd6ee4..60f5bcc2518 100644
--- a/libjava/gnu/gcj/protocol/gcjlib/Handler.java
+++ b/libjava/gnu/java/net/protocol/gcjlib/Handler.java
@@ -8,17 +8,17 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.gcjlib;
+package gnu.java.net.protocol.gcjlib;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.io.IOException;
 
 public class Handler extends URLStreamHandler
 {
-  protected URLConnection openConnection(URL url) throws IOException
+  protected URLConnection openConnection (URL url) throws IOException
   {
-    return new Connection(url);
+    return new Connection (url);
   }
 }
diff --git a/libjava/gnu/gcj/protocol/http/Connection.java b/libjava/gnu/java/net/protocol/http/Connection.java
index 1a6fc0105f9..990287db228 100644
--- a/libjava/gnu/gcj/protocol/http/Connection.java
+++ b/libjava/gnu/java/net/protocol/http/Connection.java
@@ -8,21 +8,25 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.http;
-
-import java.net.*;
-import java.io.*;
+package gnu.java.net.protocol.http;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.ProtocolException;
+import java.net.Socket;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
 
 /**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date March 29, 1999.
- */
-
-/**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status: Minimal subset of functionality.  Proxies only partially
@@ -32,6 +36,10 @@ import java.util.Enumeration;
  * doOutput.
  */
 
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 29, 1999.
+ */
 class Connection extends HttpURLConnection
 {
   protected Socket sock = null;
@@ -233,7 +241,7 @@ class Connection extends HttpURLConnection
 	}
 
     if (n < hdrVec.size())
-      return getField((String) hdrVec.elementAt(n));
+      return getField ((String) hdrVec.elementAt(n));
     return null;
   }
 
@@ -251,7 +259,7 @@ class Connection extends HttpURLConnection
 	}
 
     if (n < hdrVec.size())
-      return getKey((String) hdrVec.elementAt(n));
+      return getKey ((String) hdrVec.elementAt(n));
     return null;
   }
 
diff --git a/libjava/gnu/gcj/protocol/http/Handler.java b/libjava/gnu/java/net/protocol/http/Handler.java
index 608d07eda02..e1184bbc4af 100644
--- a/libjava/gnu/gcj/protocol/http/Handler.java
+++ b/libjava/gnu/java/net/protocol/http/Handler.java
@@ -8,18 +8,12 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.http;
+package gnu.java.net.protocol.http;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.io.IOException;
-
-/**
- * @author Warren Levy
- * @author Anthony Green <green@redhat.com>
- * @date March 26, 1999.
- */
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -27,14 +21,19 @@ import java.io.IOException;
  * Status:  Minimal functionality.
  */
 
+/**
+ * @author Warren Levy
+ * @author Anthony Green <green@redhat.com>
+ * @date March 26, 1999.
+ */
 public class Handler extends URLStreamHandler
 {
-  protected URLConnection openConnection(URL url) throws IOException
+  protected URLConnection openConnection (URL url) throws IOException
   {
-    return new Connection(url);
+    return new Connection (url);
   }
 
-  protected int getDefaultPort ()
+  protected int getDefaultPort()
   {
     return 80;
   }
diff --git a/libjava/gnu/gcj/protocol/jar/Connection.java b/libjava/gnu/java/net/protocol/jar/Connection.java
index c9db04997dc..19e8ab719c4 100644
--- a/libjava/gnu/gcj/protocol/jar/Connection.java
+++ b/libjava/gnu/java/net/protocol/jar/Connection.java
@@ -6,21 +6,21 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.jar;
+package gnu.java.net.protocol.jar;
 
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.JarURLConnection;
-import java.net.URLStreamHandler;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.io.IOException;
 import java.io.InputStream;
+import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.net.JarURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.util.Hashtable;
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
-import java.util.Hashtable;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification.
@@ -28,9 +28,6 @@ import java.util.Hashtable;
  * @author Kresten Krab Thorup <krab@gnu.org>
  * @date Aug 10, 1999.
  */
-
-
-
 public class Connection extends JarURLConnection 
 {
   static Hashtable file_cache = new Hashtable();
@@ -53,22 +50,22 @@ public class Connection extends JarURLConnection
     if (jarfile != null)
       return jarfile;
 
-    URL jarFileURL = getJarFileURL ();
+    URL jarFileURL = getJarFileURL();
 
-    if (jarFileURL.getProtocol ().equals ("file")
-	&& jarFileURL.getHost ().equals (""))
+    if (jarFileURL.getProtocol().equals ("file")
+	&& jarFileURL.getHost().equals (""))
       {
 	if (getUseCaches())
 	  {
 	    jarfile = (JarFile) file_cache.get(jarFileURL);
 	    if (jarfile == null)
 	      {
-		jarfile = new JarFile (jarFileURL.getFile ());
+		jarfile = new JarFile (jarFileURL.getFile());
 		file_cache.put (jarFileURL, jarfile);
 	      }
 	  }
 	else
-	  jarfile = new JarFile (jarFileURL.getFile ());
+	  jarfile = new JarFile (jarFileURL.getFile());
       }
     else
       {
@@ -78,7 +75,7 @@ public class Connection extends JarURLConnection
 	File f = File.createTempFile("cache", "jar");
 	FileOutputStream fos = new FileOutputStream(f);
 	int len = 0;
-	while((len = is.read(buf)) != -1)
+	while ((len = is.read(buf)) != -1)
 	  fos.write(buf, 0, len);
         fos.close();
 	// Always verify the Manifest, open read only and delete when done.
diff --git a/libjava/gnu/gcj/protocol/jar/Handler.java b/libjava/gnu/java/net/protocol/jar/Handler.java
index 2bb6aaebf85..e19a5cfc954 100644
--- a/libjava/gnu/gcj/protocol/jar/Handler.java
+++ b/libjava/gnu/java/net/protocol/jar/Handler.java
@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-package gnu.gcj.protocol.jar;
+package gnu.java.net.protocol.jar;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.io.IOException;
 
 /**
  * @author Kresten Krab Thorup <krab@gnu.org>
  * @date August 13, 1999.
  */
-
 public class Handler extends URLStreamHandler
 {
   protected URLConnection openConnection(URL url) throws IOException