Author: ajaquith
Date: Wed Jun 11 23:26:53 2008
New Revision: 666973
URL: http://svn.apache.org/viewvc?rev=666973&view=rev
Log:
Miscellaneous and varied Java 5 enhancements (such as for-loops), or comments.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/Acl.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/Acl.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/Acl.java?rev=666973&r1=666972&r2=666973&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/Acl.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/Acl.java Wed Jun 11
23:26:53 2008
@@ -74,6 +74,7 @@
* enumeration is of type AclEntry.
* @return an enumeration of the entries in this ACL.
*/
+ @SuppressWarnings("unchecked")
public Enumeration entries();
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java?rev=666973&r1=666972&r2=666973&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java Wed
Jun 11 23:26:53 2008
@@ -80,6 +80,7 @@
* Returns an enumeration of the permissions in this ACL entry.
* @return an enumeration of the permissions
*/
+ @SuppressWarnings("unchecked")
public Enumeration permissions();
/**
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java?rev=666973&r1=666972&r2=666973&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
Wed Jun 11 23:26:53 2008
@@ -96,6 +96,7 @@
* Returns an enumeration of the permissions in this ACL entry.
* @return an enumeration of the permissions
*/
+ @SuppressWarnings("unchecked")
public Enumeration permissions()
{
return m_permissions.elements();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java?rev=666973&r1=666972&r2=666973&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java Wed Jun
11 23:26:53 2008
@@ -52,18 +52,19 @@
* @param permission the permission to search for
* @return an array of Principals possessing the permission
*/
+ @SuppressWarnings("unchecked")
public Principal[] findPrincipals( Permission permission )
{
Vector<Principal> principals = new Vector<Principal>();
- Enumeration entries = entries();
+ Enumeration<AclEntry> entries = entries();
while (entries.hasMoreElements())
{
- AclEntry entry = (AclEntry)entries.nextElement();
- Enumeration permissions = entry.permissions();
+ AclEntry entry = entries.nextElement();
+ Enumeration<Permission> permissions = entry.permissions();
while ( permissions.hasMoreElements() )
{
- Permission perm = (Permission)permissions.nextElement();
+ Permission perm = permissions.nextElement();
if ( perm.implies( permission ) )
{
principals.add( entry.getPrincipal() );
@@ -141,6 +142,7 @@
* enumeration is of type AclEntry.
* @return an enumeration of the entries in this ACL.
*/
+ @SuppressWarnings("unchecked")
public Enumeration entries()
{
return m_entries.elements();
@@ -169,6 +171,7 @@
* Returns a string representation of the contents of this Acl.
* @return the string representation
*/
+ @SuppressWarnings("unchecked")
public String toString()
{
StringBuffer sb = new StringBuffer();
@@ -183,9 +186,9 @@
sb.append( " user = null: " );
sb.append( "(" );
- for( Enumeration perms = entry.permissions();
perms.hasMoreElements(); )
+ for( Enumeration<Permission> perms = entry.permissions();
perms.hasMoreElements(); )
{
- Permission perm = (Permission) perms.nextElement();
+ Permission perm = perms.nextElement();
sb.append( perm.toString() );
}
sb.append( ")\n" );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java?rev=666973&r1=666972&r2=666973&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
Wed Jun 11 23:26:53 2008
@@ -244,19 +244,20 @@
* @param acl the ACL
* @return the ACL string
*/
+ @SuppressWarnings("unchecked")
protected static String printAcl( Acl acl )
{
// Extract the ACL entries into a Map with keys == permissions, values
== principals
Map<String, List<Principal>> permissionPrincipals = new
TreeMap<String, List<Principal>>();
- Enumeration entries = acl.entries();
+ Enumeration<AclEntry> entries = acl.entries();
while ( entries.hasMoreElements() )
{
- AclEntry entry = (AclEntry)entries.nextElement();
+ AclEntry entry = entries.nextElement();
Principal principal = entry.getPrincipal();
- Enumeration permissions = entry.permissions();
+ Enumeration<Permission> permissions = entry.permissions();
while ( permissions.hasMoreElements() )
{
- Permission permission = (Permission)permissions.nextElement();
+ Permission permission = permissions.nextElement();
List<Principal> principals = permissionPrincipals.get(
permission.getActions() );
if ( principals == null )
{
