diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-29 01:34:23 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-29 01:34:23 +0000 |
| commit | 787d5ab45c86ea6f839b339bb065a6b939cd3c13 (patch) | |
| tree | d6c16c1fb6f934ca70409141582916354ab1622b /libjava | |
| parent | 0b07a493dff0b29a7adb8bd597e0eee51b3b4379 (diff) | |
| download | ppe42-gcc-787d5ab45c86ea6f839b339bb065a6b939cd3c13.tar.gz ppe42-gcc-787d5ab45c86ea6f839b339bb065a6b939cd3c13.zip | |
* java/lang/reflect/Proxy.java: New version from Classpath.
* java/lang/Package.java: New version from Classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65007 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/Package.java | 17 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/Proxy.java | 2 |
3 files changed, 11 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0cadbb78da1..c49bece2f5d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-03-28 Tom Tromey <tromey@redhat.com> + + * java/lang/reflect/Proxy.java: New version from Classpath. + * java/lang/Package.java: New version from Classpath. + 2003-03-29 Ulrich Weigand <uweigand@de.ibm.com> * configure.in (HAVE_BACKTRACE) [s390*-*-linux*]: Define. diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java index 5c9dd30c659..f09814b6764 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 82cf3722263..e327f44664b 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), |
