[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: java/lang/SecurityManager.java

[Kaffe CVS]

PatchSet 4821 
Date: 2004/06/04 17:45:18
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: java/lang/SecurityManager.java

2004-06-04  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/lang/SecurityManager.java:
        Resynced with GNU Classpath.

        2004-06-04  Casey Marshall <csm at gnu.org>

        * java/lang/SecurityManager.java
        (getSecurityContext): return 'AccessController.getContext'.
        (checkPermission(Permission)): use AccessController.
        (checkPermission(Permission,Object)): likewise.
        (checkRead): likewise.
        (checkConnect): likewise.

Members: 
	ChangeLog:1.2389->1.2390 
	libraries/javalib/java/lang/SecurityManager.java:1.20->1.21 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2389 kaffe/ChangeLog:1.2390
--- kaffe/ChangeLog:1.2389	Thu Jun  3 22:25:59 2004
+++ kaffe/ChangeLog	Fri Jun  4 17:45:18 2004
@@ -1,6 +1,20 @@
+2004-06-04  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/java/lang/SecurityManager.java:
+	Resynced with GNU Classpath.
+
+	2004-06-04  Casey Marshall <csm at gnu.org>
+
+        * java/lang/SecurityManager.java
+        (getSecurityContext): return `AccessController.getContext'.
+        (checkPermission(Permission)): use AccessController.
+        (checkPermission(Permission,Object)): likewise.
+        (checkRead): likewise.
+        (checkConnect): likewise.
+
 2004-06-03  Dalibor Topic  <robilad at kaffe.org>
 
-        libraries/javalib/java/security/AccessControlContext.java,
+        * libraries/javalib/java/security/AccessControlContext.java,
         libraries/javalib/java/security/AccessController.java,
         libraries/javalib/java/security/IntersectingDomainCombiner.java,
         libraries/javalib/java/security/ProtectionDomain.java,
Index: kaffe/libraries/javalib/java/lang/SecurityManager.java
diff -u kaffe/libraries/javalib/java/lang/SecurityManager.java:1.20 kaffe/libraries/javalib/java/lang/SecurityManager.java:1.21
--- kaffe/libraries/javalib/java/lang/SecurityManager.java:1.20	Mon May 31 21:15:30 2004
+++ kaffe/libraries/javalib/java/lang/SecurityManager.java	Fri Jun  4 17:45:19 2004
@@ -185,7 +185,7 @@
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
    * </ul>
-   *
+   * 
    * @return the most recent non-system ClassLoader on the execution stack
    * @deprecated use {@link #checkPermission(Permission)} instead
    */
@@ -207,7 +207,7 @@
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
    * </ul>
-   *
+   * 
    * @return the most recent non-system Class on the execution stack
    * @deprecated use {@link #checkPermission(Permission)} instead
    */
@@ -246,7 +246,7 @@
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
    * </ul>
-   *
+   * 
    * @return the index of the most recent non-system Class on the stack
    * @deprecated use {@link #checkPermission(Permission)} instead
    */
@@ -391,8 +391,8 @@
    */
   public void checkAccess(Thread thread)
   {
-    if (thread.getThreadGroup() != null
-        && thread.getThreadGroup().getParent() != null)
+    if (thread.getThreadGroup() != null 
+	&& thread.getThreadGroup().getParent() != null)
       checkPermission(new RuntimePermission("modifyThread"));
   }
 
@@ -1027,7 +1027,7 @@
              index != -1; index = list.indexOf(packageName, index + 1))
           {
             // Exploit package visibility for speed.
-            int packageNameCount = packageName.length();
+	    int packageNameCount = packageName.length();
             if (index + packageNameCount == list.length()
                 || list.charAt(index + packageNameCount) == ',')
               {
@@ -1043,8 +1043,8 @@
 
 // XXX This class is unnecessary.
 class SecurityContext {
-        Class[] classes;
-        SecurityContext(Class[] classes) {
-                this.classes = classes;
-        }
+	Class[] classes;
+	SecurityContext(Class[] classes) {
+		this.classes = classes;
+	}
 }