Permissions.java (perms): Now package-private.

	* java/security/Permissions.java (perms): Now package-private.
	* java/security/UnresolvedPermission.java (permissions): Now
	package-private.

From-SVN: r90202

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7de8b5cbfbba1f4c2dbcc45f15ec3b5a41e0820f..2fa28a3a515120c8ac15986319697143e5ecf4eb 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-06  Tom Tromey  <tromey@redhat.com>
+
+       * java/security/Permissions.java (perms): Now package-private.
+       * java/security/UnresolvedPermission.java (permissions): Now
+       package-private.
+
 2004-11-06  Tom Tromey  <tromey@redhat.com>
 
        * java/io/FilePermission.java: Reindented.

diff --git a/libjava/java/security/Permissions.java b/libjava/java/security/Permissions.java
index cf3fc16bf41f1d3988b3cd38eee01963f95c1de2..d44341c947ac23ffaef4ea4e2280af06f403cb3d 100644 (file)
--- a/libjava/java/security/Permissions.java
+++ b/libjava/java/security/Permissions.java
@@ -72,12 +72,13 @@ public final class Permissions extends PermissionCollection
    */
   private PermissionCollection allPermission;
 
+  // Package-private to avoid a trampoline.
   /**
    * This is the <code>Hashtable</code> that contains our collections.
    *
    * @serial maps Class to PermissionCollection
    */
-  private final Hashtable perms = new Hashtable();
+  final Hashtable perms = new Hashtable();
 
   /**
    * This method initializes a new instance of <code>Permissions</code>.

diff --git a/libjava/java/security/UnresolvedPermission.java b/libjava/java/security/UnresolvedPermission.java
index 8a7b7036099f4806f5736db5d3e32e982dab0bf7..c96bce0cc14c9cc95953c415c550d6723a8cab19 100644 (file)
--- a/libjava/java/security/UnresolvedPermission.java
+++ b/libjava/java/security/UnresolvedPermission.java
@@ -216,13 +216,14 @@ class UnresolvedPermissionCollection extends PermissionCollection
    */
   private static final long serialVersionUID = -7176153071733132400L;
 
+  // Package-private to avoid a trampoline.
   /**
    * Hashtable where we store permissions.
    *
    * @serial map of typename to a Vector of permissions (you'd think Sun
    *         would document this better!)
    */
-  private final Hashtable permissions = new Hashtable();
+  final Hashtable permissions = new Hashtable();
 
   /**
    * Add a permission.