diff options
| author | Gary Benson <gbenson@redhat.com> | 2007-01-15 10:25:38 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2007-01-15 10:25:38 +0000 |
| commit | a5c0f6fe8787df483b1fe914e13bc6576bdd3342 (patch) | |
| tree | 4fd1e5d43e9e9e5d5e92941734f010014917598e /libjava/java/net/URLClassLoader.h | |
| parent | 9ebe2d22e7201bca8e75111ec66ccae8454896ae (diff) | |
| download | gcc-a5c0f6fe8787df483b1fe914e13bc6576bdd3342.zip gcc-a5c0f6fe8787df483b1fe914e13bc6576bdd3342.tar.gz gcc-a5c0f6fe8787df483b1fe914e13bc6576bdd3342.tar.bz2 | |
URLClassLoader.java: Removed.
2007-01-15 Gary Benson <gbenson@redhat.com>
* java/net/URLClassLoader.java: Removed.
* gnu/java/net/loader/Load_gcjlib.java: New file.
* gnu/gcj/runtime/BootClassLoader.java: Ensure core
URL handler is present in static executables.
* sources.am, Makefile.in: Rebuilt.
From-SVN: r120791
Diffstat (limited to 'libjava/java/net/URLClassLoader.h')
| -rw-r--r-- | libjava/java/net/URLClassLoader.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libjava/java/net/URLClassLoader.h b/libjava/java/net/URLClassLoader.h index 25fe59a..2e5f15c 100644 --- a/libjava/java/net/URLClassLoader.h +++ b/libjava/java/net/URLClassLoader.h @@ -11,14 +11,26 @@ extern "Java" { + namespace gnu + { + namespace java + { + namespace net + { + namespace loader + { + class Resource; + class URLStreamHandlerCache; + } + } + } + } namespace java { namespace net { class URL; class URLClassLoader; - class URLClassLoader$Resource; - class URLStreamHandler; class URLStreamHandlerFactory; } namespace security @@ -52,12 +64,9 @@ public: // actually protected public: virtual ::java::lang::String * toString(); private: - ::java::net::URLClassLoader$Resource * findURLResource(::java::lang::String *); + ::gnu::java::net::loader::Resource * findURLResource(::java::lang::String *); public: virtual ::java::net::URL * findResource(::java::lang::String *); -public: // actually package-private - virtual ::java::net::URLStreamHandler * getURLStreamHandler(::java::lang::String *); -public: virtual ::java::util::Enumeration * findResources(::java::lang::String *); public: // actually protected virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *); @@ -68,8 +77,8 @@ public: public: // actually package-private static ::java::lang::Class * access$0(::java::net::URLClassLoader *, ::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::CodeSource *); private: - static ::java::util::HashMap * urlloaders; - static ::java::util::HashMap * factoryCache; + static ::gnu::java::net::loader::URLStreamHandlerCache * factoryCache; + static ::java::lang::String * URL_LOADER_PREFIX; ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::SecureClassLoader)))) urls; ::java::util::Vector * urlinfos; ::java::net::URLStreamHandlerFactory * factory; |