Skip to content

R
riscv-gcc-1
Commit 85aa13b2 by Michael Koch Committed by Michael Koch
Options

Connection.java, [...]: Moved to gnu/java/net/protocol. 

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.

From-SVN: r72233
parent 36805693
Showing with 199 additions and 143 deletions
libjava/ChangeLog
2003-10-08 Michael Koch <konqueror@gmx.de> 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 * gnu/java/nio/SocketChannelImpl.java
(read): Write only read data to buffer. (read): Write only read data to buffer.
......
libjava/Makefile.am
...@@ -2009,17 +2009,6 @@ gnu/gcj/RawData.java \ ...@@ -2009,17 +2009,6 @@ gnu/gcj/RawData.java \
gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \ gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.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/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \ gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/FirstThread.java \ gnu/gcj/runtime/FirstThread.java \
...@@ -2182,6 +2171,17 @@ gnu/java/locale/LocaleInformation_zh_TW.java \ ...@@ -2182,6 +2171,17 @@ gnu/java/locale/LocaleInformation_zh_TW.java \
gnu/java/math/MPN.java \ gnu/java/math/MPN.java \
gnu/java/net/PlainDatagramSocketImpl.java \ gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.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/DatagramChannelImpl.java \
gnu/java/nio/DatagramChannelSelectionKey.java \ gnu/java/nio/DatagramChannelSelectionKey.java \
gnu/java/nio/FileLockImpl.java \ gnu/java/nio/FileLockImpl.java \
...@@ -2645,7 +2645,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \ ...@@ -2645,7 +2645,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \ gnu/gcj/io/shs.cc \
gnu/gcj/protocol/core/natCoreInputStream.cc \
gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natFirstThread.cc \
gnu/gcj/runtime/natNameFinder.cc \ gnu/gcj/runtime/natNameFinder.cc \
...@@ -2656,6 +2655,7 @@ gnu/gcj/runtime/natVMClassLoader.cc \ ...@@ -2656,6 +2655,7 @@ gnu/gcj/runtime/natVMClassLoader.cc \
gnu/java/awt/natEmbeddedWindow.cc \ gnu/java/awt/natEmbeddedWindow.cc \
gnu/java/net/natPlainDatagramSocketImpl.cc \ gnu/java/net/natPlainDatagramSocketImpl.cc \
gnu/java/net/natPlainSocketImpl.cc \ gnu/java/net/natPlainSocketImpl.cc \
gnu/java/net/protocol/core/natCoreInputStream.cc \
gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natSelectorImpl.cc \ gnu/java/nio/natSelectorImpl.cc \
java/io/natFile.cc \ java/io/natFile.cc \
......
libjava/Makefile.in
...@@ -448,6 +448,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ ...@@ -448,6 +448,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ gnu/java/net/PlainSocketImpl$$SocketInputStream.h \
gnu/java/net/PlainSocketImpl$$SocketOutputStream.h gnu/java/net/PlainSocketImpl$$SocketOutputStream.h
nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers = $(ordinary_nat_headers) $(inner_nat_headers)
x_nat_headers = $(x_java_source_files:.java=.h) x_nat_headers = $(x_java_source_files:.java=.h)
...@@ -1727,17 +1728,6 @@ gnu/gcj/RawData.java \ ...@@ -1727,17 +1728,6 @@ gnu/gcj/RawData.java \
gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \ gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.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/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \ gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/FirstThread.java \ gnu/gcj/runtime/FirstThread.java \
...@@ -1900,6 +1890,17 @@ gnu/java/locale/LocaleInformation_zh_TW.java \ ...@@ -1900,6 +1890,17 @@ gnu/java/locale/LocaleInformation_zh_TW.java \
gnu/java/math/MPN.java \ gnu/java/math/MPN.java \
gnu/java/net/PlainDatagramSocketImpl.java \ gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.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/DatagramChannelImpl.java \
gnu/java/nio/DatagramChannelSelectionKey.java \ gnu/java/nio/DatagramChannelSelectionKey.java \
gnu/java/nio/FileLockImpl.java \ gnu/java/nio/FileLockImpl.java \
...@@ -2362,7 +2363,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \ ...@@ -2362,7 +2363,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \ gnu/gcj/io/shs.cc \
gnu/gcj/protocol/core/natCoreInputStream.cc \
gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natFirstThread.cc \
gnu/gcj/runtime/natNameFinder.cc \ gnu/gcj/runtime/natNameFinder.cc \
...@@ -2373,6 +2373,7 @@ gnu/gcj/runtime/natVMClassLoader.cc \ ...@@ -2373,6 +2373,7 @@ gnu/gcj/runtime/natVMClassLoader.cc \
gnu/java/awt/natEmbeddedWindow.cc \ gnu/java/awt/natEmbeddedWindow.cc \
gnu/java/net/natPlainDatagramSocketImpl.cc \ gnu/java/net/natPlainDatagramSocketImpl.cc \
gnu/java/net/natPlainSocketImpl.cc \ gnu/java/net/natPlainSocketImpl.cc \
gnu/java/net/protocol/core/natCoreInputStream.cc \
gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natSelectorImpl.cc \ gnu/java/nio/natSelectorImpl.cc \
java/io/natFile.cc \ java/io/natFile.cc \
...@@ -2543,20 +2544,21 @@ gnu/gcj/convert/JIS0212_to_Unicode.lo gnu/gcj/convert/Unicode_to_JIS.lo \ ...@@ -2543,20 +2544,21 @@ gnu/gcj/convert/JIS0212_to_Unicode.lo gnu/gcj/convert/Unicode_to_JIS.lo \
gnu/gcj/convert/natIconv.lo gnu/gcj/convert/natInput_EUCJIS.lo \ 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/natInput_SJIS.lo gnu/gcj/convert/natOutput_EUCJIS.lo \
gnu/gcj/convert/natOutput_SJIS.lo gnu/gcj/io/natSimpleSHSStream.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/io/shs.lo gnu/gcj/runtime/natFinalizerThread.lo \
gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \ gnu/gcj/runtime/natFirstThread.lo gnu/gcj/runtime/natNameFinder.lo \
gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natSharedLibLoader.lo gnu/gcj/runtime/natStackTrace.lo \
gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \ gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/runtime/natVMClassLoader.lo \
gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \ gnu/java/awt/natEmbeddedWindow.lo \
gnu/java/net/natPlainDatagramSocketImpl.lo \ gnu/java/net/natPlainDatagramSocketImpl.lo \
gnu/java/net/natPlainSocketImpl.lo gnu/java/nio/natFileLockImpl.lo \ gnu/java/net/natPlainSocketImpl.lo \
gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \ gnu/java/net/protocol/core/natCoreInputStream.lo \
java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \
java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \ java/io/natFile.lo java/io/natFileDescriptor.lo \
java/lang/natClass.lo java/lang/natClassLoader.lo \ java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ java/lang/natCharacter.lo java/lang/natClass.lo \
java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \ java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
java/lang/natRuntime.lo java/lang/natString.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/natStringBuffer.lo java/lang/natSystem.lo \
java/lang/natThread.lo java/lang/natVMSecurityManager.lo \ java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \ java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
...@@ -2766,19 +2768,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ ...@@ -2766,19 +2768,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \ .deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \
.deps/gnu/gcj/io/SimpleSHSStream.P \ .deps/gnu/gcj/io/SimpleSHSStream.P \
.deps/gnu/gcj/io/natSimpleSHSStream.P .deps/gnu/gcj/io/shs.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/natCore.P .deps/gnu/gcj/runtime/FileDeleter.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/runtime/FinalizerThread.P \ .deps/gnu/gcj/runtime/FinalizerThread.P \
.deps/gnu/gcj/runtime/FirstThread.P .deps/gnu/gcj/runtime/JNIWeakRef.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/gcj/runtime/MethodRef.P .deps/gnu/gcj/runtime/NameFinder.P \
...@@ -3027,6 +3017,18 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ ...@@ -3027,6 +3017,18 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/gnu/java/net/PlainSocketImpl.P \ .deps/gnu/java/net/PlainSocketImpl.P \
.deps/gnu/java/net/natPlainDatagramSocketImpl.P \ .deps/gnu/java/net/natPlainDatagramSocketImpl.P \
.deps/gnu/java/net/natPlainSocketImpl.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/DatagramChannelImpl.P \
.deps/gnu/java/nio/DatagramChannelSelectionKey.P \ .deps/gnu/java/nio/DatagramChannelSelectionKey.P \
.deps/gnu/java/nio/FileLockImpl.P .deps/gnu/java/nio/NIOConstants.P \ .deps/gnu/java/nio/FileLockImpl.P .deps/gnu/java/nio/NIOConstants.P \
......
libjava/gnu/gcj/runtime/FirstThread.java
...@@ -90,7 +90,7 @@ final class FirstThread extends Thread ...@@ -90,7 +90,7 @@ final class FirstThread extends Thread
// classes are only referred to via Class.forName(), so we add an // classes are only referred to via Class.forName(), so we add an
// explicit mention of them here. // explicit mention of them here.
static final Class Kcert = java.security.cert.Certificate.class; static final Class Kcert = java.security.cert.Certificate.class;
static final Class Kfile = gnu.gcj.protocol.file.Handler.class; static final Class Kfile = gnu.java.net.protocol.file.Handler.class;
static final Class Khttp = gnu.gcj.protocol.http.Handler.class; static final Class Khttp = gnu.java.net.protocol.http.Handler.class;
static final Class Kjar = gnu.gcj.protocol.jar.Handler.class; static final Class Kjar = gnu.java.net.protocol.jar.Handler.class;
} }
libjava/gnu/gcj/protocol/core/Connection.java → libjava/gnu/java/net/protocol/core/Connection.java
...@@ -8,11 +8,14 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,11 +8,14 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.core; package gnu.java.net.protocol.core;
import gnu.gcj.Core; import gnu.gcj.Core;
import java.net.*; import java.io.InputStream;
import java.io.*; import java.io.IOException;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Map; import java.util.Map;
import java.util.Vector; import java.util.Vector;
import java.util.Hashtable; import java.util.Hashtable;
...@@ -31,7 +34,7 @@ class Connection extends URLConnection ...@@ -31,7 +34,7 @@ class Connection extends URLConnection
private Core core; private Core core;
public Connection(URL url) public Connection (URL url)
{ {
super(url); super(url);
} }
...@@ -98,7 +101,7 @@ class Connection extends URLConnection ...@@ -98,7 +101,7 @@ class Connection extends URLConnection
return null; return null;
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n)); return getField ((String) hdrVec.elementAt(n));
return null; return null;
} }
...@@ -115,7 +118,7 @@ class Connection extends URLConnection ...@@ -115,7 +118,7 @@ class Connection extends URLConnection
return null; return null;
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n)); return getKey ((String) hdrVec.elementAt(n));
return null; return null;
} }
......
libjava/gnu/gcj/protocol/core/CoreInputStream.java → libjava/gnu/java/net/protocol/core/CoreInputStream.java
...@@ -8,11 +8,12 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,11 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.core; package gnu.java.net.protocol.core;
import java.io.*;
import gnu.gcj.Core; import gnu.gcj.Core;
import gnu.gcj.RawData; import gnu.gcj.RawData;
import java.io.InputStream;
import java.io.IOException;
public class CoreInputStream extends InputStream public class CoreInputStream extends InputStream
{ {
...@@ -82,7 +83,7 @@ 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 // 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 // ints will always fit in an int. Since we have to return a long
// anyway, numBytes might as well just be 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; pos += numBytes;
return numBytes; return numBytes;
} }
......
libjava/gnu/gcj/protocol/core/Handler.java → libjava/gnu/java/net/protocol/core/Handler.java
...@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.core; package gnu.java.net.protocol.core;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;
import java.io.IOException;
/** /**
* @author Anthony Green <green@redhat.com> * @author Anthony Green <green@redhat.com>
* @date August 13, 2001. * @date August 13, 2001.
*/ */
public class Handler extends URLStreamHandler public class Handler extends URLStreamHandler
{ {
protected URLConnection openConnection(URL url) throws IOException protected URLConnection openConnection(URL url) throws IOException
......
libjava/gnu/gcj/protocol/core/natCoreInputStream.cc → libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
...@@ -18,28 +18,30 @@ details. */ ...@@ -18,28 +18,30 @@ details. */
#include <java/lang/NullPointerException.h> #include <java/lang/NullPointerException.h>
#include <java/lang/ArrayIndexOutOfBoundsException.h> #include <java/lang/ArrayIndexOutOfBoundsException.h>
#include <gnu/gcj/protocol/core/CoreInputStream.h> #include <gnu/java/net/protocol/core/CoreInputStream.h>
jint 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 jint
gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest, gnu::java::net::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
jint offset, jint offset,
jint numBytes) jint numBytes)
{ {
if (! dest) if (!dest)
throw new java::lang::NullPointerException; throw new ::java::lang::NullPointerException;
jsize destSize = JvGetArrayLength (dest); jsize destSize = JvGetArrayLength (dest);
if (offset < 0 || numBytes < 0 || offset + numBytes < 0 if (offset < 0 || numBytes < 0 || offset + numBytes < 0
|| offset + numBytes > destSize || offset + numBytes > destSize
|| pos + numBytes > count) || 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); void *pdest = (void *) (elements (dest) + offset);
memcpy (pdest, pcore, numBytes); memcpy (pdest, pcore, numBytes);
......
libjava/gnu/gcj/protocol/file/Connection.java → libjava/gnu/java/net/protocol/file/Connection.java
...@@ -8,10 +8,19 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,10 +8,19 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.file; package gnu.java.net.protocol.file;
import java.net.*; import java.io.BufferedInputStream;
import java.io.*; 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.Map;
import java.util.Vector; import java.util.Vector;
import java.util.Hashtable; import java.util.Hashtable;
...@@ -122,7 +131,7 @@ class Connection extends URLConnection ...@@ -122,7 +131,7 @@ class Connection extends URLConnection
return null; return null;
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n)); return getField ((String) hdrVec.elementAt(n));
return null; return null;
} }
...@@ -139,7 +148,7 @@ class Connection extends URLConnection ...@@ -139,7 +148,7 @@ class Connection extends URLConnection
return null; return null;
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n)); return getKey ((String) hdrVec.elementAt(n));
return null; return null;
} }
......
libjava/gnu/gcj/protocol/file/Handler.java → libjava/gnu/java/net/protocol/file/Handler.java
...@@ -8,12 +8,12 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,12 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.file; package gnu.java.net.protocol.file;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;
import java.io.IOException;
/** /**
* @author Warren Levy <warrenl@cygnus.com> * @author Warren Levy <warrenl@cygnus.com>
......
libjava/gnu/gcj/protocol/gcjlib/Connection.java → libjava/gnu/java/net/protocol/gcjlib/Connection.java
...@@ -9,18 +9,21 @@ This software is copyrighted work licensed under the terms of the ...@@ -9,18 +9,21 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.gcjlib; package gnu.java.net.protocol.gcjlib;
import java.io.*;
import java.net.*; 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.Core;
import gnu.gcj.protocol.core.CoreInputStream;
import gnu.gcj.runtime.SharedLibHelper; import gnu.gcj.runtime.SharedLibHelper;
import gnu.java.net.protocol.core.CoreInputStream;
/** /**
* @author Tom Tromey <tromey@redhat.com> * @author Tom Tromey <tromey@redhat.com>
* @date January 10, 2003 * @date January 10, 2003
*/ */
class Connection extends URLConnection class Connection extends URLConnection
{ {
String solib; String solib;
...@@ -30,12 +33,13 @@ class Connection extends URLConnection ...@@ -30,12 +33,13 @@ class Connection extends URLConnection
public Connection (URL url) throws MalformedURLException public Connection (URL url) throws MalformedURLException
{ {
super (url); super (url);
int index = url.getFile().indexOf("!/"); int index = url.getFile().indexOf ("!/");
if (index == -1) 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); name = url.getFile().substring (index + 2);
solib = url.getFile().substring(0, index); solib = url.getFile().substring (0, index);
} }
public void connect() throws IOException public void connect() throws IOException
......
libjava/gnu/gcj/protocol/gcjlib/Handler.java → libjava/gnu/java/net/protocol/gcjlib/Handler.java
...@@ -8,17 +8,17 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,17 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.gcjlib; package gnu.java.net.protocol.gcjlib;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;
import java.io.IOException;
public class Handler extends URLStreamHandler 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);
} }
} }
libjava/gnu/gcj/protocol/http/Connection.java → libjava/gnu/java/net/protocol/http/Connection.java
...@@ -8,21 +8,25 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,21 +8,25 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.http; package gnu.java.net.protocol.http;
import java.net.*; import java.io.BufferedInputStream;
import java.io.*; 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.Map;
import java.util.Vector; import java.util.Vector;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Enumeration; 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 * Written using on-line Java Platform 1.2 API Specification, as well
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
* Status: Minimal subset of functionality. Proxies only partially * Status: Minimal subset of functionality. Proxies only partially
...@@ -32,6 +36,10 @@ import java.util.Enumeration; ...@@ -32,6 +36,10 @@ import java.util.Enumeration;
* doOutput. * doOutput.
*/ */
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 29, 1999.
*/
class Connection extends HttpURLConnection class Connection extends HttpURLConnection
{ {
protected Socket sock = null; protected Socket sock = null;
...@@ -233,7 +241,7 @@ class Connection extends HttpURLConnection ...@@ -233,7 +241,7 @@ class Connection extends HttpURLConnection
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n)); return getField ((String) hdrVec.elementAt(n));
return null; return null;
} }
...@@ -251,7 +259,7 @@ class Connection extends HttpURLConnection ...@@ -251,7 +259,7 @@ class Connection extends HttpURLConnection
} }
if (n < hdrVec.size()) if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n)); return getKey ((String) hdrVec.elementAt(n));
return null; return null;
} }
......
libjava/gnu/gcj/protocol/http/Handler.java → libjava/gnu/java/net/protocol/http/Handler.java
...@@ -8,18 +8,12 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,18 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.http; package gnu.java.net.protocol.http;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLStreamHandler; 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 * Written using on-line Java Platform 1.2 API Specification, as well
...@@ -27,14 +21,19 @@ import java.io.IOException; ...@@ -27,14 +21,19 @@ import java.io.IOException;
* Status: Minimal functionality. * Status: Minimal functionality.
*/ */
/**
* @author Warren Levy
* @author Anthony Green <green@redhat.com>
* @date March 26, 1999.
*/
public class Handler extends URLStreamHandler 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; return 80;
} }
......
libjava/gnu/gcj/protocol/jar/Connection.java → libjava/gnu/java/net/protocol/jar/Connection.java
...@@ -6,21 +6,21 @@ This software is copyrighted work licensed under the terms of the ...@@ -6,21 +6,21 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ 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.InputStream;
import java.io.IOException;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; 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.jar.JarFile;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import java.util.Hashtable;
/** /**
* Written using on-line Java Platform 1.2 API Specification. * Written using on-line Java Platform 1.2 API Specification.
...@@ -28,9 +28,6 @@ import java.util.Hashtable; ...@@ -28,9 +28,6 @@ import java.util.Hashtable;
* @author Kresten Krab Thorup <krab@gnu.org> * @author Kresten Krab Thorup <krab@gnu.org>
* @date Aug 10, 1999. * @date Aug 10, 1999.
*/ */
public class Connection extends JarURLConnection public class Connection extends JarURLConnection
{ {
static Hashtable file_cache = new Hashtable(); static Hashtable file_cache = new Hashtable();
...@@ -53,22 +50,22 @@ public class Connection extends JarURLConnection ...@@ -53,22 +50,22 @@ public class Connection extends JarURLConnection
if (jarfile != null) if (jarfile != null)
return jarfile; return jarfile;
URL jarFileURL = getJarFileURL (); URL jarFileURL = getJarFileURL();
if (jarFileURL.getProtocol ().equals ("file") if (jarFileURL.getProtocol().equals ("file")
&& jarFileURL.getHost ().equals ("")) && jarFileURL.getHost().equals (""))
{ {
if (getUseCaches()) if (getUseCaches())
{ {
jarfile = (JarFile) file_cache.get(jarFileURL); jarfile = (JarFile) file_cache.get(jarFileURL);
if (jarfile == null) if (jarfile == null)
{ {
jarfile = new JarFile (jarFileURL.getFile ()); jarfile = new JarFile (jarFileURL.getFile());
file_cache.put (jarFileURL, jarfile); file_cache.put (jarFileURL, jarfile);
} }
} }
else else
jarfile = new JarFile (jarFileURL.getFile ()); jarfile = new JarFile (jarFileURL.getFile());
} }
else else
{ {
...@@ -78,7 +75,7 @@ public class Connection extends JarURLConnection ...@@ -78,7 +75,7 @@ public class Connection extends JarURLConnection
File f = File.createTempFile("cache", "jar"); File f = File.createTempFile("cache", "jar");
FileOutputStream fos = new FileOutputStream(f); FileOutputStream fos = new FileOutputStream(f);
int len = 0; int len = 0;
while((len = is.read(buf)) != -1) while ((len = is.read(buf)) != -1)
fos.write(buf, 0, len); fos.write(buf, 0, len);
fos.close(); fos.close();
// Always verify the Manifest, open read only and delete when done. // Always verify the Manifest, open read only and delete when done.
......
libjava/gnu/gcj/protocol/jar/Handler.java → libjava/gnu/java/net/protocol/jar/Handler.java
...@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
package gnu.gcj.protocol.jar; package gnu.java.net.protocol.jar;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;
import java.io.IOException;
/** /**
* @author Kresten Krab Thorup <krab@gnu.org> * @author Kresten Krab Thorup <krab@gnu.org>
* @date August 13, 1999. * @date August 13, 1999.
*/ */
public class Handler extends URLStreamHandler public class Handler extends URLStreamHandler
{ {
protected URLConnection openConnection(URL url) throws IOException protected URLConnection openConnection(URL url) throws IOException
......
libjava/java/net/URL.java
...@@ -119,7 +119,7 @@ import java.util.StringTokenizer; ...@@ -119,7 +119,7 @@ import java.util.StringTokenizer;
public final class URL implements Serializable public final class URL implements Serializable
{ {
private static final String DEFAULT_SEARCH_PATH = 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. * The name of the protocol for this URL.
...@@ -775,12 +775,12 @@ public final class URL implements Serializable ...@@ -775,12 +775,12 @@ public final class URL implements Serializable
} }
else if (protocol.equals ("core")) 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")) else if (protocol.equals ("file"))
{ {
// This is an interesting case. It's tempting to think that we // 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 // get the appropriate class. Unfortunately, if we do that the
// program will never terminate, because getURLStreamHandler is // program will never terminate, because getURLStreamHandler is
// eventually called by Class.forName. // eventually called by Class.forName.
...@@ -789,7 +789,7 @@ public final class URL implements Serializable ...@@ -789,7 +789,7 @@ public final class URL implements Serializable
// fix this problem. If other protocols are required in a // fix this problem. If other protocols are required in a
// statically linked application they will need to be handled in // statically linked application they will need to be handled in
// the same way as "file". // 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. // Non-default factory may have returned null or a factory wasn't set.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment