OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AccessControlContext.java: Reformated. 

2005-04-26  Michael Koch  <konqueror@gmx.de>

	* java/security/AccessControlContext.java:
	Reformated.
	(protectedDomains): Renamed from 'protectionDomain'.
	* java/security/AccessController.java:
	Reformatted.

From-SVN: r98766
This commit is contained in:
Michael Koch 2005-04-26 07:16:48 +00:00 committed by Michael Koch
parent 6f3a3283f2
commit bb07973ce5
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2005-04-26 Michael Koch <konqueror@gmx.de>
* java/security/AccessControlContext.java:
Reformated.
(protectedDomains): Renamed from 'protectionDomain'.
* java/security/AccessController.java:
Reformatted.
2005-04-26 Jeroen Frijters <jeroen@frijters.net>
* gnu/java/security/action/GetSecurityPropertyAction.java

30
libjava/java/security/AccessControlContext.java
View File

@ -53,7 +53,7 @@ package java.security;
*/
public final class AccessControlContext
{
private ProtectionDomain protectionDomain[];
private ProtectionDomain[] protectionDomains;
private DomainCombiner combiner;
/**
@ -63,13 +63,13 @@ public final class AccessControlContext
*
* @param context The ProtectionDomains to use
*/
public AccessControlContext(ProtectionDomain[]context)
public AccessControlContext(ProtectionDomain[] context)
{
int i, j, k, count = context.length, count2 = 0;
for (i = 0, j = 0; i < count; i++)
{
for (k = 0; k < i; k++)
if (context[k] == protectionDomain[i])
if (context[k] == protectionDomains[i])
break;
if (k != i) //it means previous loop did not complete
continue;
@ -77,16 +77,16 @@ public final class AccessControlContext
count2++;
}
protectionDomain = new ProtectionDomain[count2];
protectionDomains = new ProtectionDomain[count2];
for (i = 0, j = 0; i < count2; i++)
{
for (k = 0; k < i; k++)
if (context[k] == protectionDomain[i])
if (context[k] == protectionDomains[i])
break;
if (k != i) //it means previous loop did not complete
continue;
protectionDomain[j++] = context[i];
protectionDomains[j++] = context[i];
}
}
@ -99,7 +99,7 @@ public final class AccessControlContext
public AccessControlContext(AccessControlContext acc,
DomainCombiner combiner)
{
this(acc.protectionDomain);
this(acc.protectionDomains);
this.combiner = combiner;
}
@ -123,8 +123,8 @@ public final class AccessControlContext
*/
public void checkPermission(Permission perm) throws AccessControlException
{
for (int i = 0; i < protectionDomain.length; i++)
if (protectionDomain[i].implies(perm) == true)
for (int i = 0; i < protectionDomains.length; i++)
if (protectionDomains[i].implies(perm) == true)
return;
throw new AccessControlException("Permission not granted");
@ -146,13 +146,13 @@ public final class AccessControlContext
{
AccessControlContext acc = (AccessControlContext) obj;
if (acc.protectionDomain.length != protectionDomain.length)
if (acc.protectionDomains.length != protectionDomains.length)
return false;
for (int i = 0; i < protectionDomain.length; i++)
if (acc.protectionDomain[i] != protectionDomain[i])
for (int i = 0; i < protectionDomains.length; i++)
if (acc.protectionDomains[i] != protectionDomains[i])
return false;
return true;
return true;
}
return false;
}
@ -165,8 +165,8 @@ public final class AccessControlContext
public int hashCode()
{
int h = 0;
for (int i = 0; i < protectionDomain.length; i++)
h ^= protectionDomain[i].hashCode();
for (int i = 0; i < protectionDomains.length; i++)
h ^= protectionDomains[i].hashCode();
return h;
}

14
libjava/java/security/AccessController.java
View File

@ -113,7 +113,7 @@ public final class AccessController
* @return the result of the <code>action.run()</code> method.
*/
public static Object doPrivileged(PrivilegedAction action,
AccessControlContext context)
AccessControlContext context)
{
return action.run();
}
@ -137,14 +137,13 @@ public final class AccessController
public static Object doPrivileged(PrivilegedExceptionAction action)
throws PrivilegedActionException
{
try
{
return action.run();
return action.run();
}
catch (Exception e)
{
throw new PrivilegedActionException(e);
throw new PrivilegedActionException(e);
}
}
@ -167,17 +166,16 @@ public final class AccessController
* is thrown in the <code>run()</code> method.
*/
public static Object doPrivileged(PrivilegedExceptionAction action,
AccessControlContext context)
AccessControlContext context)
throws PrivilegedActionException
{
try
{
return action.run();
return action.run();
}
catch (Exception e)
{
throw new PrivilegedActionException(e);
throw new PrivilegedActionException(e);
}
}