You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/02/15 23:06:56 UTC
svn commit: r1071091 - in /turbine/core/trunk/src/java/org/apache/turbine:
modules/ om/security/ services/assemblerbroker/util/java/
services/security/ services/security/torque/ services/template/mapper/
util/security/
Author: tv
Date: Tue Feb 15 22:06:55 2011
New Revision: 1071091
URL: http://svn.apache.org/viewvc?rev=1071091&view=rev
Log:
Started generification of security services and template service
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineGroup.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbinePermission.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineRole.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/TurbineSecurity.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java Tue Feb 15 22:06:55 2011
@@ -50,7 +50,7 @@ public abstract class GenericLoader
private static final String TURBINE_PACKAGE = "org.apache.turbine.modules";
/** Packages paths for Turbine */
- private static List TURBINE_PACKAGES = null;
+ private static List<String> TURBINE_PACKAGES = null;
/**
* Basic constructor for creating a loader.
@@ -139,7 +139,7 @@ public abstract class GenericLoader
*
* @return A List with the package names (including the base package).
*/
- public static List getPackages()
+ public static List<String> getPackages()
{
if (TURBINE_PACKAGES == null)
{
@@ -147,7 +147,7 @@ public abstract class GenericLoader
Turbine.getConfiguration().getList(TurbineConstants.MODULE_PACKAGES);
}
- List packages = TURBINE_PACKAGES;
+ List<String> packages = TURBINE_PACKAGES;
if (!packages.contains(TURBINE_PACKAGE))
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java Tue Feb 15 22:06:55 2011
@@ -32,7 +32,7 @@ import java.util.Map;
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @version $Id$
*/
-public abstract class SecurityObject implements Comparable
+public abstract class SecurityObject<T extends SecurityEntity> implements Comparable<T>
{
/** The name of this object. */
private String name;
@@ -41,7 +41,7 @@ public abstract class SecurityObject imp
private int id;
/** The attributes of this object. */
- private Map attributes;
+ private Map<String, Object> attributes;
/**
* Constructs a new SecurityObject
@@ -60,7 +60,7 @@ public abstract class SecurityObject imp
{
setName(name);
setId(0);
- setAttributes(Collections.synchronizedMap(new HashMap()));
+ setAttributes(Collections.synchronizedMap(new HashMap<String, Object>()));
}
/**
@@ -68,7 +68,7 @@ public abstract class SecurityObject imp
*
* @return the object's attributes.
*/
- public Map getAttributes()
+ public Map<String, Object> getAttributes()
{
return attributes;
}
@@ -78,7 +78,7 @@ public abstract class SecurityObject imp
*
* @param attributes The new attributes of the object.
*/
- public void setAttributes(Map attributes)
+ public void setAttributes(Map<String, Object> attributes)
{
this.attributes = attributes;
}
@@ -168,13 +168,14 @@ public abstract class SecurityObject imp
* @return -1 if the name of the other object is lexically greater than this
* group, 1 if it is lexically lesser, 0 if they are equal.
*/
- public int compareTo(Object obj)
+ public int compareTo(T obj)
{
if (this.getClass() != obj.getClass())
{
throw new ClassCastException();
}
- String name1 = ((SecurityObject) obj).getName();
+
+ String name1 = obj.getName();
String name2 = this.getName();
return name2.compareTo(name1);
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineGroup.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineGroup.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineGroup.java Tue Feb 15 22:06:55 2011
@@ -44,7 +44,7 @@ import org.apache.turbine.util.security.
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @version $Id$
*/
-public class TurbineGroup extends SecurityObject implements Group
+public class TurbineGroup extends SecurityObject<Group> implements Group
{
/**
* Constructs a new Group.
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbinePermission.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbinePermission.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbinePermission.java Tue Feb 15 22:06:55 2011
@@ -22,6 +22,7 @@ package org.apache.turbine.om.security;
import java.sql.Connection;
+
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -36,7 +37,7 @@ import org.apache.turbine.util.security.
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @version $Id$
*/
-public class TurbinePermission extends SecurityObject implements Permission
+public class TurbinePermission extends SecurityObject<Permission> implements Permission
{
/**
* Constructs a new TurbinePermission.
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineRole.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineRole.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineRole.java Tue Feb 15 22:06:55 2011
@@ -37,7 +37,7 @@ import org.apache.turbine.util.security.
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @version $Id$
*/
-public class TurbineRole extends SecurityObject implements Role
+public class TurbineRole extends SecurityObject<Role> implements Role
{
/**
* Constructs a new Role
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java Tue Feb 15 22:06:55 2011
@@ -22,7 +22,6 @@ package org.apache.turbine.om.security;
import java.sql.Connection;
-
import java.util.Date;
import java.util.Hashtable;
@@ -30,7 +29,6 @@ import javax.servlet.http.HttpSessionBin
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.services.security.TurbineSecurity;
/**
@@ -53,7 +51,7 @@ import org.apache.turbine.services.secur
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class TurbineUser extends SecurityObject implements User
+public class TurbineUser extends SecurityObject<User> implements User
{
/** Logging */
private static Log log = LogFactory.getLog(TurbineUser.class);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java Tue Feb 15 22:06:55 2011
@@ -22,7 +22,6 @@ package org.apache.turbine.services.asse
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -46,7 +45,7 @@ public abstract class JavaBaseFactory
implements AssemblerFactory
{
/** A vector of packages. */
- private static List packages = GenericLoader.getPackages();
+ private static List<String> packages = GenericLoader.getPackages();
/** Logging */
protected Log log = LogFactory.getLog(this.getClass());
@@ -55,7 +54,8 @@ public abstract class JavaBaseFactory
* A cache for previously obtained Class instances, which we keep in order
* to reduce the Class.forName() overhead (which can be sizable).
*/
- private Map classCache = Collections.synchronizedMap(new HashMap());
+ private Map<String, Class<? extends Assembler>> classCache =
+ Collections.synchronizedMap(new HashMap<String, Class<? extends Assembler>>());
/**
* Get an Assembler.
@@ -72,11 +72,11 @@ public abstract class JavaBaseFactory
if (StringUtils.isNotEmpty(name))
{
- for (Iterator it = packages.iterator(); it.hasNext();)
+ for (String p : packages)
{
StringBuffer sb = new StringBuffer();
- sb.append(it.next()).append('.').append(packageName).append('.').append(name);
+ sb.append(p).append('.').append(packageName).append('.').append(name);
String className = sb.toString();
@@ -84,13 +84,13 @@ public abstract class JavaBaseFactory
try
{
- Class servClass = (Class) classCache.get(className);
+ Class<? extends Assembler> servClass = classCache.get(className);
if(servClass == null)
{
- servClass = Class.forName(className.toString());
+ servClass = (Class<? extends Assembler>) Class.forName(className.toString());
classCache.put(className, servClass);
}
- assembler = (Assembler) servClass.newInstance();
+ assembler = servClass.newInstance();
break; // for()
}
catch (ClassNotFoundException cnfe)
@@ -148,7 +148,6 @@ public abstract class JavaBaseFactory
* @return the size of the cache in bytes
*/
public int getCacheSize()
-
{
return getLoader().getCacheSize();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java Tue Feb 15 22:06:55 2011
@@ -23,8 +23,6 @@ package org.apache.turbine.services.secu
import java.util.Map;
-import javax.servlet.ServletConfig;
-
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -81,19 +79,19 @@ public abstract class BaseSecurityServic
private UserManager userManager = null;
/** The class of User the SecurityService uses */
- private Class userClass = null;
+ private Class<? extends User> userClass = null;
/** The class of Group the SecurityService uses */
- private Class groupClass = null;
+ private Class<? extends Group> groupClass = null;
/** The class of Permission the SecurityService uses */
- private Class permissionClass = null;
+ private Class<? extends Permission> permissionClass = null;
/** The class of Role the SecurityService uses */
- private Class roleClass = null;
+ private Class<? extends Role> roleClass = null;
/** The class of ACL the SecurityService uses */
- private Class aclClass = null;
+ private Class<? extends AccessControlList> aclClass = null;
/** A factory to construct ACL Objects */
private FactoryService aclFactoryService = null;
@@ -244,11 +242,11 @@ public abstract class BaseSecurityServic
try
{
- userClass = Class.forName(userClassName);
- groupClass = Class.forName(groupClassName);
- permissionClass = Class.forName(permissionClassName);
- roleClass = Class.forName(roleClassName);
- aclClass = Class.forName(aclClassName);
+ userClass = (Class<? extends User>) Class.forName(userClassName);
+ groupClass = (Class<? extends Group>) Class.forName(groupClassName);
+ permissionClass = (Class<? extends Permission>) Class.forName(permissionClassName);
+ roleClass = (Class<? extends Role>) Class.forName(roleClassName);
+ aclClass = (Class<? extends AccessControlList>) Class.forName(aclClassName);
}
catch (Exception e)
{
@@ -314,7 +312,7 @@ public abstract class BaseSecurityServic
* @throws UnknownEntityException if the implementation of User interface
* could not be determined, or does not exist.
*/
- public Class getUserClass()
+ public Class<? extends User> getUserClass()
throws UnknownEntityException
{
if (userClass == null)
@@ -340,7 +338,7 @@ public abstract class BaseSecurityServic
User user;
try
{
- user = (User) getUserClass().newInstance();
+ user = getUserClass().newInstance();
}
catch (Exception e)
{
@@ -378,7 +376,7 @@ public abstract class BaseSecurityServic
* @throws UnknownEntityException if the implementation of Group interface
* could not be determined, or does not exist.
*/
- public Class getGroupClass()
+ public Class<? extends Group> getGroupClass()
throws UnknownEntityException
{
if (groupClass == null)
@@ -404,7 +402,7 @@ public abstract class BaseSecurityServic
Group group;
try
{
- group = (Group) getGroupClass().newInstance();
+ group = getGroupClass().newInstance();
}
catch (Exception e)
{
@@ -441,7 +439,7 @@ public abstract class BaseSecurityServic
* @throws UnknownEntityException if the implementation of Permission interface
* could not be determined, or does not exist.
*/
- public Class getPermissionClass()
+ public Class<? extends Permission> getPermissionClass()
throws UnknownEntityException
{
if (permissionClass == null)
@@ -467,7 +465,7 @@ public abstract class BaseSecurityServic
Permission permission;
try
{
- permission = (Permission) getPermissionClass().newInstance();
+ permission = getPermissionClass().newInstance();
}
catch (Exception e)
{
@@ -503,7 +501,7 @@ public abstract class BaseSecurityServic
* @throws UnknownEntityException if the implementation of Role interface
* could not be determined, or does not exist.
*/
- public Class getRoleClass()
+ public Class<? extends Role> getRoleClass()
throws UnknownEntityException
{
if (roleClass == null)
@@ -530,7 +528,7 @@ public abstract class BaseSecurityServic
try
{
- role = (Role) getRoleClass().newInstance();
+ role = getRoleClass().newInstance();
}
catch (Exception e)
{
@@ -567,7 +565,7 @@ public abstract class BaseSecurityServic
* @throws UnknownEntityException if the implementation of ACL interface
* could not be determined, or does not exist.
*/
- public Class getAclClass()
+ public Class<? extends AccessControlList> getAclClass()
throws UnknownEntityException
{
if (aclClass == null)
@@ -876,6 +874,7 @@ public abstract class BaseSecurityServic
}
catch (InterruptedException e)
{
+ // do nothing
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java Tue Feb 15 22:06:55 2011
@@ -177,7 +177,7 @@ public interface SecurityService
* @throws UnknownEntityException if the system's implementation of User
* interface could not be determined.
*/
- Class getUserClass()
+ Class<? extends User> getUserClass()
throws UnknownEntityException;
/**
@@ -214,7 +214,7 @@ public interface SecurityService
* @throws UnknownEntityException if the system's implementation of Group
* interface could not be determined.
*/
- Class getGroupClass()
+ Class<? extends Group> getGroupClass()
throws UnknownEntityException;
/**
@@ -251,7 +251,7 @@ public interface SecurityService
* @throws UnknownEntityException if the system's implementation of Permission
* interface could not be determined.
*/
- Class getPermissionClass()
+ Class<? extends Permission> getPermissionClass()
throws UnknownEntityException;
/**
@@ -288,7 +288,7 @@ public interface SecurityService
* @throws UnknownEntityException if the system's implementation of Role
* interface could not be determined.
*/
- Class getRoleClass()
+ Class<? extends Role> getRoleClass()
throws UnknownEntityException;
/**
@@ -325,7 +325,7 @@ public interface SecurityService
* @throws UnknownEntityException if the system's implementation of AccessControlList
* interface could not be determined.
*/
- Class getAclClass()
+ Class<? extends AccessControlList> getAclClass()
throws UnknownEntityException;
/**
@@ -425,7 +425,7 @@ public interface SecurityService
* @throws DataBackendException if there is a problem accessing the
* storage.
*/
- List getUserList(Object criteria)
+ List<User> getUserList(Object criteria)
throws DataBackendException;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/TurbineSecurity.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/TurbineSecurity.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/TurbineSecurity.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/TurbineSecurity.java Tue Feb 15 22:06:55 2011
@@ -129,7 +129,7 @@ public abstract class TurbineSecurity
* @throws UnknownEntityException if the system's implementation of User
* interface could not be determined.
*/
- public static Class getUserClass()
+ public static Class<? extends User> getUserClass()
throws UnknownEntityException
{
return getService().getUserClass();
@@ -143,7 +143,7 @@ public abstract class TurbineSecurity
* @throws UnknownEntityException if the system's implementation of Group
* interface could not be determined.
*/
- public static Class getGroupClass()
+ public static Class<? extends Group> getGroupClass()
throws UnknownEntityException
{
return getService().getGroupClass();
@@ -157,7 +157,7 @@ public abstract class TurbineSecurity
* @throws UnknownEntityException if the system's implementation of Permission
* interface could not be determined.
*/
- public static Class getPermissionClass()
+ public static Class<? extends Permission> getPermissionClass()
throws UnknownEntityException
{
return getService().getPermissionClass();
@@ -171,7 +171,7 @@ public abstract class TurbineSecurity
* @throws UnknownEntityException if the system's implementation of Role
* interface could not be determined.
*/
- public static Class getRoleClass()
+ public static Class<? extends Role> getRoleClass()
throws UnknownEntityException
{
return getService().getRoleClass();
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java Tue Feb 15 22:06:55 2011
@@ -19,10 +19,7 @@ package org.apache.turbine.services.secu
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.torque.om.Persistent;
-
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
@@ -248,10 +245,9 @@ public class TorqueGroup
public void grant(User user, RoleSet roleSet)
throws TurbineSecurityException
{
- Iterator roles = roleSet.iterator();
- while (roles.hasNext())
+ for (Role r : roleSet)
{
- TurbineSecurity.grant(user, this, (Role) roles.next());
+ TurbineSecurity.grant(user, this, r);
}
}
@@ -280,10 +276,9 @@ public class TorqueGroup
public void revoke(User user, RoleSet roleSet)
throws TurbineSecurityException
{
- Iterator roles = roleSet.iterator();
- while (roles.hasNext())
+ for (Role r : roleSet)
{
- TurbineSecurity.revoke(user, this, (Role) roles.next());
+ TurbineSecurity.revoke(user, this, r);
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java Tue Feb 15 22:06:55 2011
@@ -26,12 +26,9 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-
-import org.apache.turbine.modules.Loader;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.services.template.TemplateService;
/**
@@ -70,6 +67,7 @@ public class ClassMapper
*/
public ClassMapper()
{
+ // empty
}
/**
@@ -103,15 +101,15 @@ public class ClassMapper
log.debug("doMapping(" + template + ")");
// Copy our elements into an array
- List components
- = new ArrayList(Arrays.asList(StringUtils.split(
+ List<String> components
+ = new ArrayList<String>(Arrays.asList(StringUtils.split(
template,
String.valueOf(TemplateService.TEMPLATE_PARTS_SEPARATOR))));
int componentSize = components.size() - 1 ;
// This method never gets an empty string passed.
// So this is never < 0
- String className = (String) components.get(componentSize);
+ String className = components.get(componentSize);
components.remove(componentSize--);
log.debug("className is " + className);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java Tue Feb 15 22:06:55 2011
@@ -21,15 +21,13 @@ package org.apache.turbine.services.temp
*/
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.services.template.TemplateEngineService;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -63,6 +61,7 @@ public class LayoutTemplateMapper
*/
public LayoutTemplateMapper()
{
+ // empty
}
/**
@@ -76,15 +75,15 @@ public class LayoutTemplateMapper
{
log.debug("doMapping(" + template + ")");
// Copy our elements into an array
- List components
- = new ArrayList(Arrays.asList(StringUtils.split(
+ List<String> components
+ = new ArrayList<String>(Arrays.asList(StringUtils.split(
template,
String.valueOf(TemplateService.TEMPLATE_PARTS_SEPARATOR))));
int componentSize = components.size() - 1 ;
// This method never gets an empty string passed.
// So this is never < 0
- String templateName = (String) components.get(componentSize);
+ String templateName = components.get(componentSize);
components.remove(componentSize--);
log.debug("templateName is " + templateName);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java Tue Feb 15 22:06:55 2011
@@ -21,15 +21,13 @@ package org.apache.turbine.services.temp
*/
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.services.template.TemplateEngineService;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -59,6 +57,7 @@ public class ScreenDefaultTemplateMapper
*/
public ScreenDefaultTemplateMapper()
{
+ // empty
}
/**
@@ -72,15 +71,15 @@ public class ScreenDefaultTemplateMapper
{
log.debug("doMapping(" + template + ")");
// Copy our elements into an array
- List components
- = new ArrayList(Arrays.asList(StringUtils.split(
+ List<String> components
+ = new ArrayList<String>(Arrays.asList(StringUtils.split(
template,
String.valueOf(TemplateService.TEMPLATE_PARTS_SEPARATOR))));
int componentSize = components.size() - 1 ;
// This method never gets an empty string passed.
// So this is never < 0
- String templateName = (String) components.get(componentSize);
+ String templateName = components.get(componentSize);
components.remove(componentSize--);
log.debug("templateName is " + templateName);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java Tue Feb 15 22:06:55 2011
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.om.security.Group;
/**
@@ -41,9 +40,12 @@ import org.apache.turbine.om.security.Gr
* @version $Id$
*/
public class GroupSet
- extends SecuritySet
+ extends SecuritySet<Group>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -80412911083063489L;
+
+ /**
* Constructs an empty GroupSet
*/
public GroupSet()
@@ -59,7 +61,7 @@ public class GroupSet
*
* @param groups A collection of groups to be contained in the set.
*/
- public GroupSet(Collection groups)
+ public GroupSet(Collection<Group> groups)
{
super();
add(groups);
@@ -88,12 +90,11 @@ public class GroupSet
* if no change to this GroupSet occurred (this GroupSet
* already contained all members of the added GroupSet).
*/
- public boolean add(Collection groups)
+ public boolean add(Collection<Group> groups)
{
boolean res = false;
- for (Iterator it = groups.iterator(); it.hasNext();)
+ for (Group g : groups)
{
- Group g = (Group) it.next();
res |= add(g);
}
return res;
@@ -110,9 +111,8 @@ public class GroupSet
public boolean add(GroupSet groupSet)
{
boolean res = false;
- for( Iterator it = groupSet.iterator(); it.hasNext();)
+ for(Group g : groupSet)
{
- Group g = (Group) it.next();
res |= add(g);
}
return res;
@@ -142,7 +142,7 @@ public class GroupSet
*/
public boolean contains(Group group)
{
- return nameMap.containsValue((Object) group);
+ return nameMap.containsValue(group);
}
/**
@@ -180,7 +180,7 @@ public class GroupSet
*/
public Group[] getGroupsArray()
{
- return (Group[]) getSet().toArray(new Group[0]);
+ return getSet().toArray(new Group[0]);
}
/**
@@ -194,9 +194,9 @@ public class GroupSet
StringBuffer sb = new StringBuffer();
sb.append("GroupSet: ");
- for(Iterator it = iterator(); it.hasNext();)
+ for(Iterator<Group> it = iterator(); it.hasNext();)
{
- Group g = (Group) it.next();
+ Group g = it.next();
sb.append('[');
sb.append(g.getName());
sb.append(" -> ");
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java Tue Feb 15 22:06:55 2011
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.om.security.Permission;
/**
@@ -42,9 +41,12 @@ import org.apache.turbine.om.security.Pe
* @version $Id$
*/
public class PermissionSet
- extends SecuritySet
+ extends SecuritySet<Permission>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = 7740960537240820226L;
+
+ /**
* Constructs an empty PermissionSet
*/
public PermissionSet()
@@ -60,7 +62,7 @@ public class PermissionSet
*
* @param permissions A collection of permissions to be contained in the set.
*/
- public PermissionSet(Collection permissions)
+ public PermissionSet(Collection<Permission> permissions)
{
super();
add(permissions);
@@ -89,12 +91,11 @@ public class PermissionSet
* if no change to this PermissionSet occurred (this PermissionSet
* already contained all members of the added PermissionSet).
*/
- public boolean add(Collection permissions)
+ public boolean add(Collection<Permission> permissions)
{
boolean res = false;
- for (Iterator it = permissions.iterator(); it.hasNext();)
+ for (Permission p : permissions)
{
- Permission p = (Permission) it.next();
res |= add(p);
}
return res;
@@ -112,9 +113,8 @@ public class PermissionSet
public boolean add(PermissionSet permissionSet)
{
boolean res = false;
- for( Iterator it = permissionSet.iterator(); it.hasNext();)
+ for(Permission p : permissionSet)
{
- Permission p = (Permission) it.next();
res |= add(p);
}
return res;
@@ -144,7 +144,7 @@ public class PermissionSet
*/
public boolean contains(Permission permission)
{
- return nameMap.containsValue((Object) permission);
+ return nameMap.containsValue(permission);
}
/**
@@ -182,7 +182,7 @@ public class PermissionSet
*/
public Permission[] getPermissionsArray()
{
- return (Permission[]) getSet().toArray(new Permission[0]);
+ return getSet().toArray(new Permission[0]);
}
/**
@@ -196,9 +196,9 @@ public class PermissionSet
StringBuffer sb = new StringBuffer();
sb.append("PermissionSet: ");
- for(Iterator it = iterator(); it.hasNext();)
+ for(Iterator<Permission> it = iterator(); it.hasNext();)
{
- Permission p = (Permission) it.next();
+ Permission p = it.next();
sb.append('[');
sb.append(p.getName());
sb.append(" -> ");
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java Tue Feb 15 22:06:55 2011
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.om.security.Role;
/**
@@ -41,9 +40,12 @@ import org.apache.turbine.om.security.Ro
* @version $Id$
*/
public class RoleSet
- extends SecuritySet
+ extends SecuritySet<Role>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = 8122474203780997107L;
+
+ /**
* Constructs an empty RoleSet
*/
public RoleSet()
@@ -59,7 +61,7 @@ public class RoleSet
*
* @param roles A collection of roles to be contained in the set.
*/
- public RoleSet(Collection roles)
+ public RoleSet(Collection<Role> roles)
{
super();
add(roles);
@@ -88,12 +90,11 @@ public class RoleSet
* if no change to this RoleSet occurred (this RoleSet
* already contained all members of the added RoleSet).
*/
- public boolean add(Collection roles)
+ public boolean add(Collection<Role> roles)
{
boolean res = false;
- for (Iterator it = roles.iterator(); it.hasNext();)
+ for (Role r : roles)
{
- Role r = (Role) it.next();
res |= add(r);
}
return res;
@@ -110,9 +111,8 @@ public class RoleSet
public boolean add(RoleSet roleSet)
{
boolean res = false;
- for( Iterator it = roleSet.iterator(); it.hasNext();)
+ for(Role r : roleSet)
{
- Role r = (Role) it.next();
res |= add(r);
}
return res;
@@ -142,7 +142,7 @@ public class RoleSet
*/
public boolean contains(Role role)
{
- return nameMap.containsValue((Object) role);
+ return nameMap.containsValue(role);
}
/**
@@ -180,7 +180,7 @@ public class RoleSet
*/
public Role[] getRolesArray()
{
- return (Role[]) getSet().toArray(new Role[0]);
+ return getSet().toArray(new Role[0]);
}
/**
@@ -194,9 +194,9 @@ public class RoleSet
StringBuffer sb = new StringBuffer();
sb.append("RoleSet: ");
- for(Iterator it = iterator(); it.hasNext();)
+ for(Iterator<Role> it = iterator(); it.hasNext();)
{
- Role r = (Role) it.next();
+ Role r = it.next();
sb.append('[');
sb.append(r.getName());
sb.append(" -> ");
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java?rev=1071091&r1=1071090&r2=1071091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java Tue Feb 15 22:06:55 2011
@@ -21,7 +21,6 @@ package org.apache.turbine.util.security
*/
import java.io.Serializable;
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -43,22 +42,25 @@ import org.apache.commons.lang.StringUti
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public abstract class SecuritySet
- implements Serializable
+public abstract class SecuritySet<T>
+ implements Serializable, Iterable<T>
{
- /** Map for "name" -> "security object" */
- protected Map nameMap = null;
+ /** Serial version */
+ private static final long serialVersionUID = -1315871299888969431L;
+
+ /** Map for "name" -> "security object" */
+ protected Map<String, T> nameMap = null;
/** Map for "id" -> "security object" */
- protected Map idMap = null;
+ protected Map<Integer, T> idMap = null;
/**
* Constructs an empty Set
*/
public SecuritySet()
{
- nameMap = new TreeMap();
- idMap = new TreeMap();
+ nameMap = new TreeMap<String, T>();
+ idMap = new TreeMap<Integer, T>();
}
/**
@@ -67,9 +69,9 @@ public abstract class SecuritySet
* @return A Set Object
*
*/
- public Set getSet()
+ public Set<? extends T> getSet()
{
- return new HashSet(nameMap.values());
+ return new HashSet<T>(nameMap.values());
}
/**
@@ -78,7 +80,7 @@ public abstract class SecuritySet
* @return The Set of Names in this Object,
* backed by the actual data.
*/
- public Set getNames()
+ public Set<String> getNames()
{
return nameMap.keySet();
}
@@ -89,7 +91,7 @@ public abstract class SecuritySet
* @return The Set of Ids in this Object,
* backed by the actual data.
*/
- public Set getIds()
+ public Set<Integer> getIds()
{
return idMap.keySet();
}
@@ -134,7 +136,7 @@ public abstract class SecuritySet
*
* @return An iterator for the Set
*/
- public Iterator iterator()
+ public Iterator<T> iterator()
{
return nameMap.values().iterator();
}
@@ -157,9 +159,9 @@ public abstract class SecuritySet
public String toString()
{
StringBuffer sbuf = new StringBuffer(12 * size());
- for(Iterator it = nameMap.keySet().iterator(); it.hasNext(); )
+ for(Iterator<String> it = nameMap.keySet().iterator(); it.hasNext(); )
{
- sbuf.append((String) it.next());
+ sbuf.append(it.next());
if(it.hasNext())
{