Author: gseitz
Date: Mon May 19 14:09:43 2008
New Revision: 657981
URL: http://svn.apache.org/viewvc?rev=657981&view=rev
Log:
losen generics to fix compilation errors with javac
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java?rev=657981&r1=657980&r2=657981&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
Mon May 19 14:09:43 2008
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
/** Holds roles objects for component classes */
- private final Map<Class<? extends Component<?>>, Roles>
rolesForComponentClass = new HashMap<Class<? extends Component<?>>, Roles>();
+ private final Map<Class<? extends Component>, Roles>
rolesForComponentClass = new HashMap<Class<? extends Component>, Roles>();
/**
* Gives the given role permission to instantiate the given class.
@@ -48,7 +48,7 @@
* @param rolesToAdd
* The roles to add
*/
- public final void authorize(final Class<? extends Component<?>>
componentClass,
+ public final void authorize(final Class<? extends Component>
componentClass,
final Roles rolesToAdd)
{
if (componentClass == null)
@@ -78,7 +78,7 @@
* @param componentClass
* The component class
*/
- public final void authorizeAll(final Class<? extends Component<?>>
componentClass)
+ public final void authorizeAll(final Class<? extends Component>
componentClass)
{
if (componentClass == null)
{
@@ -96,7 +96,7 @@
* @return the roles that have a binding with the given component
class, or null if no entries
* are found
*/
- public Roles authorizedRoles(final Class<? extends Component<?>>
componentClass)
+ public Roles authorizedRoles(final Class<? extends Component>
componentClass)
{
if (componentClass == null)
{
@@ -114,7 +114,7 @@
* @param rolesToRemove
* The role to deny
*/
- public final void unauthorize(final Class<? extends Component<?>>
componentClass,
+ public final void unauthorize(final Class<? extends Component>
componentClass,
final Roles rolesToRemove)
{
if (componentClass == null)
@@ -150,7 +150,7 @@
/**
* @return gets map with roles objects for a component classes
*/
- protected final Map<Class<? extends Component<?>>, Roles>
getRolesForComponentClass()
+ protected final Map<Class<? extends Component>, Roles>
getRolesForComponentClass()
{
return rolesForComponentClass;
}
Modified:
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java?rev=657981&r1=657980&r2=657981&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Mon May 19 14:09:43 2008
@@ -55,18 +55,17 @@
*
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public void testAdd1() throws Exception
{
InstantiationPermissions permissions = new
InstantiationPermissions();
- permissions.authorize((Class<? extends
Component<?>>)Page.class, new Roles("jonathan"));
- permissions.authorize((Class<? extends
Component<?>>)Page.class, new Roles("johan"));
- permissions.authorize((Class<? extends
Component<?>>)Page.class, new Roles("maurice"));
- permissions.authorize((Class<? extends
Component<?>>)Page.class, new Roles("eelco"));
+ permissions.authorize(Page.class, new Roles("jonathan"));
+ permissions.authorize(Page.class, new Roles("johan"));
+ permissions.authorize(Page.class, new Roles("maurice"));
+ permissions.authorize(Page.class, new Roles("eelco"));
assertEquals(4,
permissions.getRolesForComponentClass().get(Page.class).size());
- permissions.unauthorize((Class<? extends
Component<?>>)Page.class, new Roles("maurice"));
+ permissions.unauthorize(Page.class, new Roles("maurice"));
assertEquals(3,
permissions.getRolesForComponentClass().get(Page.class).size());
- permissions.authorizeAll((Class<? extends
Component<?>>)Page.class);
+ permissions.authorizeAll(Page.class);
assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
}
@@ -75,12 +74,11 @@
*
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public void testRemove1() throws Exception
{
InstantiationPermissions permissions = new
InstantiationPermissions();
assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
- permissions.unauthorize((Class<? extends
Component<?>>)Page.class, new Roles("eelco"));
+ permissions.unauthorize(Page.class, new Roles("eelco"));
assertEquals(new
Roles(MetaDataRoleAuthorizationStrategy.NO_ROLE),
permissions.getRolesForComponentClass().get(Page.class));
}
