[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: removed a few trampolines in java.security

[Kaffe CVS]

PatchSet 5425 
Date: 2004/11/09 22:08:15
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: removed a few trampolines in java.security

2004-11-09  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/security/Permissions.java,
        libraries/javalib/java/security/UnresolvedPermission.java:
        Resynced with GNU Classpath.

        2004-11-06  Tom Tromey  <tromey at redhat.com>

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

Members: 
	ChangeLog:1.2974->1.2975 
	libraries/javalib/java/security/Permissions.java:1.4->1.5 
	libraries/javalib/java/security/UnresolvedPermission.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2974 kaffe/ChangeLog:1.2975
--- kaffe/ChangeLog:1.2974	Tue Nov  9 22:01:11 2004
+++ kaffe/ChangeLog	Tue Nov  9 22:08:15 2004
@@ -1,5 +1,17 @@
 2004-11-09  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/security/Permissions.java,
+	libraries/javalib/java/security/UnresolvedPermission.java:
+        Resynced with GNU Classpath.
+
+	2004-11-06  Tom Tromey  <tromey at redhat.com>
+
+        * java/security/Permissions.java (perms): Now package-private.
+        * java/security/UnresolvedPermission.java (permissions): Now
+        package-private.
+
+2004-11-09  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/io/FilePermission.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/security/Permissions.java
diff -u kaffe/libraries/javalib/java/security/Permissions.java:1.4 kaffe/libraries/javalib/java/security/Permissions.java:1.5
--- kaffe/libraries/javalib/java/security/Permissions.java:1.4	Sat Oct 23 18:18:13 2004
+++ kaffe/libraries/javalib/java/security/Permissions.java	Tue Nov  9 22:08:19 2004
@@ -72,12 +72,13 @@
    */
   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>.
Index: kaffe/libraries/javalib/java/security/UnresolvedPermission.java
diff -u kaffe/libraries/javalib/java/security/UnresolvedPermission.java:1.4 kaffe/libraries/javalib/java/security/UnresolvedPermission.java:1.5
--- kaffe/libraries/javalib/java/security/UnresolvedPermission.java:1.4	Sat Oct 23 18:18:13 2004
+++ kaffe/libraries/javalib/java/security/UnresolvedPermission.java	Tue Nov  9 22:08:19 2004
@@ -216,13 +216,14 @@
    */
   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.