procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Michael Koch 2003-10-08 16:28:30 +00:00 • committed by Michael Koch
parent 36805693cb
commit 85aa13b287
17 changed files with 197 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/java/net/URL.java
View file

@ -119,7 +119,7 @@ import java.util.StringTokenizer;
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.
@ -775,12 +775,12 @@ public final class URL implements Serializable
}
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.
@ -789,7 +789,7 @@ public final class URL implements Serializable
// 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.