2003-10-08 Michael Koch <konqueror@gmx.de>
+ * gnu/gcj/protocol/core/Connection.java,
+ gnu/gcj/protocol/core/CoreInputStream.java,
+ gnu/gcj/protocol/core/Handler.java,
+ gnu/gcj/protocol/core/natCoreInputStream.cc,
+ gnu/gcj/protocol/file/Connection.java,
+ gnu/gcj/protocol/file/Handler.java,
+ gnu/gcj/protocol/gcjlib/Connection.java,
+ gnu/gcj/protocol/gcjlib/Handler.java,
+ gnu/gcj/protocol/http/Connection.java,
+ gnu/gcj/protocol/http/Handler.java,
+ gnu/gcj/protocol/jar/Connection.java,
+ gnu/gcj/protocol/jar/Handler.java: Moved to gnu/java/net/protocol.
+ * gnu/java/net/protocol/core/Connection.java,
+ gnu/java/net/protocol/core/CoreInputStream.java,
+ gnu/java/net/protocol/core/Handler.java,
+ gnu/java/net/protocol/core/natCoreInputStream.cc,
+ gnu/java/net/protocol/file/Connection.java,
+ gnu/java/net/protocol/file/Handler.java,
+ gnu/java/net/protocol/gcjlib/Connection.java,
+ gnu/java/net/protocol/gcjlib/Handler.java,
+ gnu/java/net/protocol/http/Connection.java,
+ gnu/java/net/protocol/http/Handler.java,
+ gnu/java/net/protocol/jar/Connection.java,
+ gnu/java/net/protocol/jar/Handler.java: Moved from gnu/gcj/protocol.
+ * gnu/gcj/runtime/FirstThread.java,
+ java/net/URL.java: Use moved protocol handlers.
+ * Makefile.am
+ (ordinary_java_source_files): Moved files.
+ (nat_source_files): Likewise.
+ * Makefile.in: Regenerated.
+
+2003-10-08 Michael Koch <konqueror@gmx.de>
+
* gnu/java/nio/SocketChannelImpl.java
(read): Write only read data to buffer.
gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java \
-gnu/gcj/protocol/core/Connection.java \
-gnu/gcj/protocol/core/Handler.java \
-gnu/gcj/protocol/core/CoreInputStream.java \
-gnu/gcj/protocol/file/Connection.java \
-gnu/gcj/protocol/file/Handler.java \
-gnu/gcj/protocol/http/Connection.java \
-gnu/gcj/protocol/http/Handler.java \
-gnu/gcj/protocol/jar/Connection.java \
-gnu/gcj/protocol/jar/Handler.java \
-gnu/gcj/protocol/gcjlib/Connection.java \
-gnu/gcj/protocol/gcjlib/Handler.java \
gnu/gcj/runtime/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/FirstThread.java \
gnu/java/math/MPN.java \
gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.java \
+gnu/java/net/protocol/core/Connection.java \
+gnu/java/net/protocol/core/Handler.java \
+gnu/java/net/protocol/core/CoreInputStream.java \
+gnu/java/net/protocol/file/Connection.java \
+gnu/java/net/protocol/file/Handler.java \
+gnu/java/net/protocol/http/Connection.java \
+gnu/java/net/protocol/http/Handler.java \
+gnu/java/net/protocol/jar/Connection.java \
+gnu/java/net/protocol/jar/Handler.java \
+gnu/java/net/protocol/gcjlib/Connection.java \
+gnu/java/net/protocol/gcjlib/Handler.java \
gnu/java/nio/DatagramChannelImpl.java \
gnu/java/nio/DatagramChannelSelectionKey.java \
gnu/java/nio/FileLockImpl.java \
gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \
-gnu/gcj/protocol/core/natCoreInputStream.cc \
gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natFirstThread.cc \
gnu/gcj/runtime/natNameFinder.cc \
gnu/java/awt/natEmbeddedWindow.cc \
gnu/java/net/natPlainDatagramSocketImpl.cc \
gnu/java/net/natPlainSocketImpl.cc \
+gnu/java/net/protocol/core/natCoreInputStream.cc \
gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natSelectorImpl.cc \
java/io/natFile.cc \
gnu/java/net/PlainSocketImpl$$SocketInputStream.h \
gnu/java/net/PlainSocketImpl$$SocketOutputStream.h
+
nat_headers = $(ordinary_nat_headers) $(inner_nat_headers)
x_nat_headers = $(x_java_source_files:.java=.h)
gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java \
-gnu/gcj/protocol/core/Connection.java \
-gnu/gcj/protocol/core/Handler.java \
-gnu/gcj/protocol/core/CoreInputStream.java \
-gnu/gcj/protocol/file/Connection.java \
-gnu/gcj/protocol/file/Handler.java \
-gnu/gcj/protocol/http/Connection.java \
-gnu/gcj/protocol/http/Handler.java \
-gnu/gcj/protocol/jar/Connection.java \
-gnu/gcj/protocol/jar/Handler.java \
-gnu/gcj/protocol/gcjlib/Connection.java \
-gnu/gcj/protocol/gcjlib/Handler.java \
gnu/gcj/runtime/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/FirstThread.java \
gnu/java/math/MPN.java \
gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.java \
+gnu/java/net/protocol/core/Connection.java \
+gnu/java/net/protocol/core/Handler.java \
+gnu/java/net/protocol/core/CoreInputStream.java \
+gnu/java/net/protocol/file/Connection.java \
+gnu/java/net/protocol/file/Handler.java \
+gnu/java/net/protocol/http/Connection.java \
+gnu/java/net/protocol/http/Handler.java \
+gnu/java/net/protocol/jar/Connection.java \
+gnu/java/net/protocol/jar/Handler.java \
+gnu/java/net/protocol/gcjlib/Connection.java \
+gnu/java/net/protocol/gcjlib/Handler.java \
gnu/java/nio/DatagramChannelImpl.java \
gnu/java/nio/DatagramChannelSelectionKey.java \
gnu/java/nio/FileLockImpl.java \
gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \
-gnu/gcj/protocol/core/natCoreInputStream.cc \
gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natFirstThread.cc \
gnu/gcj/runtime/natNameFinder.cc \
gnu/java/awt/natEmbeddedWindow.cc \
gnu/java/net/natPlainDatagramSocketImpl.cc \
gnu/java/net/natPlainSocketImpl.cc \
+gnu/java/net/protocol/core/natCoreInputStream.cc \
gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natSelectorImpl.cc \
java/io/natFile.cc \
gnu/gcj/convert/natIconv.lo gnu/gcj/convert/natInput_EUCJIS.lo \
gnu/gcj/convert/natInput_SJIS.lo gnu/gcj/convert/natOutput_EUCJIS.lo \
gnu/gcj/convert/natOutput_SJIS.lo gnu/gcj/io/natSimpleSHSStream.lo \
-gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \
-gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \
-gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \
-gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \
-gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \
+gnu/gcj/io/shs.lo gnu/gcj/runtime/natFinalizerThread.lo \
+gnu/gcj/runtime/natFirstThread.lo gnu/gcj/runtime/natNameFinder.lo \
+gnu/gcj/runtime/natSharedLibLoader.lo gnu/gcj/runtime/natStackTrace.lo \
+gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/runtime/natVMClassLoader.lo \
+gnu/java/awt/natEmbeddedWindow.lo \
gnu/java/net/natPlainDatagramSocketImpl.lo \
-gnu/java/net/natPlainSocketImpl.lo gnu/java/nio/natFileLockImpl.lo \
-gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \
-java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \
-java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
-java/lang/natClass.lo java/lang/natClassLoader.lo \
-java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
-java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \
-java/lang/natRuntime.lo java/lang/natString.lo \
+gnu/java/net/natPlainSocketImpl.lo \
+gnu/java/net/protocol/core/natCoreInputStream.lo \
+gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \
+java/io/natFile.lo java/io/natFileDescriptor.lo \
+java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
+java/lang/natCharacter.lo java/lang/natClass.lo \
+java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
+java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
+java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \
java/lang/natStringBuffer.lo java/lang/natSystem.lo \
java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
.deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \
.deps/gnu/gcj/io/SimpleSHSStream.P \
.deps/gnu/gcj/io/natSimpleSHSStream.P .deps/gnu/gcj/io/shs.P \
-.deps/gnu/gcj/natCore.P .deps/gnu/gcj/protocol/core/Connection.P \
-.deps/gnu/gcj/protocol/core/CoreInputStream.P \
-.deps/gnu/gcj/protocol/core/Handler.P \
-.deps/gnu/gcj/protocol/core/natCoreInputStream.P \
-.deps/gnu/gcj/protocol/file/Connection.P \
-.deps/gnu/gcj/protocol/file/Handler.P \
-.deps/gnu/gcj/protocol/gcjlib/Connection.P \
-.deps/gnu/gcj/protocol/gcjlib/Handler.P \
-.deps/gnu/gcj/protocol/http/Connection.P \
-.deps/gnu/gcj/protocol/http/Handler.P \
-.deps/gnu/gcj/protocol/jar/Connection.P \
-.deps/gnu/gcj/protocol/jar/Handler.P \
-.deps/gnu/gcj/runtime/FileDeleter.P \
+.deps/gnu/gcj/natCore.P .deps/gnu/gcj/runtime/FileDeleter.P \
.deps/gnu/gcj/runtime/FinalizerThread.P \
.deps/gnu/gcj/runtime/FirstThread.P .deps/gnu/gcj/runtime/JNIWeakRef.P \
.deps/gnu/gcj/runtime/MethodRef.P .deps/gnu/gcj/runtime/NameFinder.P \
.deps/gnu/java/net/PlainSocketImpl.P \
.deps/gnu/java/net/natPlainDatagramSocketImpl.P \
.deps/gnu/java/net/natPlainSocketImpl.P \
+.deps/gnu/java/net/protocol/core/Connection.P \
+.deps/gnu/java/net/protocol/core/CoreInputStream.P \
+.deps/gnu/java/net/protocol/core/Handler.P \
+.deps/gnu/java/net/protocol/core/natCoreInputStream.P \
+.deps/gnu/java/net/protocol/file/Connection.P \
+.deps/gnu/java/net/protocol/file/Handler.P \
+.deps/gnu/java/net/protocol/gcjlib/Connection.P \
+.deps/gnu/java/net/protocol/gcjlib/Handler.P \
+.deps/gnu/java/net/protocol/http/Connection.P \
+.deps/gnu/java/net/protocol/http/Handler.P \
+.deps/gnu/java/net/protocol/jar/Connection.P \
+.deps/gnu/java/net/protocol/jar/Handler.P \
.deps/gnu/java/nio/DatagramChannelImpl.P \
.deps/gnu/java/nio/DatagramChannelSelectionKey.P \
.deps/gnu/java/nio/FileLockImpl.P .deps/gnu/java/nio/NIOConstants.P \
// 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;
}
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;
private Core core;
- public Connection(URL url)
+ public Connection (URL url)
{
super(url);
}
return null;
}
if (n < hdrVec.size())
- return getField((String) hdrVec.elementAt(n));
+ return getField ((String) hdrVec.elementAt(n));
return null;
}
return null;
}
if (n < hdrVec.size())
- return getKey((String) hdrVec.elementAt(n));
+ return getKey ((String) hdrVec.elementAt(n));
return null;
}
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
{
// 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;
}
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
#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);
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;
return null;
}
if (n < hdrVec.size())
- return getField((String) hdrVec.elementAt(n));
+ return getField ((String) hdrVec.elementAt(n));
return null;
}
return null;
}
if (n < hdrVec.size())
- return getKey((String) hdrVec.elementAt(n));
+ return getKey ((String) hdrVec.elementAt(n));
return null;
}
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>
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;
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
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);
}
}
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
* doOutput.
*/
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 29, 1999.
+ */
class Connection extends HttpURLConnection
{
protected Socket sock = null;
}
if (n < hdrVec.size())
- return getField((String) hdrVec.elementAt(n));
+ return getField ((String) hdrVec.elementAt(n));
return null;
}
}
if (n < hdrVec.size())
- return getKey((String) hdrVec.elementAt(n));
+ return getKey ((String) hdrVec.elementAt(n));
return null;
}
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
* 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;
}
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.
* @author Kresten Krab Thorup <krab@gnu.org>
* @date Aug 10, 1999.
*/
-
-
-
public class Connection extends JarURLConnection
{
static Hashtable file_cache = new Hashtable();
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
{
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.
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
public final class URL implements Serializable
{
private static final String DEFAULT_SEARCH_PATH =
- "gnu.gcj.protocol|sun.net.www.protocol";
+ "gnu.java.net.protocol|sun.net.www.protocol";
/**
* The name of the protocol for this URL.
}
else if (protocol.equals ("core"))
{
- ph = new gnu.gcj.protocol.core.Handler();
+ ph = new gnu.java.net.protocol.core.Handler();
}
else if (protocol.equals ("file"))
{
// This is an interesting case. It's tempting to think that we
- // could call Class.forName ("gnu.gcj.protocol.file.Handler") to
+ // could call Class.forName ("gnu.java.net.protocol.file.Handler") to
// get the appropriate class. Unfortunately, if we do that the
// program will never terminate, because getURLStreamHandler is
// eventually called by Class.forName.
// fix this problem. If other protocols are required in a
// statically linked application they will need to be handled in
// the same way as "file".
- ph = new gnu.gcj.protocol.file.Handler();
+ ph = new gnu.java.net.protocol.file.Handler();
}
// Non-default factory may have returned null or a factory wasn't set.
OSDN Git Service
