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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0cadbb78da1b624bda94382e4213da92a6217281..c49bece2f5dd4ffd17dba053d34162a59bd2bbbb 100644 (file)
--- 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 5c9dd30c65981a6cd989fe18ae1ca97ff917b7fe..f09814b6764d88da2529686d4d682865984e9c40 100644 (file)
--- 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 82cf3722263d5fa899ac9789d3cd7e9d87035003..e327f44664b259841b5f12bdb8733dc5a0db347f 100644 (file)
--- 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),