mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-19 23:29:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

ClassLoader.java (getSystemResource): Use getSystemClassLoader instead of ClassLoader.system.

Browse Source 
* java/lang/ClassLoader.java (getSystemResource): Use
        getSystemClassLoader instead of ClassLoader.system.
        (getSystemResourceAsStream): Ditto.

        * java/lang/natClassLoader.cc (redirect): Make static and
        remove #ifdef INTERPRETER so it is always defined.
        (getVMClassLoader0): Remove #ifdef INTERPRETER so it always
        returns a VMClassLoader.

        * java/util/ResourceBundle.java (trySomeGetBundle): Create a
        PropertyResourceBundle if a properties file is found before a
        ResourceBundle class.

From-SVN: r30048
This commit is contained in:
Anthony Green 1999-10-17 03:11:50 +00:00 committed by Anthony Green
parent 1b284f05ac
commit 6c413a50e6
4 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libjava/ChangeLog
View File

@ -1,3 +1,18 @@
1999-10-16 Anthony Green <green@cygnus.com>
* java/lang/ClassLoader.java (getSystemResource): Use
getSystemClassLoader instead of ClassLoader.system.
(getSystemResourceAsStream): Ditto.
* java/lang/natClassLoader.cc (redirect): Make static and
remove #ifdef INTERPRETER so it is always defined.
(getVMClassLoader0): Remove #ifdef INTERPRETER so it always
returns a VMClassLoader.
* java/util/ResourceBundle.java (trySomeGetBundle): Create a
PropertyResourceBundle if a properties file is found before a
ResourceBundle class.
1999-10-15 Tom Tromey <tromey@cygnus.com>
* gij.cc (main): Formatting fixes.

4
libjava/java/lang/ClassLoader.java
View File

@ -360,11 +360,11 @@ public abstract class ClassLoader {
protected native Class findLoadedClass(String name);
public static final InputStream getSystemResourceAsStream(String name) {
return system.getResourceAsStream (name);
return getSystemClassLoader().getResourceAsStream (name);
}
public static final URL getSystemResource(String name) {
return system.getResource (name);
return getSystemClassLoader().getResource (name);
}
/**

14
libjava/java/lang/natClassLoader.cc
View File

@ -48,20 +48,14 @@ extern java::lang::Class ClassLoaderClass;
/////////// java.lang.ClassLoader native methods ////////////
#ifdef INTERPRETER
gnu::gcj::runtime::VMClassLoader *redirect = 0;
#endif
static gnu::gcj::runtime::VMClassLoader *redirect = 0;
java::lang::ClassLoader*
java::lang::ClassLoader::getVMClassLoader0 ()
{
#ifdef INTERPRETER
if (redirect == 0)
redirect = new gnu::gcj::runtime::VMClassLoader;
return redirect;
#else
return 0;
#endif
if (redirect == 0)
redirect = new gnu::gcj::runtime::VMClassLoader;
return redirect;
}
void

19
libjava/java/util/ResourceBundle.java
View File

@ -8,6 +8,8 @@ details. */
package java.util;
import java.io.InputStream;
/**
* @author Anthony Green <green@cygnus.com>
* @date November 26, 1998.
@ -106,6 +108,23 @@ public abstract class ResourceBundle
// Fall through.
}
// Look for a properties file.
{
InputStream i =
ClassLoader.getSystemResourceAsStream (bundleName.replace ('.', '/')
+ ".properties");
if (i != null)
{
try {
return new PropertyResourceBundle (i);
} catch (java.io.IOException e) {
// The docs don't appear to define what happens in
// this case, but it seems like continuing the
// search is a reasonable thing to do.
}
}
}
if (bundleName.equals(stopHere))
return result;
else