Author: gseitz
Date: Mon May 19 23:39:17 2008
New Revision: 658121
URL: http://svn.apache.org/viewvc?rev=658121&view=rev
Log:
use ?extends Page<?> instead of ?extends Component<?> for isPageAuthorized
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java?rev=658121&r1=658120&r2=658121&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
Mon May 19 23:39:17 2008
@@ -35,10 +35,13 @@
/**
* Construct.
*
+ * @param <T>
+ * The component type.
+ *
* @param componentClass
* The unauthorized component class
*/
- public UnauthorizedInstantiationException(final Class<? extends
Component> componentClass)
+ public <T extends Component<?>>
UnauthorizedInstantiationException(final Class<T> componentClass)
{
super("Not authorized to instantiate class " +
componentClass.getName());
componentClassName = componentClass.getName();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java?rev=658121&r1=658120&r2=658121&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
Mon May 19 23:39:17 2008
@@ -43,12 +43,13 @@
/**
* @see
org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
public final <T extends Component<?>> boolean isInstantiationAuthorized(
final Class<T> componentClass)
{
if (instanceOf(componentClass, Page.class))
{
- return isPageAuthorized(componentClass);
+ return isPageAuthorized((Class<? extends
Page<?>>)componentClass);
}
return true;
}
@@ -71,11 +72,14 @@
/**
* Whether to page may be created. Returns true by default.
*
+ * @param <T>
+ * the type of the page
+ *
* @param pageClass
* The Page class
* @return True if to page may be created
*/
- protected <T extends Component<?>> boolean isPageAuthorized(Class<T>
pageClass)
+ protected <T extends Page<?>> boolean isPageAuthorized(Class<T>
pageClass)
{
return true;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java?rev=658121&r1=658120&r2=658121&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
Mon May 19 23:39:17 2008
@@ -106,7 +106,7 @@
* @see
org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy#isPageAuthorized(java.lang.Class)
*/
@Override
- protected <T extends Component<?>> boolean isPageAuthorized(final
Class<T> pageClass)
+ protected <T extends Page<?>> boolean isPageAuthorized(final Class<T>
pageClass)
{
if (instanceOf(pageClass, securePageSuperTypeRef.get()))
{
