You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/19 18:53:19 UTC
svn commit: r669560 [4/8] - in /wicket/sandbox/ivaynberg/generics:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/mai...
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java Thu Jun 19 09:52:58 2008
@@ -395,7 +395,7 @@
*
* @return the page or null
*/
- public final Page<?> getResponsePage()
+ public final Page getResponsePage()
{
IRequestTarget target = getRequestTarget();
if (target instanceof IPageRequestTarget)
@@ -415,7 +415,7 @@
*
* @return the page class or null
*/
- public final Class<? extends Page<?>> getResponsePageClass()
+ public final Class<? extends Page> getResponsePageClass()
{
IRequestTarget target = getRequestTarget();
if (target != null && (target instanceof IBookmarkablePageRequestTarget))
@@ -468,7 +468,7 @@
* The exception
* @return Any error page to redirect to
*/
- public Page<?> onRuntimeException(Page<?> page, RuntimeException e)
+ public Page onRuntimeException(Page page, RuntimeException e)
{
return null;
}
@@ -482,7 +482,7 @@
* @param page
* The page to redirect to
*/
- public abstract void redirectTo(final Page<?> page);
+ public abstract void redirectTo(final Page page);
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
@@ -512,7 +512,7 @@
* @param component
* to be re-rendered
*/
- public final void request(final Component<?> component)
+ public final void request(final Component component)
{
checkReuse();
@@ -645,7 +645,7 @@
IRequestTarget target = RequestCycle.get().getRequestTarget();
if (target instanceof IPageRequestTarget)
{
- Page<?> page = ((IPageRequestTarget)target).getPage();
+ Page page = ((IPageRequestTarget)target).getPage();
return page != null ? page.getPageMapName() : null;
}
else if (target instanceof IBookmarkablePageRequestTarget)
@@ -667,7 +667,7 @@
* @param pageClass
* The page class to render as a response
*/
- public final <C extends Page<?>> void setResponsePage(final Class<C> pageClass)
+ public final <C extends Page> void setResponsePage(final Class<C> pageClass)
{
setResponsePage(pageClass, null);
}
@@ -682,7 +682,7 @@
* @param pageParameters
* The page parameters that gets appended to the bookmarkable url,
*/
- public final <C extends Page<?>> void setResponsePage(final Class<C> pageClass,
+ public final <C extends Page> void setResponsePage(final Class<C> pageClass,
final PageParameters pageParameters)
{
setResponsePage(pageClass, pageParameters, getCurrentPageMap());
@@ -701,7 +701,7 @@
* @param pageMapName
* The pagemap in which the response page should be created
*/
- public final <C extends Page<?>> void setResponsePage(final Class<C> pageClass,
+ public final <C extends Page> void setResponsePage(final Class<C> pageClass,
final PageParameters pageParameters, final String pageMapName)
{
IRequestTarget target = new BookmarkablePageRequestTarget(pageMapName, pageClass,
@@ -715,7 +715,7 @@
* @param page
* The page to render as a response
*/
- public final void setResponsePage(final Page<?> page)
+ public final void setResponsePage(final Page page)
{
IRequestTarget target = new PageRequestTarget(page);
setRequestTarget(target);
@@ -778,7 +778,7 @@
* Parameters to page
* @return Bookmarkable URL to page
*/
- public final <C extends Page<?>> CharSequence urlFor(final Class<C> pageClass,
+ public final <C extends Page> CharSequence urlFor(final Class<C> pageClass,
final PageParameters parameters)
{
return urlFor(null, pageClass, parameters);
@@ -798,7 +798,7 @@
* The listener interface on the component
* @return A URL that encodes a page, component, behavior and interface to call
*/
- public final CharSequence urlFor(final Component<?> component, final IBehavior behaviour,
+ public final CharSequence urlFor(final Component component, final IBehavior behaviour,
final RequestListenerInterface listener)
{
int index = component.getBehaviors().indexOf(behaviour);
@@ -839,11 +839,11 @@
* Additional parameters to pass to the page
* @return A URL that encodes a page, component and interface to call
*/
- public final CharSequence urlFor(final Component<?> component,
+ public final CharSequence urlFor(final Component component,
final RequestListenerInterface listener, ValueMap params)
{
// Get Page holding component and mark it as stateful.
- final Page<?> page = component.getPage();
+ final Page page = component.getPage();
final IRequestTarget target;
if (listener != IRedirectListener.INTERFACE && component.isStateless() &&
page.isBookmarkable() && page.getStatelessHint())
@@ -918,7 +918,7 @@
* The listener interface on the component
* @return A URL that encodes a page, component and interface to call
*/
- public final CharSequence urlFor(final Component<?> component,
+ public final CharSequence urlFor(final Component component,
final RequestListenerInterface listener)
{
return urlFor(component, listener, null);
@@ -939,7 +939,7 @@
* Parameters to page
* @return Bookmarkable URL to page
*/
- public final <C extends Page<?>> CharSequence urlFor(final IPageMap pageMap,
+ public final <C extends Page> CharSequence urlFor(final IPageMap pageMap,
final Class<C> pageClass, final PageParameters parameters)
{
final IRequestTarget target = new BookmarkablePageRequestTarget(pageMap == null
@@ -968,7 +968,7 @@
* The page
* @return The url pointing to the provided page
*/
- public final CharSequence urlFor(final Page<?> page)
+ public final CharSequence urlFor(final Page page)
{
IRequestTarget target = new PageRequestTarget(page);
getSession().touch(((IPageRequestTarget)target).getPage());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java Thu Jun 19 09:52:58 2008
@@ -164,7 +164,7 @@
* @param component
* The component
*/
- public final void invoke(final Page< ? > page, final Component< ? > component)
+ public final void invoke(final Page page, final Component component)
{
if (!component.isEnabled() || !component.isVisibleInHierarchy())
{
@@ -219,7 +219,7 @@
* Request parameters
* @return The request target
*/
- public IRequestTarget newRequestTarget(final Page< ? > page, final Component< ? > component,
+ public IRequestTarget newRequestTarget(final Page page, final Component component,
final RequestListenerInterface listener, final RequestParameters requestParameters)
{
return new ListenerInterfaceRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java Thu Jun 19 09:52:58 2008
@@ -42,7 +42,7 @@
* @param interceptPage
* redirect page
*/
- public RestartResponseAtInterceptPageException(final Page<?> interceptPage)
+ public RestartResponseAtInterceptPageException(final Page interceptPage)
{
if (interceptPage == null)
{
@@ -60,7 +60,7 @@
* @param interceptPageClass
* Class of intercept page to instantiate
*/
- public <C extends Page<?>> RestartResponseAtInterceptPageException(
+ public <C extends Page> RestartResponseAtInterceptPageException(
final Class<C> interceptPageClass)
{
if (interceptPageClass == null)
@@ -76,9 +76,9 @@
* @param interceptPage
* The intercept page to redirect to
*/
- private void redirectToInterceptPage(final Page<?> interceptPage)
+ private void redirectToInterceptPage(final Page interceptPage)
{
- final Page<?> requestPage = RequestCycle.get().getRequest().getPage();
+ final Page requestPage = RequestCycle.get().getRequest().getPage();
/*
* requestPage can be null if we throw the restart response exception before any page is
@@ -106,10 +106,10 @@
* @param interceptPageClass
* The intercept page class to redirect to
*/
- private <C extends Page<?>> void redirectToInterceptPage(final Class<C> interceptPageClass)
+ private <C extends Page> void redirectToInterceptPage(final Class<C> interceptPageClass)
{
final RequestCycle cycle = RequestCycle.get();
- final Page<?> requestPage = cycle.getRequest().getPage();
+ final Page requestPage = cycle.getRequest().getPage();
/*
* requestPage can be null if we throw the restart response exception before any page is
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseException.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RestartResponseException.java Thu Jun 19 09:52:58 2008
@@ -34,7 +34,7 @@
* @param pageClass
* class of bookmarkable page
*/
- public <C extends Page<?>> RestartResponseException(Class<C> pageClass)
+ public <C extends Page> RestartResponseException(Class<C> pageClass)
{
RequestCycle.get().setResponsePage(pageClass);
}
@@ -49,7 +49,7 @@
* @param params
* bookmarkable page parameters
*/
- public <C extends Page<?>> RestartResponseException(Class<C> pageClass, PageParameters params)
+ public <C extends Page> RestartResponseException(Class<C> pageClass, PageParameters params)
{
RequestCycle.get().setResponsePage(pageClass, params);
}
@@ -60,7 +60,7 @@
* @param page
* redirect page
*/
- public RestartResponseException(Page<?> page)
+ public RestartResponseException(Page page)
{
RequestCycle.get().setResponsePage(page);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Session.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Session.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Session.java Thu Jun 19 09:52:58 2008
@@ -175,7 +175,7 @@
private static final long serialVersionUID = 1L;
/** A store for touched pages for one request */
- private static final ThreadLocal<List<Page<?>>> touchedPages = new ThreadLocal<List<Page<?>>>();
+ private static final ThreadLocal<List<Page>> touchedPages = new ThreadLocal<List<Page>>();
/** Prefix for attributes holding page map entries */
static final String pageMapEntryAttributePrefix = "p:";
@@ -646,7 +646,7 @@
* @param versionNumber
* @return The page of that pageid and version, null if not found
*/
- public final Page<?> getPage(final int pageId, final int versionNumber)
+ public final Page getPage(final int pageId, final int versionNumber)
{
if (Application.get().getSessionSettings().isPageIdUniquePerSession() == false)
{
@@ -681,7 +681,7 @@
* @return The page based on the first path component (the page id), or null if the requested
* version of the page cannot be found.
*/
- public final Page<?> getPage(final String pageMapName, final String path,
+ public final Page getPage(final String pageMapName, final String path,
final int versionNumber)
{
if (log.isDebugEnabled())
@@ -770,7 +770,7 @@
newEntry.requestCycle = RequestCycle.get();
pageMapsUsedInRequest.put(pageMap, newEntry);
final String id = Strings.firstPathComponent(path, Component.PATH_SEPARATOR);
- Page<?> page = pageMap.get(Integer.parseInt(id), versionNumber);
+ Page page = pageMap.get(Integer.parseInt(id), versionNumber);
if (page == null)
{
pageMapsUsedInRequest.remove(pageMap);
@@ -801,7 +801,7 @@
* The page, or null if no page context is available
* @return The page factory for the page, or the default page factory if page was null
*/
- public final IPageFactory getPageFactory(final Page<?> page)
+ public final IPageFactory getPageFactory(final Page page)
{
if (page != null)
{
@@ -1059,15 +1059,15 @@
*
* @param page
*/
- public final void touch(Page<?> page)
+ public final void touch(Page page)
{
// store it in a list, so that the pages are really pushed
// to the pagemap when the session does it update/detaches.
// all the pages are then detached
- List<Page<?>> lst = touchedPages.get();
+ List<Page> lst = touchedPages.get();
if (lst == null)
{
- lst = new ArrayList<Page<?>>();
+ lst = new ArrayList<Page>();
touchedPages.set(lst);
lst.add(page);
}
@@ -1084,9 +1084,9 @@
*
* @param page
*/
- public final void untouch(Page<?> page)
+ public final void untouch(Page page)
{
- List<Page<?>> lst = touchedPages.get();
+ List<Page> lst = touchedPages.get();
if (lst != null)
{
lst.remove(page);
@@ -1329,7 +1329,7 @@
* @param page
* The page to add to dirty objects list
*/
- void dirtyPage(final Page<?> page)
+ void dirtyPage(final Page page)
{
List<IClusterable> dirtyObjects = getDirtyObjectsList();
if (!dirtyObjects.contains(page))
@@ -1381,13 +1381,13 @@
*/
final void requestDetached()
{
- List<Page<?>> touchedPages = Session.touchedPages.get();
+ List<Page> touchedPages = Session.touchedPages.get();
Session.touchedPages.set(null);
if (touchedPages != null)
{
for (int i = 0; i < touchedPages.size(); i++)
{
- Page<?> page = touchedPages.get(i);
+ Page page = touchedPages.get(i);
page.getPageMap().put(page);
dirty = true;
}
@@ -1424,7 +1424,7 @@
Object object = iterator.next();
if (object instanceof Page)
{
- final Page<?> page = (Page<?>)object;
+ final Page page = (Page)object;
if (page.isPageStateless())
{
// check, can it be that stateless pages where added to
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Thu Jun 19 09:52:58 2008
@@ -275,7 +275,7 @@
return ((IAjaxIndicatorAware)this).getAjaxIndicatorMarkupId();
}
- Component< ? > parent = getComponent().getParent();
+ Component parent = getComponent().getParent();
while (parent != null)
{
if (parent instanceof IAjaxIndicatorAware)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java Thu Jun 19 09:52:58 2008
@@ -105,7 +105,7 @@
super.onComponentTag(tag);
// only add the event handler when the component is enabled.
- Component< ? > myComponent = getComponent();
+ Component myComponent = getComponent();
if (myComponent.isEnabled() && myComponent.isEnableAllowed())
{
tag.put(event, getEventHandler());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Thu Jun 19 09:52:58 2008
@@ -96,7 +96,7 @@
* javascript
*
*/
- public void onBeforeRespond(Map<String, Component<?>> map, AjaxRequestTarget target);
+ public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target);
/**
* Triggered after ajax request target is done with its response cycle. At this point only
@@ -111,7 +111,7 @@
* @param response
* response object that can be used to output javascript
*/
- public void onAfterRespond(Map<String, Component<?>> map, IJavascriptResponse response);
+ public void onAfterRespond(Map<String, Component> map, IJavascriptResponse response);
}
/**
@@ -243,20 +243,20 @@
private final AjaxResponse encodingHeaderResponse;
/** the component instances that will be rendered */
- private final Map<String, Component<?>> markupIdToComponent = new LinkedHashMap<String, Component<?>>();
+ private final Map<String, Component> markupIdToComponent = new LinkedHashMap<String, Component>();
private final List<String> prependJavascripts = new ArrayList<String>();
/** a list of listeners */
private List<IListener> listeners = null;
- private final Page<?> page;
+ private final Page page;
/**
*
* @see org.apache.wicket.request.target.component.IPageRequestTarget#getPage()
*/
- public Page<?> getPage()
+ public Page getPage()
{
return page;
}
@@ -266,7 +266,7 @@
*
* @param page
*/
- public AjaxRequestTarget(Page<?> page)
+ public AjaxRequestTarget(Page page)
{
this.page = page;
Response response = RequestCycle.get().getResponse();
@@ -304,7 +304,7 @@
* @param parent
* @param childCriteria
*/
- public final void addChildren(MarkupContainer<?> parent, Class<?> childCriteria)
+ public final void addChildren(MarkupContainer parent, Class<?> childCriteria)
{
if (parent == null)
{
@@ -317,10 +317,10 @@
Component.class.getName() + ".class` as the value for this argument");
}
- parent.visitChildren(childCriteria, new Component.IVisitor<Component<?>>()
+ parent.visitChildren(childCriteria, new Component.IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
addComponent(component);
return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
@@ -334,7 +334,7 @@
* @param component
* component to be rendered
*/
- public void addComponent(Component<?> component)
+ public void addComponent(Component component)
{
if (component == null)
{
@@ -358,7 +358,7 @@
* @param component
* component to be rendered
*/
- public final void addComponent(Component<?> component, String markupId)
+ public final void addComponent(Component component, String markupId)
{
if (Strings.isEmpty(markupId))
{
@@ -402,7 +402,7 @@
* @param component
* The component to get the focus or null.
*/
- public final void focusComponent(Component<?> component)
+ public final void focusComponent(Component component)
{
if (component != null && component.getOutputMarkupId() == false)
{
@@ -437,7 +437,7 @@
// detach the page if it was updated
if (markupIdToComponent.size() > 0)
{
- final Component<?> component = markupIdToComponent.values().iterator().next();
+ final Component component = markupIdToComponent.values().iterator().next();
component.getPage().detach();
}
}
@@ -588,7 +588,7 @@
{
if (listeners != null)
{
- final Map<String, Component<?>> components = Collections.unmodifiableMap(markupIdToComponent);
+ final Map<String, Component> components = Collections.unmodifiableMap(markupIdToComponent);
Iterator<IListener> it = listeners.iterator();
while (it.hasNext())
@@ -607,7 +607,7 @@
// invoke onafterresponse event on listeners
if (listeners != null)
{
- final Map<String, Component<?>> components = Collections.unmodifiableMap(markupIdToComponent);
+ final Map<String, Component> components = Collections.unmodifiableMap(markupIdToComponent);
// create response that will be used by listeners to append
// javascript
@@ -640,11 +640,11 @@
// TODO: We might need to call prepareRender on all components upfront
// process component markup
- Iterator<Map.Entry<String, Component<?>>> it = markupIdToComponent.entrySet().iterator();
+ Iterator<Map.Entry<String, Component>> it = markupIdToComponent.entrySet().iterator();
while (it.hasNext())
{
- final Map.Entry<String, Component<?>> entry = it.next();
- final Component<?> component = entry.getValue();
+ final Map.Entry<String, Component> entry = it.next();
+ final Component component = entry.getValue();
final String markupId = entry.getKey();
respondComponent(response, markupId, component);
@@ -714,7 +714,7 @@
* component to render
*/
private void respondComponent(final Response response, final String markupId,
- final Component<?> component)
+ final Component component)
{
if (component.getRenderBodyOnly() == true)
{
@@ -980,7 +980,7 @@
* @param response
* @param component
*/
- private void respondHeaderContribution(final Response response, final Component<?> component)
+ private void respondHeaderContribution(final Response response, final Component component)
{
headerRendering = true;
@@ -988,7 +988,7 @@
if (header == null)
{
header = new AjaxHtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID, this);
- final Page<?> page = component.getPage();
+ final Page page = component.getPage();
page.addOrReplace(header);
}
@@ -1003,9 +1003,9 @@
if (component instanceof MarkupContainer)
{
- ((MarkupContainer<?>)component).visitChildren(new Component.IVisitor<Component<?>>()
+ ((MarkupContainer)component).visitChildren(new Component.IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (component.isVisible())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java Thu Jun 19 09:52:58 2008
@@ -134,9 +134,9 @@
*
* @return FormComponent
*/
- protected final FormComponent< ? > getFormComponent()
+ protected final FormComponent getFormComponent()
{
- return (FormComponent< ? >)getComponent();
+ return (FormComponent)getComponent();
}
/**
@@ -157,7 +157,7 @@
@Override
protected final void respond(final AjaxRequestTarget target)
{
- final FormComponent< ? > formComponent = getFormComponent();
+ final FormComponent formComponent = getFormComponent();
try
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java Thu Jun 19 09:52:58 2008
@@ -81,9 +81,9 @@
*
* @return FormComponent
*/
- protected final FormComponent< ? > getFormComponent()
+ protected final FormComponent getFormComponent()
{
- return (FormComponent< ? >)getComponent();
+ return (FormComponent)getComponent();
}
/**
@@ -117,7 +117,7 @@
@Override
protected final void onEvent(final AjaxRequestTarget target)
{
- final FormComponent< ? > formComponent = getFormComponent();
+ final FormComponent formComponent = getFormComponent();
if (getEvent().toLowerCase().equals("onblur") && disableFocusOnBlur())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java Thu Jun 19 09:52:58 2008
@@ -82,7 +82,7 @@
if (form == null)
{
// try to find form in the hierarchy of owning component
- Component< ? > component = getComponent();
+ Component component = getComponent();
form = component.findParent(Form.class);
if (form == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java Thu Jun 19 09:52:58 2008
@@ -77,9 +77,9 @@
*/
private void addFeedbackPanels(final AjaxRequestTarget target)
{
- getComponent().getPage().visitChildren(IFeedback.class, new IVisitor<Component< ? >>()
+ getComponent().getPage().visitChildren(IFeedback.class, new IVisitor<Component>()
{
- public Object component(Component< ? > component)
+ public Object component(Component component)
{
target.addComponent(component);
return IVisitor.CONTINUE_TRAVERSAL;
@@ -108,9 +108,9 @@
public static void addToAllFormComponents(final Form< ? > form, final String event,
final Duration throttleDelay)
{
- form.visitChildren(FormComponent.class, new IVisitor<Component< ? >>()
+ form.visitChildren(FormComponent.class, new IVisitor<Component>()
{
- public Object component(Component< ? > component)
+ public Object component(Component component)
{
AjaxFormValidatingBehavior behavior = new AjaxFormValidatingBehavior(form, event);
if (throttleDelay != null)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java Thu Jun 19 09:52:58 2008
@@ -31,10 +31,8 @@
* @since 1.2
*
* @author Igor Vaynberg (ivaynberg)
- * @param <T>
- * The model object type
*/
-public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
+public abstract class AjaxFallbackLink extends Link implements IAjaxLink
{
/** */
private static final long serialVersionUID = 1L;
@@ -55,7 +53,7 @@
* @param id
* @param model
*/
- public AjaxFallbackLink(final String id, final IModel<T> model)
+ public AjaxFallbackLink(final String id, final IModel<?> model)
{
super(id, model);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java Thu Jun 19 09:52:58 2008
@@ -31,10 +31,8 @@
*
* @author Igor Vaynberg (ivaynberg)
*
- * @param <T>
- * The model object type
*/
-public abstract class AjaxLink<T> extends AbstractLink<T> implements IAjaxLink
+public abstract class AjaxLink extends AbstractLink implements IAjaxLink
{
private static final long serialVersionUID = 1L;
@@ -54,7 +52,7 @@
* @param id
* @param model
*/
- public AjaxLink(final String id, final IModel<T> model)
+ public AjaxLink(final String id, final IModel<?> model)
{
super(id, model);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java Thu Jun 19 09:52:58 2008
@@ -63,7 +63,7 @@
* @param <T>
* The model object type
*/
-public abstract class AjaxSubmitLink<T> extends AbstractSubmitLink<T>
+public abstract class AjaxSubmitLink extends AbstractSubmitLink
{
private static final long serialVersionUID = 1L;
@@ -182,7 +182,7 @@
* @param target
* @param form
*
- * TODO 1.3: Make abstract to be consistent with onsubmit()
+ * TODO 1.3: Make abstract to be consistent with onsubmit()
*/
protected void onError(AjaxRequestTarget target, Form<?> form)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java Thu Jun 19 09:52:58 2008
@@ -78,7 +78,7 @@
* @return the ajaxified page number link.
*/
@Override
- protected Link<Object> newPagingNavigationLink(String id, IPageable pageable, int pageIndex)
+ protected Link newPagingNavigationLink(String id, IPageable pageable, int pageIndex)
{
return new AjaxPagingNavigationLink(id, pageable, pageIndex);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java Thu Jun 19 09:52:58 2008
@@ -76,7 +76,7 @@
owner.onClick(target);
// find the PagingNavigator parent of this link
- AjaxPagingNavigator navigator = (AjaxPagingNavigator)((Component< ? >)owner).findParent(AjaxPagingNavigator.class);
+ AjaxPagingNavigator navigator = (AjaxPagingNavigator)((Component)owner).findParent(AjaxPagingNavigator.class);
if (navigator == null)
{
throw new WicketRuntimeException(
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java Thu Jun 19 09:52:58 2008
@@ -32,9 +32,9 @@
* current page +- some increment and which supports paged navigation bars (@see
* PageableListViewNavigationWithMargin).
* <p>
- * <strong>NOTE</strong> To use the <code>AjaxPagingNavigator</code>, you <i>have</i> to put
- * your <code>ListView</code> in a <code>WebMarkupContainer</code>, otherwise it is not
- * possible to update the contents of the listview using Ajax.
+ * <strong>NOTE</strong> To use the <code>AjaxPagingNavigator</code>, you <i>have</i> to put your
+ * <code>ListView</code> in a <code>WebMarkupContainer</code>, otherwise it is not possible to
+ * update the contents of the listview using Ajax.
*
* @since 1.2
*
@@ -91,8 +91,7 @@
* @return the increment link
*/
@Override
- protected Link<Object> newPagingNavigationIncrementLink(String id, IPageable pageable,
- int increment)
+ protected Link newPagingNavigationIncrementLink(String id, IPageable pageable, int increment)
{
return new AjaxPagingNavigationIncrementLink(id, pageable, increment);
}
@@ -110,7 +109,7 @@
* @return the pagenumber link
*/
@Override
- protected Link<Object> newPagingNavigationLink(String id, IPageable pageable, int pageNumber)
+ protected Link newPagingNavigationLink(String id, IPageable pageable, int pageNumber)
{
return new AjaxPagingNavigationLink(id, pageable, pageNumber);
}
@@ -146,7 +145,7 @@
// the pageable is a component, and that it is a child of a web
// markup container.
- Component<?> container = ((Component<?>)pageable);
+ Component container = ((Component)pageable);
// no need for a nullcheck as there is bound to be a non-repeater
// somewhere higher in the hierarchy
while (container instanceof AbstractRepeater)
@@ -157,7 +156,7 @@
// in case the navigator is not contained by the container, we have
// to add it to the response
- if (((MarkupContainer<?>)container).contains(this, true) == false)
+ if (((MarkupContainer)container).contains(this, true) == false)
{
target.addComponent(this);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java Thu Jun 19 09:52:58 2008
@@ -37,5 +37,5 @@
* @param component
* the component that is being instantiated.
*/
- void onInstantiation(Component< ? > component);
+ void onInstantiation(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java Thu Jun 19 09:52:58 2008
@@ -31,5 +31,5 @@
* @param component
* the component that was just rendered
*/
- public void onAfterRender(Component< ? > component);
+ public void onAfterRender(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java Thu Jun 19 09:52:58 2008
@@ -32,5 +32,5 @@
* @param component
* the component that is about to be rendered
*/
- public void onBeforeRender(Component< ? > component);
+ public void onBeforeRender(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java Thu Jun 19 09:52:58 2008
@@ -40,7 +40,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(final Class<T> c)
+ public <T extends Component> boolean isInstantiationAuthorized(final Class<T> c)
{
return true;
}
@@ -49,7 +49,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(Component<?> c, Action action)
+ public boolean isActionAuthorized(Component c, Action action)
{
return true;
}
@@ -72,7 +72,7 @@
* The component class to check
* @return Whether the given component may be created
*/
- <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass);
+ <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass);
/**
* Gets whether the given action is permitted. If it is, this method should return true. If it
@@ -90,5 +90,5 @@
* @see Component#ENABLE
* @see Component#RENDER
*/
- boolean isActionAuthorized(Component<?> component, Action action);
+ boolean isActionAuthorized(Component component, Action action);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java Thu Jun 19 09:52:58 2008
@@ -33,5 +33,5 @@
* The partially constructed component (only the id is guaranteed to be valid).
* @see org.apache.wicket.application.IComponentInstantiationListener
*/
- void onUnauthorizedInstantiation(Component< ? > component);
+ void onUnauthorizedInstantiation(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java Thu Jun 19 09:52:58 2008
@@ -32,7 +32,7 @@
private final Action action;
/** The component that caused the unauthorized exception */
- private final Component< ? > component;
+ private final Component component;
/**
* Construct.
@@ -42,7 +42,7 @@
* @param action
* The action
*/
- public UnauthorizedActionException(Component< ? > component, Action action)
+ public UnauthorizedActionException(Component component, Action action)
{
super("Component " + component + " does not permit action " + action);
this.component = component;
@@ -60,7 +60,7 @@
/**
* @return The component that caused the unauthorized exception
*/
- public Component< ? > getComponent()
+ public Component getComponent()
{
return component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java Thu Jun 19 09:52:58 2008
@@ -41,7 +41,7 @@
* @param componentClass
* The unauthorized component class
*/
- public <T extends Component<?>> UnauthorizedInstantiationException(final Class<T> componentClass)
+ public <T extends Component> UnauthorizedInstantiationException(final Class<T> componentClass)
{
super("Not authorized to instantiate class " + componentClass.getName());
componentClassName = componentClass.getName();
@@ -50,7 +50,7 @@
/**
* @return The component class that could not be instantiated
*/
- public Class<? extends Component<?>> getComponentClass()
+ public Class<? extends Component> getComponentClass()
{
return Classes.resolveClass(componentClassName);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java Thu Jun 19 09:52:58 2008
@@ -53,7 +53,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public final <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass)
+ public final <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
int size = strategies.size();
for (int i = 0; i < size; i++)
@@ -71,7 +71,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public final boolean isActionAuthorized(Component<?> component, Action action)
+ public final boolean isActionAuthorized(Component component, Action action)
{
int size = strategies.size();
for (int i = 0; i < size; i++)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java Thu Jun 19 09:52:58 2008
@@ -50,7 +50,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass)
+ public <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
return true;
}
@@ -59,7 +59,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
IActionAuthorizer authorizer = actionAuthorizerForAction.get(action);
if (authorizer != null)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java Thu Jun 19 09:52:58 2008
@@ -42,5 +42,5 @@
* The component to authorize this action on
* @return True if this action is authorized
*/
- boolean authorizeAction(Component< ? > component);
+ boolean authorizeAction(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java Thu Jun 19 09:52:58 2008
@@ -35,7 +35,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final Component<?> component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
return true;
}
@@ -44,12 +44,12 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
@SuppressWarnings("unchecked")
- public final <T extends Component<?>> boolean isInstantiationAuthorized(
+ public final <T extends Component> boolean isInstantiationAuthorized(
final Class<T> componentClass)
{
if (instanceOf(componentClass, Page.class))
{
- return isPageAuthorized((Class<? extends Page<?>>)componentClass);
+ return isPageAuthorized((Class<? extends Page>)componentClass);
}
return true;
}
@@ -79,7 +79,7 @@
* The Page class
* @return True if to page may be created
*/
- protected <T extends Page<?>> boolean isPageAuthorized(Class<T> pageClass)
+ protected <T extends Page> boolean isPageAuthorized(Class<T> pageClass)
{
return true;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java Thu Jun 19 09:52:58 2008
@@ -57,7 +57,7 @@
/**
* The supertype (class or interface) of Pages that require authorization to be instantiated.
*/
- private final WeakReference<Class<? extends Component<?>>> securePageSuperTypeRef;
+ private final WeakReference<Class<? extends Component>> securePageSuperTypeRef;
/**
* Construct.
@@ -71,7 +71,7 @@
* @param signInPageClass
* The sign in page class
*/
- public <C extends Component<?>, S extends Page<?>> SimplePageAuthorizationStrategy(
+ public <C extends Component, S extends Page> SimplePageAuthorizationStrategy(
final Class<C> securePageSuperType, final Class<S> signInPageClass)
{
if (securePageSuperType == null)
@@ -79,14 +79,14 @@
throw new IllegalArgumentException("Secure page super type must not be null");
}
- securePageSuperTypeRef = new WeakReference<Class<? extends Component<?>>>(
+ securePageSuperTypeRef = new WeakReference<Class<? extends Component>>(
securePageSuperType);
// Handle unauthorized access to pages
Application.get().getSecuritySettings().setUnauthorizedComponentInstantiationListener(
new IUnauthorizedComponentInstantiationListener()
{
- public void onUnauthorizedInstantiation(final Component<?> component)
+ public void onUnauthorizedInstantiation(final Component component)
{
// If there is a sign in page class declared, and the
// unauthorized component is a page, but it's not the
@@ -109,7 +109,7 @@
* @see org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy#isPageAuthorized(java.lang.Class)
*/
@Override
- protected <T extends Page<?>> boolean isPageAuthorized(final Class<T> pageClass)
+ protected <T extends Page> boolean isPageAuthorized(final Class<T> pageClass)
{
if (instanceOf(pageClass, securePageSuperTypeRef.get()))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Thu Jun 19 09:52:58 2008
@@ -42,7 +42,7 @@
private static final long serialVersionUID = 1L;
/** the component that this handler is bound to. */
- private Component< ? > component;
+ private Component component;
/**
* Construct.
@@ -58,7 +58,7 @@
* the component to bind to
*/
@Override
- public final void bind(final Component< ? > hostComponent)
+ public final void bind(final Component hostComponent)
{
if (hostComponent == null)
{
@@ -129,7 +129,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public final void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public final void onComponentTag(final Component component, final ComponentTag tag)
{
onComponentTag(tag);
}
@@ -138,7 +138,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public final void onRendered(final Component< ? > hostComponent)
+ public final void onRendered(final Component hostComponent)
{
onComponentRendered();
}
@@ -156,7 +156,7 @@
*
* @return the component that this handler is bound to
*/
- protected final Component< ? > getComponent()
+ protected final Component getComponent()
{
return component;
}
@@ -192,7 +192,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#getStatelessHint(Component)
*/
@Override
- public boolean getStatelessHint(Component< ? > component)
+ public boolean getStatelessHint(Component component)
{
return false;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java Thu Jun 19 09:52:58 2008
@@ -44,14 +44,14 @@
/**
* @see org.apache.wicket.behavior.IBehavior#beforeRender(org.apache.wicket.Component)
*/
- public void beforeRender(Component< ? > component)
+ public void beforeRender(Component component)
{
}
/**
* @see org.apache.wicket.behavior.IBehavior#bind(org.apache.wicket.Component)
*/
- public void bind(final Component< ? > component)
+ public void bind(final Component component)
{
}
@@ -67,7 +67,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#detach(Component)
*/
- public void detach(Component< ? > component)
+ public void detach(Component component)
{
}
@@ -75,7 +75,7 @@
* @see org.apache.wicket.behavior.IBehavior#exception(org.apache.wicket.Component,
* java.lang.RuntimeException)
*/
- public final void exception(Component< ? > component, RuntimeException exception)
+ public final void exception(Component component, RuntimeException exception)
{
try
{
@@ -90,7 +90,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#getStatelessHint(org.apache.wicket.Component)
*/
- public boolean getStatelessHint(Component< ? > component)
+ public boolean getStatelessHint(Component component)
{
return true;
}
@@ -99,7 +99,7 @@
* @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
}
@@ -113,7 +113,7 @@
* @param exception
* the unexpected exception
*/
- public void onException(Component< ? > component, RuntimeException exception)
+ public void onException(Component component, RuntimeException exception)
{
}
@@ -123,14 +123,14 @@
* @param component
* the component that has this behavior coupled
*/
- public void onRendered(Component< ? > component)
+ public void onRendered(Component component)
{
}
/**
* @see org.apache.wicket.behavior.IBehavior#afterRender(org.apache.wicket.Component)
*/
- public final void afterRender(final Component< ? > component)
+ public final void afterRender(final Component component)
{
try
{
@@ -152,7 +152,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#isEnabled(Component)
*/
- public boolean isEnabled(Component< ? > component)
+ public boolean isEnabled(Component component)
{
return true;
}
@@ -172,7 +172,7 @@
* @deprecated replaced by {@link #detach(Component)}
*/
@Deprecated
- public final void detachModel(Component< ? > component)
+ public final void detachModel(Component component)
{
throw new UnsupportedOperationException();
}
@@ -182,7 +182,7 @@
* @deprecated replaced by {@link #afterRender(Component)}
*/
@Deprecated
- public final void rendered(Component< ? > component)
+ public final void rendered(Component component)
{
throw new UnsupportedOperationException();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java Thu Jun 19 09:52:58 2008
@@ -44,7 +44,7 @@
* org.apache.wicket.request.RequestParameters)
*/
@Override
- public IRequestTarget newRequestTarget(Page< ? > page, Component< ? > component,
+ public IRequestTarget newRequestTarget(Page page, Component component,
RequestListenerInterface listener, RequestParameters requestParameters)
{
return new BehaviorRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java Thu Jun 19 09:52:58 2008
@@ -48,7 +48,7 @@
* @param component
* the component that has this behavior coupled
*/
- void beforeRender(Component< ? > component);
+ void beforeRender(Component component);
/**
* Called when a component that has this behavior coupled was rendered.
@@ -56,7 +56,7 @@
* @param component
* the component that has this behavior coupled
*/
- void afterRender(Component< ? > component);
+ void afterRender(Component component);
/**
* Bind this handler to the given component. This method is called by the host component
@@ -69,7 +69,7 @@
* @param component
* the component to bind to
*/
- void bind(Component< ? > component);
+ void bind(Component component);
/**
* Allows the behavior to detach any state it has attached during request processing.
@@ -77,7 +77,7 @@
* @param component
* the component that initiates the detachment of this behavior
*/
- void detach(Component< ? > component);
+ void detach(Component component);
/**
* In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
@@ -91,7 +91,7 @@
* @param exception
* the unexpected exception
*/
- void exception(Component< ? > component, RuntimeException exception);
+ void exception(Component component, RuntimeException exception);
/**
* This method returns false if the behavior generates a callback url (for example ajax
@@ -102,7 +102,7 @@
*
* @return boolean true or false.
*/
- boolean getStatelessHint(Component< ? > component);
+ boolean getStatelessHint(Component component);
/**
* Called when a components is rendering and wants to render this behavior. If false is returned
@@ -113,7 +113,7 @@
*
* @return true if this behavior must be executed/rendered
*/
- boolean isEnabled(Component< ? > component);
+ boolean isEnabled(Component component);
/**
* Called any time a component that has this behavior registered is rendering the component tag.
@@ -123,7 +123,7 @@
* @param tag
* the tag that is rendered
*/
- void onComponentTag(Component< ? > component, ComponentTag tag);
+ void onComponentTag(Component component, ComponentTag tag);
/**
* Specifies whether or not this behavior is temporary. Temporary behaviors are removed at the
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java Thu Jun 19 09:52:58 2008
@@ -45,7 +45,7 @@
* org.apache.wicket.request.RequestParameters)
*/
@Override
- public IRequestTarget newRequestTarget(Page< ? > page, Component< ? > component,
+ public IRequestTarget newRequestTarget(Page page, Component component,
RequestListenerInterface listener, RequestParameters requestParameters)
{
return new BehaviorRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java Thu Jun 19 09:52:58 2008
@@ -90,7 +90,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
if (isEnabled(component))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java Thu Jun 19 09:52:58 2008
@@ -161,7 +161,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#detach(org.apache.wicket.Component)
*/
@Override
- public void detach(Component< ? > component)
+ public void detach(Component component)
{
contributor.contribution.detach();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java Thu Jun 19 09:52:58 2008
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
/** The component to accept feedback messages for */
- private final Component< ? > component;
+ private final Component component;
/**
* Constructor
@@ -37,7 +37,7 @@
* @param component
* The component to filter on
*/
- public ComponentFeedbackMessageFilter(Component< ? > component)
+ public ComponentFeedbackMessageFilter(Component component)
{
this.component = component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java Thu Jun 19 09:52:58 2008
@@ -28,7 +28,7 @@
{
private static final long serialVersionUID = 1L;
- private final MarkupContainer< ? > container;
+ private final MarkupContainer container;
/**
* Constructor
@@ -36,7 +36,7 @@
* @param container
* The container that message reporters must be a child of
*/
- public ContainerFeedbackMessageFilter(MarkupContainer< ? > container)
+ public ContainerFeedbackMessageFilter(MarkupContainer container)
{
if (container == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java Thu Jun 19 09:52:58 2008
@@ -79,7 +79,7 @@
private final Serializable message;
/** The reporting component. */
- private final Component< ? > reporter;
+ private final Component reporter;
/** Whether or not this message has been rendered */
private boolean rendered = false;
@@ -94,7 +94,7 @@
* @param level
* The level of the message
*/
- public FeedbackMessage(final Component< ? > reporter, final Serializable message,
+ public FeedbackMessage(final Component reporter, final Serializable message,
final int level)
{
this.reporter = reporter;
@@ -158,7 +158,7 @@
*
* @return the reporting component.
*/
- public final Component< ? > getReporter()
+ public final Component getReporter()
{
return reporter;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java Thu Jun 19 09:52:58 2008
@@ -66,7 +66,7 @@
* @param message
* @param level
*/
- public final void add(Component< ? > reporter, String message, int level)
+ public final void add(Component reporter, String message, int level)
{
add(new FeedbackMessage(reporter, message, level));
}
@@ -111,7 +111,7 @@
* @param message
* the actual message
*/
- public final void debug(Component< ? > reporter, String message)
+ public final void debug(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.DEBUG));
}
@@ -124,7 +124,7 @@
* @param message
* the actual message
*/
- public final void error(Component< ? > reporter, Serializable message)
+ public final void error(Component reporter, Serializable message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.ERROR));
}
@@ -137,7 +137,7 @@
* @param message
* the actual message
*/
- public final void fatal(Component< ? > reporter, String message)
+ public final void fatal(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.FATAL));
}
@@ -150,7 +150,7 @@
* the component to look up whether it registered a message
* @return whether the given component registered a message with this list with level ERROR
*/
- public final boolean hasErrorMessageFor(Component< ? > component)
+ public final boolean hasErrorMessageFor(Component component)
{
return hasMessageFor(component, FeedbackMessage.ERROR);
}
@@ -172,7 +172,7 @@
* the component to look up whether it registered a message
* @return whether the given component registered a message with this list
*/
- public final boolean hasMessageFor(Component< ? > component)
+ public final boolean hasMessageFor(Component component)
{
return messageForComponent(component) != null;
}
@@ -187,7 +187,7 @@
* The level of the message
* @return Whether the given component registered a message with this list with the given level
*/
- public final boolean hasMessageFor(Component< ? > component, int level)
+ public final boolean hasMessageFor(Component component, int level)
{
final FeedbackMessage message = messageForComponent(component);
return message != null && message.isLevel(level);
@@ -201,7 +201,7 @@
* @param message
* The actual message
*/
- public final void info(Component< ? > reporter, String message)
+ public final void info(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.INFO));
}
@@ -234,7 +234,7 @@
* @return the message that is found for the given component (first match) or null if none was
* found
*/
- public final FeedbackMessage messageForComponent(final Component< ? > component)
+ public final FeedbackMessage messageForComponent(final Component component)
{
for (Iterator<FeedbackMessage> iterator = messages.iterator(); iterator.hasNext();)
{
@@ -333,7 +333,7 @@
* @param message
* the actual message
*/
- public final void warn(Component< ? > reporter, String message)
+ public final void warn(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.WARNING));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java Thu Jun 19 09:52:58 2008
@@ -52,7 +52,7 @@
* The component where the page will be get from for which messages will be displayed
* usually the same page as the one feedbackpanel is attached to
*/
- public FeedbackMessagesModel(Component< ? > component)
+ public FeedbackMessagesModel(Component component)
{
if (component == null)
{
@@ -70,7 +70,7 @@
* feedbackpanel is attached to
*
*/
- public FeedbackMessagesModel(Page< ? > page, IFeedbackMessageFilter filter)
+ public FeedbackMessagesModel(Page page, IFeedbackMessageFilter filter)
{
this(page);
setFilter(filter);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java Thu Jun 19 09:52:58 2008
@@ -89,7 +89,7 @@
* about the tags origin is lost. In some cases like wicket:head and wicket:link this
* information however is required.
*/
- private WeakReference<Class<? extends Component<?>>> markupClassRef = null;
+ private WeakReference<Class<? extends Component>> markupClassRef = null;
/**
* Tags which are detected to have only an open tag, which is allowed with some HTML tags like
@@ -759,7 +759,7 @@
*
* @return wicketHeaderClass
*/
- public Class<? extends Component<?>> getMarkupClass()
+ public Class<? extends Component> getMarkupClass()
{
return (markupClassRef == null ? null : markupClassRef.get());
}
@@ -772,7 +772,7 @@
* @param wicketHeaderClass
* wicketHeaderClass
*/
- public <C extends Component<?>> void setMarkupClass(Class<C> wicketHeaderClass)
+ public <C extends Component> void setMarkupClass(Class<C> wicketHeaderClass)
{
if (wicketHeaderClass == null)
{
@@ -780,7 +780,7 @@
}
else
{
- markupClassRef = new WeakReference<Class<? extends Component<?>>>(wicketHeaderClass);
+ markupClassRef = new WeakReference<Class<? extends Component>>(wicketHeaderClass);
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java Thu Jun 19 09:52:58 2008
@@ -43,7 +43,7 @@
* @param container
* The container to create the information from
*/
- public ContainerInfo(final MarkupContainer< ? > container)
+ public ContainerInfo(final MarkupContainer container)
{
this(container.getClass(), container.getLocale(), container.getStyle(), null,
container.getMarkupType());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java Thu Jun 19 09:52:58 2008
@@ -48,7 +48,7 @@
* @return Key that uniquely identifies any markup that might be associated with this markup
* container.
*/
- public String getCacheKey(final MarkupContainer< ? > container, final Class< ? > clazz)
+ public String getCacheKey(final MarkupContainer container, final Class< ? > clazz)
{
final String classname = clazz.getName();
final Locale locale = container.getLocale();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java Thu Jun 19 09:52:58 2008
@@ -61,7 +61,7 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- public IResourceStream getMarkupResourceStream(final MarkupContainer<?> container,
+ public IResourceStream getMarkupResourceStream(final MarkupContainer container,
Class<?> containerClass)
{
// Get locator to search for the resource
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java Thu Jun 19 09:52:58 2008
@@ -47,7 +47,7 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return Markup resource
*/
- Markup getMarkup(final MarkupContainer<?> container, final Class<?> clazz,
+ Markup getMarkup(final MarkupContainer container, final Class<?> clazz,
final boolean enforceReload);
/**
@@ -62,7 +62,7 @@
* If true, throw an exception, if markup could not be found
* @return A stream of MarkupElement elements
*/
- MarkupStream getMarkupStream(final MarkupContainer<?> container, final boolean enforceReload,
+ MarkupStream getMarkupStream(final MarkupContainer container, final boolean enforceReload,
final boolean throwException);
/**
@@ -72,7 +72,7 @@
* The container the markup should be associated with
* @return True if this markup container has associated markup
*/
- boolean hasAssociatedMarkup(final MarkupContainer<?> container);
+ boolean hasAssociatedMarkup(final MarkupContainer container);
/**
* Remove the markup associated with the cache key from the cache including all dependent
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java Thu Jun 19 09:52:58 2008
@@ -39,5 +39,5 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- String getCacheKey(final MarkupContainer<?> container, Class<?> containerClass);
+ String getCacheKey(final MarkupContainer container, Class<?> containerClass);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java Thu Jun 19 09:52:58 2008
@@ -47,6 +47,6 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- IResourceStream getMarkupResourceStream(final MarkupContainer<?> container,
+ IResourceStream getMarkupResourceStream(final MarkupContainer container,
Class<?> containerClass);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java Thu Jun 19 09:52:58 2008
@@ -203,7 +203,7 @@
* @see org.apache.wicket.markup.IMarkupCache#getMarkupStream(org.apache.wicket.MarkupContainer,
* boolean, boolean)
*/
- public final MarkupStream getMarkupStream(final MarkupContainer<?> container,
+ public final MarkupStream getMarkupStream(final MarkupContainer container,
final boolean enforceReload, final boolean throwException)
{
if (container == null)
@@ -234,7 +234,7 @@
/**
* @see org.apache.wicket.markup.IMarkupCache#hasAssociatedMarkup(org.apache.wicket.MarkupContainer)
*/
- public final boolean hasAssociatedMarkup(final MarkupContainer<?> container)
+ public final boolean hasAssociatedMarkup(final MarkupContainer container)
{
return getMarkup(container, container.getClass(), false) != Markup.NO_MARKUP;
}
@@ -267,7 +267,7 @@
* @see org.apache.wicket.markup.IMarkupCache#getMarkup(org.apache.wicket.MarkupContainer,
* java.lang.Class, boolean)
*/
- public final Markup getMarkup(final MarkupContainer<?> container, final Class<?> clazz,
+ public final Markup getMarkup(final MarkupContainer container, final Class<?> clazz,
final boolean enforceReload)
{
Class<?> containerClass = clazz;
@@ -338,7 +338,7 @@
* @param container
* @return Markup.NO_MARKUP
*/
- protected Markup onMarkupNotFound(final String cacheKey, final MarkupContainer<?> container)
+ protected Markup onMarkupNotFound(final String cacheKey, final MarkupContainer container)
{
if (log.isDebugEnabled())
{
@@ -393,7 +393,7 @@
* @return null, if not found or to enforce reloading the markup
*/
protected Markup getMarkupFromCache(final CharSequence cacheKey,
- final MarkupContainer<?> container)
+ final MarkupContainer container)
{
if (cacheKey != null)
{
@@ -418,7 +418,7 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return The markup
*/
- private final Markup loadMarkup(final MarkupContainer<?> container,
+ private final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final boolean enforceReload)
{
String cacheKey = markupResourceStream.getCacheKey();
@@ -478,7 +478,7 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return The markup in the stream
*/
- private final Markup loadMarkupAndWatchForChanges(final MarkupContainer<?> container,
+ private final Markup loadMarkupAndWatchForChanges(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final boolean enforceReload)
{
final String cacheKey = markupResourceStream.getCacheKey();
@@ -536,7 +536,7 @@
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
*/
- public IMarkupCacheKeyProvider getMarkupCacheKeyProvider(final MarkupContainer<?> container)
+ public IMarkupCacheKeyProvider getMarkupCacheKeyProvider(final MarkupContainer container)
{
if (container instanceof IMarkupCacheKeyProvider)
{
@@ -558,7 +558,7 @@
* @return IMarkupResourceStreamProvider
*/
protected IMarkupResourceStreamProvider getMarkupResourceStreamProvider(
- final MarkupContainer<?> container)
+ final MarkupContainer container)
{
if (container instanceof IMarkupResourceStreamProvider)
{