Author: ehillenius
Date: Sat Jan 13 18:56:06 2007
New Revision: 496023
URL: http://svn.apache.org/viewvc?view=rev&rev=496023
Log:
removed the type argument in MetaDataKey, as we have generics for that now
Modified:
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java
incubator/wicket/trunk/wicket/src/main/java/wicket/MetaDataKey.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
Modified:
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java?view=diff&rev=496023&r1=496022&r2=496023
==============================================================================
---
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
(original)
+++
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
Sat Jan 13 18:56:06 2007
@@ -57,7 +57,7 @@
* not need to use this meta data key directly, but instead use one of
the
* bind methods of this class.
*/
- public static final MetaDataKey<ActionPermissions> ACTION_PERMISSIONS =
new MetaDataKey<ActionPermissions>(ActionPermissions.class)
+ public static final MetaDataKey<ActionPermissions> ACTION_PERMISSIONS =
new MetaDataKey<ActionPermissions>()
{
private static final long serialVersionUID = 1L;
};
@@ -67,8 +67,7 @@
* do not need to use this meta data key directly, but instead use one
of
* the bind methods of this class.
*/
- public static final MetaDataKey<InstantiationPermissions>
INSTANTIATION_PERMISSIONS = new MetaDataKey<InstantiationPermissions>(
- InstantiationPermissions.class)
+ public static final MetaDataKey<InstantiationPermissions>
INSTANTIATION_PERMISSIONS = new MetaDataKey<InstantiationPermissions>()
{
private static final long serialVersionUID = 1L;
};
@@ -87,7 +86,7 @@
* The comma separated roles that are authorized to create
* component instances of type componentClass
*/
- public static final void authorize(final Class< ? extends Component>
componentClass,
+ public static final void authorize(final Class<? extends Component>
componentClass,
final String roles)
{
final Application application = Application.get();
@@ -131,10 +130,11 @@
* @param componentClass
* The component class
*/
- public static final void authorizeAll(final Class< ? extends Component>
componentClass)
+ public static final void authorizeAll(final Class<? extends Component>
componentClass)
{
Application application = Application.get();
- InstantiationPermissions authorizedRoles =
application.getMetaData(INSTANTIATION_PERMISSIONS);
+ InstantiationPermissions authorizedRoles = application
+ .getMetaData(INSTANTIATION_PERMISSIONS);
if (authorizedRoles != null)
{
authorizedRoles.authorizeAll(componentClass);
@@ -174,10 +174,11 @@
* The comma separated list of roles that are no longer to be
* authorized to create instances of type componentClass
*/
- public static final void unauthorize(final Class< ? extends Component>
componentClass,
+ public static final void unauthorize(final Class<? extends Component>
componentClass,
final String roles)
{
- final InstantiationPermissions permissions =
Application.get().getMetaData(INSTANTIATION_PERMISSIONS);
+ final InstantiationPermissions permissions =
Application.get().getMetaData(
+ INSTANTIATION_PERMISSIONS);
if (permissions != null)
{
permissions.unauthorize(componentClass, new
Roles(roles));
@@ -218,7 +219,7 @@
* @param componentClass
* The component class
*/
- public static final void unauthorizeAll(Class< ? extends Component>
componentClass)
+ public static final void unauthorizeAll(Class<? extends Component>
componentClass)
{
authorizeAll(componentClass);
authorize(componentClass, NO_ROLE);
@@ -315,7 +316,7 @@
* or null if no specific authorization was configured
*/
private static Roles rolesAuthorizedToInstantiate(
- final Class< ? extends Component> componentClass)
+ final Class<? extends Component> componentClass)
{
final InstantiationPermissions permissions =
(InstantiationPermissions)Application.get()
.getMetaData(INSTANTIATION_PERMISSIONS);
@@ -335,7 +336,7 @@
* the action
* @return the roles for the action as defined with the given component
*/
- private static Roles rolesAuthorizedToPerformAction(final Component
component,
+ private static Roles rolesAuthorizedToPerformAction(final Component<?>
component,
final Action action)
{
final ActionPermissions permissions =
(ActionPermissions)component
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java?view=diff&rev=496023&r1=496022&r2=496023
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java Sat Jan
13 18:56:06 2007
@@ -477,8 +477,7 @@
private static final Object[] LISTENER_ARGS = new Object[] {};
/** meta data key for missing body tags logging. */
- private static final MetaDataKey<IComponentBorder> BORDER_KEY = new
MetaDataKey<IComponentBorder>(
- IComponentBorder.class)
+ private static final MetaDataKey<IComponentBorder> BORDER_KEY = new
MetaDataKey<IComponentBorder>()
{
private static final long serialVersionUID = 1L;
};
@@ -3368,11 +3367,9 @@
/**
* Metadata key used to store/retrieve markup id
*/
- private static MetaDataKey<String> MARKUP_ID_KEY = new
MetaDataKey<String>(String.class)
+ private static MetaDataKey<String> MARKUP_ID_KEY = new
MetaDataKey<String>()
{
-
private static final long serialVersionUID = 1L;
-
};
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/MetaDataKey.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/MetaDataKey.java?view=diff&rev=496023&r1=496022&r2=496023
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/MetaDataKey.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/MetaDataKey.java Sat Jan
13 18:56:06 2007
@@ -36,18 +36,11 @@
{
private static final long serialVersionUID = 1L;
- /** Type of data associated with this key */
- private Class<T> type;
-
/**
* Constructor.
- *
- * @param type
- * The type of value stored under this key
*/
- public MetaDataKey(final Class<T> type)
+ public MetaDataKey()
{
- this.type = type;
}
/**
@@ -89,7 +82,6 @@
*/
MetaDataEntry[] set(MetaDataEntry[] metaData, final T object)
{
- checkType(object);
boolean set = false;
if (metaData != null)
{
@@ -121,24 +113,5 @@
}
}
return metaData;
- }
-
- /**
- * Checks the type of the given object against the type for this
metadata
- * key.
- *
- * @param object
- * The object to check
- * @throws IllegalArgumentException
- * Thrown if the type of the given object does not match the
- * type for this key.
- */
- void checkType(final Object object)
- {
- if (object != null && !type.isAssignableFrom(object.getClass()))
- {
- throw new IllegalArgumentException("MetaDataKey " +
getClass()
- + " requires argument of " + type + ",
not " + object.getClass());
- }
}
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java?view=diff&rev=496023&r1=496022&r2=496023
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java Sat Jan 13
18:56:06 2007
@@ -125,8 +125,7 @@
private static final long serialVersionUID = 1L;
/** meta data key for missing body tags logging. */
- public static final MetaDataKey<PageMapAccessMetaData>
PAGEMAP_ACCESS_MDK = new MetaDataKey<PageMapAccessMetaData>(
- PageMapAccessMetaData.class)
+ public static final MetaDataKey<PageMapAccessMetaData>
PAGEMAP_ACCESS_MDK = new MetaDataKey<PageMapAccessMetaData>()
{
private static final long serialVersionUID = 1L;
};
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=496023&r1=496022&r2=496023
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
Sat Jan 13 18:56:06 2007
@@ -52,7 +52,7 @@
/** Logging object */
private static final Logger log =
LoggerFactory.getLogger(WebRequestCycle.class);
- private static final MetaDataKey<Boolean> BROWSER_WAS_POLLED_KEY = new
MetaDataKey<Boolean>(Boolean.class)
+ private static final MetaDataKey<Boolean> BROWSER_WAS_POLLED_KEY = new
MetaDataKey<Boolean>()
{
private static final long serialVersionUID = 1L;
};
