diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-03-29 01:34:23 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-03-29 01:34:23 +0000 |
| commit | 4544c3f3876680fb79824d6c7628e850cff334e7 (patch) | |
| tree | d6c16c1fb6f934ca70409141582916354ab1622b /libjava/java | |
| parent | ff77a44171a828654464107a574edfd2e05040d3 (diff) | |
| download | gcc-4544c3f3876680fb79824d6c7628e850cff334e7.zip gcc-4544c3f3876680fb79824d6c7628e850cff334e7.tar.gz gcc-4544c3f3876680fb79824d6c7628e850cff334e7.tar.bz2 | |
Proxy.java: New version from Classpath.
* java/lang/reflect/Proxy.java: New version from Classpath.
* java/lang/Package.java: New version from Classpath.
From-SVN: r65007
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Package.java | 17 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/Proxy.java | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java index 5c9dd30..f09814b6 100644 --- a/libjava/java/lang/Package.java +++ b/libjava/java/lang/Package.java @@ -1,5 +1,5 @@ /* Package.java -- information about a package - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -269,8 +269,7 @@ public class Package public static Package getPackage(String name) { // Get the caller's classloader - SecurityManager sm = System.getSecurityManager(); - Class c = sm.getClassContext()[1]; + Class c = VMSecurityManager.getClassContext()[1]; ClassLoader cl = c.getClassLoader(); return cl != null ? cl.getPackage(name) : null; } @@ -284,8 +283,7 @@ public class Package public static Package[] getPackages() { // Get the caller's classloader - SecurityManager sm = System.getSecurityManager(); - Class c = sm.getClassContext()[1]; + Class c = VMSecurityManager.getClassContext()[1]; ClassLoader cl = c.getClassLoader(); // Sun's implementation returns the packages loaded by the bootstrap // classloader if cl is null, but right now our bootstrap classloader @@ -313,12 +311,7 @@ public class Package */ public String toString() { - return "package: " + name + - " spec: " + specTitle + - " version: " + specVersion + - " vendor: " + specVendor + - " implementation: " + implTitle + - " version: " + implVersion + - " vendor: " + implVendor + " sealed: " + sealed; + return ("package " + name + (specTitle == null ? "" : ", " + specTitle) + + (specVersion == null ? "" : ", version " + specVersion)); } } // class Package diff --git a/libjava/java/lang/reflect/Proxy.java b/libjava/java/lang/reflect/Proxy.java index 82cf372..e327f44 100644 --- a/libjava/java/lang/reflect/Proxy.java +++ b/libjava/java/lang/reflect/Proxy.java @@ -185,7 +185,7 @@ public class Proxy implements Serializable * Proxy. * @serial invocation handler associated with this proxy instance */ - protected final InvocationHandler h; + protected InvocationHandler h; /** * Constructs a new Proxy from a subclass (usually a proxy class), |