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 [5/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/markup/MarkupResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java Thu Jun 19 09:52:58 2008
@@ -169,7 +169,7 @@
*
* @return The directly associated class
*/
- public Class< ? extends Component< ? >> getMarkupClass()
+ public Class< ? extends Component> getMarkupClass()
{
return Classes.resolveClass(markupClassName);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Thu Jun 19 09:52:58 2008
@@ -224,7 +224,7 @@
*
* @return The component's class
*/
- public final Class< ? extends Component< ? >> getContainerClass()
+ public final Class< ? extends Component> getContainerClass()
{
return markup.getMarkupResourceData().getResource().getMarkupClass();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Thu Jun 19 09:52:58 2008
@@ -43,14 +43,14 @@
private boolean noMoreWicketHeadTagsAllowed = false;
/** The markup container the helper is associated with */
- private final WebMarkupContainer<?> container;
+ private final WebMarkupContainer container;
/**
* @param container
*/
public ContainerWithAssociatedMarkupHelper(final IHeaderPartContainerProvider container)
{
- this.container = (WebMarkupContainer<?>)container;
+ this.container = (WebMarkupContainer)container;
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java Thu Jun 19 09:52:58 2008
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
/** The panel or bordered page the header part is associated with */
- private final MarkupContainer<?> container;
+ private final MarkupContainer container;
/** <wicket:head scope="...">. A kind of namespace */
private final String scope;
@@ -48,7 +48,7 @@
* @param scope
* The scope of the wicket:head tag
*/
- public HeaderPartContainer(final String id, final MarkupContainer<?> container,
+ public HeaderPartContainer(final String id, final MarkupContainer container,
final String scope)
{
super(id);
@@ -69,12 +69,12 @@
/**
* @see IComponentResolver#resolve(MarkupContainer, MarkupStream, ComponentTag)
*/
- public final boolean resolve(final MarkupContainer<?> container,
+ public final boolean resolve(final MarkupContainer container,
final MarkupStream markupStream, final ComponentTag tag)
{
// The tag must be resolved against the panel and not against the
// page
- Component<?> component = this.container.get(tag.getId());
+ Component component = this.container.get(tag.getId());
if (component != null)
{
component.render(markupStream);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebComponent.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebComponent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebComponent.java Thu Jun 19 09:52:58 2008
@@ -34,7 +34,7 @@
* @param <T>
* The model object type
*/
-public class WebComponent<T> extends Component<T>
+public class WebComponent extends Component
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java Thu Jun 19 09:52:58 2008
@@ -27,10 +27,8 @@
* @author Jonathan Locke
* @author Juergen Donnerstag
*
- * @param <T>
- * The model object type
*/
-public class WebMarkupContainer<T> extends MarkupContainer<T>
+public class WebMarkupContainer extends MarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -45,7 +43,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public WebMarkupContainer(final String id, IModel<T> model)
+ public WebMarkupContainer(final String id, IModel<?> model)
{
super(id, model);
}
@@ -66,8 +64,8 @@
*
* @return WebPage
*/
- public final WebPage< ? > getWebPage()
+ public final WebPage getWebPage()
{
- return (WebPage< ? >)getPage();
+ return (WebPage)getPage();
}
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java Thu Jun 19 09:52:58 2008
@@ -25,10 +25,8 @@
*
* @author Juergen Donnerstag
*
- * @param <T>
- * The model object type
*/
-public class WebMarkupContainerWithAssociatedMarkup<T> extends WebMarkupContainer<T>
+public class WebMarkupContainerWithAssociatedMarkup extends WebMarkupContainer
implements
IHeaderPartContainerProvider
{
@@ -48,7 +46,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public WebMarkupContainerWithAssociatedMarkup(final String id, IModel<T> model)
+ public WebMarkupContainerWithAssociatedMarkup(final String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Thu Jun 19 09:52:58 2008
@@ -65,7 +65,7 @@
* @param <T>
* The model object type
*/
-public class WebPage<T> extends Page<T> implements INewBrowserWindowListener
+public class WebPage extends Page implements INewBrowserWindowListener
{
/**
* Tries to determine whether this page was opened in a new window or tab. If it is (and this
@@ -75,20 +75,20 @@
* @param <T>
* The model object type
*/
- private static final class PageMapChecker<T> extends AbstractBehavior
+ private static final class PageMapChecker extends AbstractBehavior
implements
IHeaderContributor
{
private static final long serialVersionUID = 1L;
- private final WebPage<T> webPage;
+ private final WebPage webPage;
/**
* Construct.
*
* @param webPage
*/
- PageMapChecker(WebPage<T> webPage)
+ PageMapChecker(WebPage webPage)
{
this.webPage = webPage;
}
@@ -195,7 +195,7 @@
/**
* @see Page#Page(IModel)
*/
- protected WebPage(final IModel<T> model)
+ protected WebPage(final IModel<?> model)
{
super(model);
commonInit();
@@ -213,7 +213,7 @@
/**
* @see Page#Page(org.apache.wicket.IPageMap, org.apache.wicket.model.IModel)
*/
- protected WebPage(final IPageMap pageMap, final IModel<T> model)
+ protected WebPage(final IPageMap pageMap, final IModel<?> model)
{
super(pageMap, model);
commonInit();
@@ -310,10 +310,10 @@
public void onNewBrowserWindow()
{
// if the browser reports a history of 0 then make a new webpage
- WebPage<?> clonedPage = this;
+ WebPage clonedPage = this;
try
{
- clonedPage = (WebPage<?>)Objects.cloneObject(this);
+ clonedPage = (WebPage)Objects.cloneObject(this);
}
catch (Exception e)
{
@@ -332,7 +332,7 @@
// if automatic multi window support is on, add a page checker instance
if (getApplication().getPageSettings().getAutomaticMultiWindowSupport())
{
- add(new PageMapChecker<T>(this));
+ add(new PageMapChecker(this));
}
}
@@ -399,9 +399,9 @@
super.onAfterRender();
if (Application.DEVELOPMENT.equals(getApplication().getConfigurationType()))
{
- HtmlHeaderContainer header = (HtmlHeaderContainer)visitChildren(new IVisitor<Component<?>>()
+ HtmlHeaderContainer header = (HtmlHeaderContainer)visitChildren(new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (component instanceof HtmlHeaderContainer)
{
@@ -431,12 +431,12 @@
// Make sure all Components interested in contributing to the header
// and there attached behaviors are asked.
final HtmlHeaderContainer finalHeader = header;
- visitChildren(new IVisitor<Component<?>>()
+ visitChildren(new IVisitor<Component>()
{
/**
* @see org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object component(Component<?> component)
+ public Object component(Component component)
{
component.renderHead(finalHeader);
return CONTINUE_TRAVERSAL;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java Thu Jun 19 09:52:58 2008
@@ -66,7 +66,7 @@
* @param <T>
* The model object type
*/
-public class Label<T> extends WebComponent<T>
+public class Label<T> extends WebComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java Thu Jun 19 09:52:58 2008
@@ -35,7 +35,7 @@
* @param <T>
* Model object type
*/
-public class MultiLineLabel<T> extends WebComponent<T>
+public class MultiLineLabel<T> extends WebComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java Thu Jun 19 09:52:58 2008
@@ -48,7 +48,7 @@
/**
* Make sure we don't keep a reference to the component longer than really needed.
*/
- private transient WeakReference<Component< ? >> componentReference;
+ private transient WeakReference<Component> componentReference;
/**
* Create a new attribute modifier with the given attribute name and model to replace with. The
@@ -64,7 +64,7 @@
* The component which created (owns) the modifier
*/
public BodyTagAttributeModifier(final String attribute, final boolean addAttributeIfNotPresent,
- final IModel< ? > replaceModel, final Component< ? > behaviorOwner)
+ final IModel< ? > replaceModel, final Component behaviorOwner)
{
super(attribute, addAttributeIfNotPresent, replaceModel);
init(behaviorOwner);
@@ -82,7 +82,7 @@
* The component which created (owns) the modifier
*/
public BodyTagAttributeModifier(final String attribute, final IModel< ? > replaceModel,
- final Component< ? > behaviorOwner)
+ final Component behaviorOwner)
{
super(attribute, replaceModel);
init(behaviorOwner);
@@ -108,7 +108,7 @@
*/
public BodyTagAttributeModifier(final String attribute, final String pattern,
final boolean addAttributeIfNotPresent, final IModel< ? > replaceModel,
- final Component< ? > behaviorOwner)
+ final Component behaviorOwner)
{
super(attribute, pattern, addAttributeIfNotPresent, replaceModel);
init(behaviorOwner);
@@ -129,7 +129,7 @@
* The component which created (owns) the modifier
*/
public BodyTagAttributeModifier(final String attribute, final String pattern,
- final IModel< ? > replaceModel, final Component< ? > behaviorOwner)
+ final IModel< ? > replaceModel, final Component behaviorOwner)
{
super(attribute, pattern, replaceModel);
init(behaviorOwner);
@@ -141,11 +141,11 @@
* @param behaviorOwner
* The component which creates (owns) the modifier
*/
- private void init(final Component< ? > behaviorOwner)
+ private void init(final Component behaviorOwner)
{
if (behaviorOwner != null)
{
- componentReference = new WeakReference<Component< ? >>(behaviorOwner);
+ componentReference = new WeakReference<Component>(behaviorOwner);
}
}
@@ -161,7 +161,7 @@
{
// Get the owner of the attribute modifier (e.g. the Panel, not the
// Body)
- final Component< ? > behaviorOwner = componentReference.get();
+ final Component behaviorOwner = componentReference.get();
// If case the components memory has been GCed already, than disable
// the attribute modifier and return the attribute value unchanged.
@@ -216,7 +216,7 @@
final Object object = inputStream.readObject();
if (object != null)
{
- componentReference = new WeakReference<Component< ? >>((Component< ? >)object);
+ componentReference = new WeakReference<Component>((Component)object);
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Thu Jun 19 09:52:58 2008
@@ -104,10 +104,8 @@
* @author Jonathan Locke
* @author Juergen Donnerstag
*
- * @param <T>
- * The model object type
*/
-public abstract class Border<T> extends WebMarkupContainerWithAssociatedMarkup<T>
+public abstract class Border extends WebMarkupContainerWithAssociatedMarkup
implements
IComponentResolver
{
@@ -158,7 +156,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public Border(final String id, final IModel<T> model)
+ public Border(final String id, final IModel<?> model)
{
super(id, model);
@@ -189,7 +187,7 @@
* @deprecated 1.3 please use #getBodyContainer().setVisible(false) instead
*/
@Deprecated
- public Border<T> setBorderBodyVisible(boolean bodyVisible)
+ public Border setBorderBodyVisible(boolean bodyVisible)
{
body.setVisible(false);
return this;
@@ -204,7 +202,7 @@
* true, to enable transparent resolving
* @return this for chaining
*/
- public final Border<T> setTransparentResolver(final boolean enable)
+ public final Border setTransparentResolver(final boolean enable)
{
transparentResolver = enable;
return this;
@@ -224,14 +222,14 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// In case of nested Borders, the outer border is no longer able to find
// its body container easily. Thus we need to help resolve it.
// The container is the body component. Get the Border component.
- MarkupContainer< ? > border = container.getParent();
+ MarkupContainer border = container.getParent();
while ((border != null) && !(border instanceof Border))
{
border = border.getParent();
@@ -321,9 +319,7 @@
/**
* The container to be associated with the <wicket:body> tag
*/
- public class BorderBodyContainer extends WebMarkupContainer<Object>
- implements
- IComponentResolver
+ public class BorderBodyContainer extends WebMarkupContainer implements IComponentResolver
{
private static final long serialVersionUID = 1L;
@@ -388,15 +384,15 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(final MarkupContainer< ? > container,
- final MarkupStream markupStream, final ComponentTag tag)
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Usually you add child components to Border instead of Body. Hence
// we need to help Body to properly resolve the children.
String id = tag.getId();
if (!id.equals(BODY_ID))
{
- Component< ? > component = Border.this.get(id);
+ Component component = get(id);
if (component != null)
{
component.render(markupStream);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java Thu Jun 19 09:52:58 2008
@@ -62,7 +62,7 @@
*
* @see org.apache.wicket.IComponentBorder#renderBefore(org.apache.wicket.Component)
*/
- public void renderBefore(Component< ? > component)
+ public void renderBefore(Component component)
{
final MarkupStream stream = getMarkupStream(component);
final Response response = component.getResponse();
@@ -122,7 +122,7 @@
*
* @see IComponentBorder#renderAfter(org.apache.wicket.Component)
*/
- public void renderAfter(Component< ? > component)
+ public void renderAfter(Component component)
{
final MarkupStream stream = getMarkupStream(component);
final Response response = component.getResponse();
@@ -154,7 +154,7 @@
* @param component
* @return markup stream
*/
- private MarkupStream getMarkupStream(Component< ? > component)
+ private MarkupStream getMarkupStream(Component component)
{
if (markupStream == null)
{
@@ -168,7 +168,7 @@
* @param owner
* @return markup stream
*/
- private MarkupStream findMarkupStream(Component< ? > owner)
+ private MarkupStream findMarkupStream(Component owner)
{
final String markupType = getMarkupType(owner);
@@ -236,12 +236,12 @@
* @param component
* @return markup type
*/
- private String getMarkupType(Component< ? > component)
+ private String getMarkupType(Component component)
{
String extension;
if (component instanceof MarkupContainer)
{
- extension = ((MarkupContainer< ? >)component).getMarkupType();
+ extension = ((MarkupContainer)component).getMarkupType();
}
else
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java Thu Jun 19 09:52:58 2008
@@ -92,7 +92,7 @@
* The page to be analyzed
* @see Component#Component(String)
*/
- public PageView(final String id, final Page< ? > page)
+ public PageView(final String id, final Page page)
{
super(id);
@@ -145,13 +145,13 @@
* @param page
* @return List of component data objects
*/
- private List<ComponentData> getComponentData(final Page< ? > page)
+ private List<ComponentData> getComponentData(final Page page)
{
final List<ComponentData> data = new ArrayList<ComponentData>();
- page.visitChildren(new IVisitor<Component< ? >>()
+ page.visitChildren(new IVisitor<Component>()
{
- public Object component(final Component< ? > component)
+ public Object component(final Component component)
{
if (!component.getPath().startsWith(PageView.this.getPath()))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java Thu Jun 19 09:52:58 2008
@@ -43,7 +43,7 @@
* @param <E>
* class of a single element in the choices list
*/
-public abstract class AbstractChoice<T, E> extends FormComponent<T>
+public abstract class AbstractChoice<T, E> extends FormComponent
{
/** */
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java Thu Jun 19 09:52:58 2008
@@ -31,9 +31,7 @@
* @param <T>
* The model object type
*/
-public abstract class AbstractSubmitLink<T> extends AbstractLink<T>
- implements
- IFormSubmittingComponent
+public abstract class AbstractSubmitLink extends AbstractLink implements IFormSubmittingComponent
{
/**
*
@@ -43,7 +41,7 @@
/**
* Target form or null if the form is parent of the link.
*/
- private Form< ? > form;
+ private Form<?> form;
/**
* If false, all standard processing like validating and model updating is skipped.
@@ -56,7 +54,7 @@
* @param id
* @param model
*/
- public AbstractSubmitLink(String id, IModel<T> model)
+ public AbstractSubmitLink(String id, IModel<?> model)
{
super(id, model);
}
@@ -79,7 +77,7 @@
* @param model
* @param form
*/
- public AbstractSubmitLink(String id, IModel<T> model, Form< ? > form)
+ public AbstractSubmitLink(String id, IModel<?> model, Form<?> form)
{
super(id, model);
this.form = form;
@@ -91,7 +89,7 @@
* @param id
* @param form
*/
- public AbstractSubmitLink(String id, Form< ? > form)
+ public AbstractSubmitLink(String id, Form<?> form)
{
super(id);
this.form = form;
@@ -109,7 +107,7 @@
* defaultFormProcessing
* @return This
*/
- public final AbstractSubmitLink<T> setDefaultFormProcessing(boolean defaultFormProcessing)
+ public final AbstractSubmitLink setDefaultFormProcessing(boolean defaultFormProcessing)
{
if (this.defaultFormProcessing != defaultFormProcessing)
{
@@ -149,7 +147,7 @@
/**
* @see org.apache.wicket.markup.html.form.IFormSubmittingComponent#getForm()
*/
- public Form< ? > getForm()
+ public Form<?> getForm()
{
if (form != null)
{
@@ -157,7 +155,7 @@
}
else
{
- return (Form< ? >)findParent(Form.class);
+ return findParent(Form.class);
}
}
@@ -169,13 +167,12 @@
// TODO: This is a copy & paste from the FormComponent class.
String id = getId();
final PrependingStringBuffer inputName = new PrependingStringBuffer(id.length());
- Component< ? > c = this;
+ Component c = this;
while (true)
{
inputName.prepend(id);
c = c.getParent();
- if (c == null || (c instanceof Form && ((Form< ? >)c).isRootForm()) ||
- c instanceof Page)
+ if (c == null || (c instanceof Form && ((Form<?>)c).isRootForm()) || c instanceof Page)
{
break;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java Thu Jun 19 09:52:58 2008
@@ -35,7 +35,7 @@
* @param <T>
* The model object type
*/
-public abstract class AbstractTextComponent<T> extends FormComponent<T>
+public abstract class AbstractTextComponent extends FormComponent
{
// Flag for the type resolving. FLAG_RESERVED1-3 is taken by form component
private static final int TYPE_RESOLVED = Component.FLAG_RESERVED4;
@@ -179,7 +179,7 @@
* the value to set this flag.
* @return this
*/
- public final FormComponent<?> setConvertEmptyInputStringToNull(boolean flag)
+ public final FormComponent setConvertEmptyInputStringToNull(boolean flag)
{
setFlag(FLAG_CONVERT_EMPTY_INPUT_STRING_TO_NULL, flag);
return this;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java Thu Jun 19 09:52:58 2008
@@ -52,7 +52,7 @@
* @param <T>
* The model object type
*/
-public class Button<T> extends FormComponent<T> implements IFormSubmittingComponent
+public class Button<T> extends FormComponent implements IFormSubmittingComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java Thu Jun 19 09:52:58 2008
@@ -314,7 +314,7 @@
public final CheckBoxMultipleChoice<T> setPrefix(final String prefix)
{
// Tell the page that this component's prefix was changed
- final Page<?> page = findPage();
+ final Page page = findPage();
if (page != null)
{
addStateChange(new PrefixChange(this.prefix));
@@ -340,7 +340,7 @@
public final CheckBoxMultipleChoice<T> setSuffix(final String suffix)
{
// Tell the page that this component's suffix was changed
- final Page<?> page = findPage();
+ final Page page = findPage();
if (page != null)
{
addStateChange(new SuffixChange(this.suffix));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Thu Jun 19 09:52:58 2008
@@ -70,7 +70,7 @@
* type="submit" value="go"> suffices.
* <p>
* By default, the processing of a form works like this:
- * <li> The submitting component is looked up. An submitting IFormSubmittingComponent (such as a
+ * <li>The submitting component is looked up. An submitting IFormSubmittingComponent (such as a
* button) is nested in this form (is a child component) and was clicked by the user. If an
* IFormSubmittingComponent was found, and it has the defaultFormProcessing field set to false
* (default is true), it's onSubmit method will be called right away, thus no validition is done,
@@ -78,17 +78,17 @@
* respect, nesting an IFormSubmittingComponent with the defaultFormProcessing field set to false
* has the same effect as nesting a normal link. If you want you can call validate() to execute form
* validation, hasError() to find out whether validate() resulted in validation errors, and
- * updateFormComponentModels() to update the models of nested form components. </li>
- * <li> When no submitting IFormSubmittingComponent with defaultFormProcessing set to false was
+ * updateFormComponentModels() to update the models of nested form components.</li>
+ * <li>When no submitting IFormSubmittingComponent with defaultFormProcessing set to false was
* found, this form is processed (method process()). Now, two possible paths exist:
* <ul>
- * <li> Form validation failed. All nested form components will be marked invalid, and onError() is
- * called to allow clients to provide custom error handling code. </li>
- * <li> Form validation succeeded. The nested components will be asked to update their models and
+ * <li>Form validation failed. All nested form components will be marked invalid, and onError() is
+ * called to allow clients to provide custom error handling code.</li>
+ * <li>Form validation succeeded. The nested components will be asked to update their models and
* persist their data is applicable. After that, method delegateSubmit with optionally the
* submitting IFormSubmittingComponent is called. The default when there is a submitting
* IFormSubmittingComponent is to first call onSubmit on that Component, and after that call
- * onSubmit on this form. Clients may override delegateSubmit if they want different behavior. </li>
+ * onSubmit on this form. Clients may override delegateSubmit if they want different behavior.</li>
* </ul>
* </li>
* </li>
@@ -136,7 +136,7 @@
* @param <T>
* The model object type
*/
-public class Form<T> extends WebMarkupContainer<T> implements IFormSubmitListener
+public class Form<T> extends WebMarkupContainer implements IFormSubmitListener
{
/**
* Visitor used for validation
@@ -507,7 +507,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -540,9 +540,9 @@
public final IFormSubmittingComponent findSubmittingButton()
{
IFormSubmittingComponent submittingComponent = (IFormSubmittingComponent)getPage().visitChildren(
- IFormSubmittingComponent.class, new IVisitor<Component<?>>()
+ IFormSubmittingComponent.class, new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
// Get submitting component
final IFormSubmittingComponent submittingComponent = (IFormSubmittingComponent)component;
@@ -759,7 +759,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
// Component must implement persister interface and
// persistence for that component must be enabled.
@@ -899,9 +899,9 @@
{
onError();
// call onError on nested forms
- visitChildren(Form.class, new IVisitor<Component<?>>()
+ visitChildren(Form.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
final Form<?> form = (Form<?>)component;
if (!form.isEnabled() || !form.isEnableAllowed() || !form.isVisibleInHierarchy())
@@ -925,9 +925,9 @@
{
setFlag(FLAG_SUBMITTED, true);
- visitChildren(Form.class, new IVisitor<Component<?>>()
+ visitChildren(Form.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
Form<?> form = (Form<?>)component;
if (form.isEnabled() && form.isEnableAllowed() && isVisibleInHierarchy())
@@ -960,7 +960,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1034,7 +1034,7 @@
* @see org.apache.wicket.Component#setVersioned(boolean)
*/
@Override
- public final Component<T> setVersioned(final boolean isVersioned)
+ public final Component setVersioned(final boolean isVersioned)
{
super.setVersioned(isVersioned);
@@ -1042,7 +1042,7 @@
visitFormComponents(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
formComponent.setVersioned(isVersioned);
}
@@ -1058,11 +1058,11 @@
*/
public final void visitFormComponents(final FormComponent.IVisitor visitor)
{
- visitChildren(FormComponent.class, new IVisitor<Component<?>>()
+ visitChildren(FormComponent.class, new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
- visitor.formComponent((FormComponent<?>)component);
+ visitor.formComponent((FormComponent)component);
return CONTINUE_TRAVERSAL;
}
});
@@ -1098,14 +1098,14 @@
{
if (getParent() instanceof Border)
{
- MarkupContainer<?> border = getParent();
- Iterator<Component<?>> iter = border.iterator();
+ MarkupContainer border = getParent();
+ Iterator<Component> iter = border.iterator();
while (iter.hasNext())
{
- Component<?> child = iter.next();
+ Component child = iter.next();
if (child instanceof FormComponent)
{
- visitor.formComponent((FormComponent<?>)child);
+ visitor.formComponent((FormComponent)child);
}
}
}
@@ -1118,9 +1118,9 @@
*/
private boolean anyFormComponentError()
{
- final Object value = visitChildren(new IVisitor<Component<?>>()
+ final Object value = visitChildren(new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
if (component.hasErrorMessage())
{
@@ -1144,7 +1144,7 @@
* @param url
* The url which describes the component path and the interface to be called.
*/
- private void dispatchEvent(final Page<?> page, final String url)
+ private void dispatchEvent(final Page page, final String url)
{
RequestCycle rc = RequestCycle.get();
IRequestCycleProcessor processor = rc.getProcessor();
@@ -1244,7 +1244,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1274,7 +1274,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1321,7 +1321,7 @@
buffer.append("<input type=\"text\" autocomplete=\"false\"/>");
// add the submitting component
- final Component<?> submittingComponent = (Component<?>)defaultSubmittingComponent;
+ final Component submittingComponent = (Component)defaultSubmittingComponent;
buffer.append("<input type=\"submit\" name=\"");
buffer.append(defaultSubmittingComponent.getInputName());
buffer.append("\" onclick=\" var b=Wicket.$('");
@@ -1525,7 +1525,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
// If form component is using form model
if (formComponent.sameInnermostModel(Form.this))
@@ -1545,7 +1545,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1593,7 +1593,7 @@
visitFormComponentsPostOrder(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
if (formComponent.getForm() == Form.this && formComponent.isVisibleInHierarchy())
{
@@ -1707,7 +1707,7 @@
// if a default submitting component was set, handle the rendering of that
if (defaultSubmittingComponent instanceof Component)
{
- final Component<?> submittingComponent = (Component<?>)defaultSubmittingComponent;
+ final Component submittingComponent = (Component)defaultSubmittingComponent;
if (submittingComponent.isVisibleInHierarchy() && submittingComponent.isEnabled())
{
appendDefaultButtonField(markupStream, openTag);
@@ -1778,7 +1778,7 @@
visitFormComponents(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(FormComponent<?> formComponent)
+ public void onFormComponent(FormComponent formComponent)
{
if (formComponent.isVisible() && formComponent.isMultiPart())
{
@@ -1844,7 +1844,7 @@
visitFormComponentsPostOrder(new ValidationVisitor()
{
@Override
- public void validate(FormComponent<?> formComponent)
+ public void validate(FormComponent formComponent)
{
Form<?> form = formComponent.getForm();
if (form == Form.this)
@@ -1884,7 +1884,7 @@
visitFormComponentsPostOrder(new ValidationVisitor()
{
@Override
- public void validate(final FormComponent<?> formComponent)
+ public void validate(final FormComponent formComponent)
{
final Form<?> form = formComponent.getForm();
if (form == Form.this && form.isEnabled() && form.isEnableAllowed() &&
@@ -1905,7 +1905,7 @@
* @return true if the form component and all its parents are visible and there component is in
* page's hierarchy
*/
- private boolean isFormComponentVisibleInPage(FormComponent<?> fc)
+ private boolean isFormComponentVisibleInPage(FormComponent fc)
{
if (fc == null)
{
@@ -1927,7 +1927,7 @@
throw new IllegalArgumentException("Argument [[validator]] cannot be null");
}
- final FormComponent<?>[] dependents = validator.getDependentFormComponents();
+ final FormComponent[] dependents = validator.getDependentFormComponents();
boolean validate = true;
@@ -1935,7 +1935,7 @@
{
for (int j = 0; j < dependents.length; j++)
{
- final FormComponent<?> dependent = dependents[j];
+ final FormComponent dependent = dependents[j];
// check if the dependent component is valid
if (!dependent.isValid())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Thu Jun 19 09:52:58 2008
@@ -90,7 +90,7 @@
* The model object type
*
*/
-public abstract class FormComponent<T> extends LabeledWebMarkupContainer<T>
+public abstract class FormComponent<T> extends LabeledWebMarkupContainer
implements
IFormVisitorParticipant
{
@@ -108,12 +108,12 @@
{
if (component instanceof FormComponent)
{
- onFormComponent((FormComponent<?>)component);
+ onFormComponent((FormComponent)component);
}
return Component.IVisitor.CONTINUE_TRAVERSAL;
}
- protected abstract void onFormComponent(FormComponent<?> formComponent);
+ protected abstract void onFormComponent(FormComponent formComponent);
}
/**
@@ -145,7 +145,7 @@
*/
public String getMessage(String key)
{
- final FormComponent<T> formComponent = FormComponent.this;
+ final FormComponent formComponent = FormComponent.this;
// retrieve prefix that will be used to construct message keys
String prefix = formComponent.getValidatorKeyPrefix();
@@ -207,7 +207,7 @@
return message;
}
- private String getString(Localizer localizer, String key, Component<?> component)
+ private String getString(Localizer localizer, String key, Component component)
{
triedKeys.add(key);
return localizer.getString(key, component, "");
@@ -273,7 +273,7 @@
*/
private String getLabel()
{
- final FormComponent<T> fc = FormComponent.this;
+ final FormComponent fc = FormComponent.this;
String label = null;
// first try the label model ...
@@ -380,7 +380,7 @@
* @param visitor
* The visitor to call
*/
- public static final void visitFormComponentsPostOrder(Component<?> component,
+ public static final void visitFormComponentsPostOrder(Component component,
final FormComponent.IVisitor visitor)
{
if (visitor == null)
@@ -392,12 +392,12 @@
}
- private static final Object visitFormComponentsPostOrderHelper(Component<?> component,
+ private static final Object visitFormComponentsPostOrderHelper(Component component,
final FormComponent.IVisitor visitor)
{
if (component instanceof MarkupContainer)
{
- final MarkupContainer<?> container = (MarkupContainer<?>)component;
+ final MarkupContainer container = (MarkupContainer)component;
if (container.size() > 0)
{
boolean visitChildren = true;
@@ -407,10 +407,10 @@
}
if (visitChildren)
{
- final Iterator<Component<?>> children = container.iterator();
+ final Iterator<Component> children = container.iterator();
while (children.hasNext())
{
- final Component<?> child = children.next();
+ final Component child = children.next();
Object value = visitFormComponentsPostOrderHelper(child, visitor);
if (value == Component.IVisitor.STOP_TRAVERSAL)
{
@@ -423,7 +423,7 @@
if (component instanceof FormComponent)
{
- final FormComponent<?> fc = (FormComponent<?>)component;
+ final FormComponent fc = (FormComponent)component;
return visitor.formComponent(fc);
}
@@ -481,7 +481,7 @@
* @see IValidator
* @see IValidatorAddListener
*/
- public final FormComponent<T> add(final IValidator... validators)
+ public final FormComponent add(final IValidator... validators)
{
if (validators == null)
{
@@ -641,7 +641,7 @@
if (form == null)
{
// check whether the form is a child of a surrounding border
- final Border<?> border = findParent(Border.class);
+ final Border border = findParent(Border.class);
if (border != null)
{
FindFormVisitor formVisitor = new FindFormVisitor();
@@ -710,7 +710,7 @@
// TODO: keep this in sync with AbstractSubmitLink#getInputName
String id = getId();
final PrependingStringBuffer inputName = new PrependingStringBuffer(id.length());
- Component<?> c = this;
+ Component c = this;
while (true)
{
inputName.prepend(id);
@@ -922,7 +922,7 @@
public Object formComponent(IFormVisitorParticipant formComponent)
{
- final FormComponent<?> fc = (FormComponent<?>)formComponent;
+ final FormComponent fc = (FormComponent)formComponent;
if (fc.hasErrorMessage())
{
valid = false;
@@ -973,7 +973,7 @@
* @param labelModel
* @return this for chaining
*/
- public FormComponent<T> setLabel(IModel<String> labelModel)
+ public FormComponent setLabel(IModel<String> labelModel)
{
setLabelInternal(labelModel);
return this;
@@ -1013,7 +1013,7 @@
* True if this component is to be persisted.
* @return this for chaining
*/
- public final FormComponent<T> setPersistent(final boolean persistent)
+ public final FormComponent setPersistent(final boolean persistent)
{
if (supportsPersistence())
{
@@ -1033,7 +1033,7 @@
* @param required
* @return this for chaining
*/
- public final FormComponent<T> setRequired(final boolean required)
+ public final FormComponent setRequired(final boolean required)
{
if (!required && getType() != null && getType().isPrimitive())
{
@@ -1055,7 +1055,7 @@
* @param type
* @return this for chaining
*/
- public final FormComponent<T> setType(Class<?> type)
+ public final FormComponent setType(Class<?> type)
{
typeName = type == null ? null : type.getName();
if (type != null && type.isPrimitive())
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java Thu Jun 19 09:52:58 2008
@@ -31,7 +31,7 @@
{
private static final long serialVersionUID = 1L;
- private final LabeledWebMarkupContainer<?> component;
+ private final LabeledWebMarkupContainer component;
/**
* Constructor
@@ -41,7 +41,7 @@
* @param component
* component that this label is linked to
*/
- public FormComponentLabel(String id, LabeledWebMarkupContainer<?> component)
+ public FormComponentLabel(String id, LabeledWebMarkupContainer component)
{
super(id);
if (component == null)
@@ -70,7 +70,7 @@
*
* @return form component
*/
- public LabeledWebMarkupContainer<?> getFormComponent()
+ public LabeledWebMarkupContainer getFormComponent()
{
return component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java Thu Jun 19 09:52:58 2008
@@ -113,7 +113,7 @@
* @param <T>
* The model object type
*/
-public abstract class FormComponentPanel<T> extends FormComponent<T>
+public abstract class FormComponentPanel<T> extends FormComponent
implements
IHeaderPartContainerProvider
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java Thu Jun 19 09:52:58 2008
@@ -25,10 +25,8 @@
*
* @author almaw
*
- * @param <T>
- * The model object type
*/
-public abstract class LabeledWebMarkupContainer<T> extends WebMarkupContainer<T>
+public abstract class LabeledWebMarkupContainer extends WebMarkupContainer
implements
ILabelProvider<String>
{
@@ -67,7 +65,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public LabeledWebMarkupContainer(final String id, final IModel<T> model)
+ public LabeledWebMarkupContainer(final String id, final IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java Thu Jun 19 09:52:58 2008
@@ -46,7 +46,7 @@
* @param <T>
* The model object type
*/
-public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener
+public class RadioGroup<T> extends FormComponent implements IOnChangeListener
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @param labelProvider
* label provider (e.g. FormComponent, Radio, Check)
*/
- public SimpleFormComponentLabel(String id, LabeledWebMarkupContainer<?> labelProvider)
+ public SimpleFormComponentLabel(String id, LabeledWebMarkupContainer labelProvider)
{
super(id, labelProvider);
if (labelProvider.getLabel() == null)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java Thu Jun 19 09:52:58 2008
@@ -28,7 +28,7 @@
* @param <T>
* The model object type
*/
-public class TextArea<T> extends AbstractTextComponent<T>
+public class TextArea<T> extends AbstractTextComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java Thu Jun 19 09:52:58 2008
@@ -27,7 +27,7 @@
* @param <T>
* The model object type
*/
-public class TextField<T> extends AbstractTextComponent<T>
+public class TextField<T> extends AbstractTextComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java Thu Jun 19 09:52:58 2008
@@ -43,7 +43,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#clear(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void clear(final FormComponent<?> component)
+ public void clear(final FormComponent component)
{
final Cookie cookie = getCookie(component);
if (cookie != null)
@@ -59,7 +59,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#load(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void load(final FormComponent<?> component)
+ public void load(final FormComponent component)
{
final Cookie cookie = getCookie(component);
if (cookie != null)
@@ -76,7 +76,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#save(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void save(final FormComponent<?> component)
+ public void save(final FormComponent component)
{
final String name = getName(component);
final String value = component.getValue();
@@ -101,7 +101,7 @@
* Component to get name for
* @return The name of the component.
*/
- protected String getName(final FormComponent<?> component)
+ protected String getName(final FormComponent component)
{
return component.getPageRelativePath();
}
@@ -150,7 +150,7 @@
* The form component
* @return The cookie for the component or null if none is available
*/
- private Cookie getCookie(final FormComponent<?> component)
+ private Cookie getCookie(final FormComponent component)
{
// Gets the cookie's name
final String name = getName(component);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java Thu Jun 19 09:52:58 2008
@@ -38,7 +38,7 @@
* @param component
* The form component
*/
- void save(FormComponent<?> component);
+ void save(FormComponent component);
/**
* Loads any persisted value for a given form component
@@ -46,7 +46,7 @@
* @param component
* The form component
*/
- void load(FormComponent<?> component);
+ void load(FormComponent component);
/**
* Remove any persisted value for a given form component.
@@ -54,5 +54,5 @@
* @param component
* The form component
*/
- void clear(FormComponent<?> component);
+ void clear(FormComponent component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Thu Jun 19 09:52:58 2008
@@ -97,7 +97,7 @@
private final WebComponent<FileUpload> upload;
- private final WebMarkupContainer<?> container;
+ private final WebMarkupContainer container;
private final int max;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java Thu Jun 19 09:52:58 2008
@@ -65,7 +65,7 @@
* form component against which the error is reported
*
*/
- public void error(FormComponent<?> fc)
+ public void error(FormComponent fc)
{
error(fc, resourceKey(), variablesMap());
}
@@ -78,7 +78,7 @@
* @param resourceKey
* The message resource key to use
*/
- public void error(FormComponent<?> fc, final String resourceKey)
+ public void error(FormComponent fc, final String resourceKey)
{
if (resourceKey == null)
{
@@ -96,7 +96,7 @@
* @param vars
* variables for variable interpolation
*/
- public void error(FormComponent<?> fc, final Map<String, Object> vars)
+ public void error(FormComponent fc, final Map<String, Object> vars)
{
if (vars == null)
{
@@ -115,7 +115,7 @@
* @param vars
* The model for variable interpolation
*/
- public void error(FormComponent<?> fc, final String resourceKey, Map<String, Object> vars)
+ public void error(FormComponent fc, final String resourceKey, Map<String, Object> vars)
{
if (fc == null)
{
@@ -155,14 +155,14 @@
*/
protected Map<String, Object> variablesMap()
{
- FormComponent<?>[] formComponents = getDependentFormComponents();
+ FormComponent[] formComponents = getDependentFormComponents();
if (formComponents != null && formComponents.length > 0)
{
Map<String, Object> args = new HashMap<String, Object>(formComponents.length * 3);
for (int i = 0; i < formComponents.length; i++)
{
- final FormComponent<?> formComponent = formComponents[i];
+ final FormComponent formComponent = formComponents[i];
String arg = "label" + i;
IModel<?> label = formComponent.getLabel();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java Thu Jun 19 09:52:58 2008
@@ -40,7 +40,7 @@
private static final long serialVersionUID = 1L;
/** form components to be checked. */
- private final FormComponent< ? >[] components;
+ private final FormComponent[] components;
/**
* Construct.
@@ -50,7 +50,7 @@
* @param formComponent2
* a form component
*/
- public EqualInputValidator(FormComponent< ? > formComponent1, FormComponent< ? > formComponent2)
+ public EqualInputValidator(FormComponent formComponent1, FormComponent formComponent2)
{
if (formComponent1 == null)
{
@@ -66,7 +66,7 @@
/**
* @see org.apache.wicket.markup.html.form.validation.IFormValidator#getDependentFormComponents()
*/
- public FormComponent< ? >[] getDependentFormComponents()
+ public FormComponent[] getDependentFormComponents()
{
return components;
}
@@ -78,8 +78,8 @@
{
// we have a choice to validate the type converted values or the raw
// input values, we validate the raw input
- final FormComponent< ? > formComponent1 = components[0];
- final FormComponent< ? > formComponent2 = components[1];
+ final FormComponent formComponent1 = components[0];
+ final FormComponent formComponent2 = components[1];
if (!Objects.equal(formComponent1.getInput(), formComponent2.getInput()))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java Thu Jun 19 09:52:58 2008
@@ -44,8 +44,8 @@
* @param formComponent1
* @param formComponent2
*/
- public EqualPasswordInputValidator(FormComponent< ? > formComponent1,
- FormComponent< ? > formComponent2)
+ public EqualPasswordInputValidator(FormComponent formComponent1,
+ FormComponent formComponent2)
{
super(formComponent1, formComponent2);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java Thu Jun 19 09:52:58 2008
@@ -66,7 +66,7 @@
* @param component
* The component to watch for messages
*/
- public void setIndicatorFor(final Component< ? > component)
+ public void setIndicatorFor(final Component component)
{
filter = new ComponentFeedbackMessageFilter(component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
/**
* @return array of {@link FormComponent}s that this validator depends on
*/
- FormComponent< ? >[] getDependentFormComponents();
+ FormComponent[] getDependentFormComponents();
/**
* This method is ran if all components returned by
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java Thu Jun 19 09:52:58 2008
@@ -40,7 +40,7 @@
* @param <T>
* The model object type
*/
-public class Image<T> extends WebComponent<T> implements IResourceListener
+public class Image<T> extends WebComponent implements IResourceListener
{
private static final long serialVersionUID = 1L;
@@ -185,7 +185,7 @@
* @see org.apache.wicket.Component#setDefaultModel(org.apache.wicket.model.IModel)
*/
@Override
- public Component<T> setDefaultModel(IModel<T> model)
+ public Component setDefaultModel(IModel<T> model)
{
// Null out the image resource, so we reload it (otherwise we'll be
// stuck with the old model.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Thu Jun 19 09:52:58 2008
@@ -79,7 +79,7 @@
private Boolean resourceKind;
/** The component that is referencing this image resource */
- private final Component<?> component;
+ private final Component component;
/** The image resource this image component references */
private Resource resource;
@@ -161,7 +161,7 @@
* @param component
* The component that owns this localized image resource
*/
- public LocalizedImageResource(final Component<?> component)
+ public LocalizedImageResource(final Component component)
{
this.component = component;
locale = component.getLocale();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Thu Jun 19 09:52:58 2008
@@ -82,12 +82,12 @@
private static final Logger log = LoggerFactory.getLogger(Enclosure.class);
/** The child component to delegate the isVisible() call to */
- private Component< ? > childComponent;
+ private Component childComponent;
/** Id of the child component that will control visibility of the enclosure */
private final CharSequence childId;
- private transient Map<Component< ? >, Boolean> originalVisibilityStatus;
+ private transient Map<Component, Boolean> originalVisibilityStatus;
/**
* Construct.
@@ -116,11 +116,11 @@
* @param childId
* @return Child Component
*/
- public Component< ? > getChildComponent()
+ public Component getChildComponent()
{
if (childComponent == null)
{
- MarkupContainer< ? > parent = getEnclosureParent();
+ MarkupContainer parent = getEnclosureParent();
if (childId == null)
{
@@ -128,7 +128,7 @@
"You most likely forgot to register the EnclosureHandler with the MarkupParserFactory");
}
- final Component< ? > child = parent.get(childId.toString());
+ final Component child = parent.get(childId.toString());
if (child == null)
{
throw new MarkupException(
@@ -145,9 +145,9 @@
*
* @return enclosure's parent markup container
*/
- private MarkupContainer< ? > getEnclosureParent()
+ private MarkupContainer getEnclosureParent()
{
- MarkupContainer< ? > parent = getParent();
+ MarkupContainer parent = getParent();
while (parent != null)
{
if (parent.isTransparentResolver())
@@ -180,7 +180,7 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- final Component< ? > controller = getChildComponent();
+ final Component controller = getChildComponent();
if (controller == this)
{
throw new WicketRuntimeException(
@@ -190,13 +190,13 @@
setVisible(controller.determineVisibility());
// transfer visibility to direct children
- originalVisibilityStatus = new HashMap<Component< ? >, Boolean>();
+ originalVisibilityStatus = new HashMap<Component, Boolean>();
DirectChildTagIterator it = new DirectChildTagIterator(markupStream, openTag);
- MarkupContainer< ? > controllerParent = getEnclosureParent();
+ MarkupContainer controllerParent = getEnclosureParent();
while (it.hasNext())
{
ComponentTag t = it.next();
- Component< ? > child = controllerParent.get(t.getId());
+ Component child = controllerParent.get(t.getId());
if (child != null)
{
// record original visiblity allowed value, will restore later
@@ -223,7 +223,7 @@
if (originalVisibilityStatus != null)
{
// restore original visibility statuses
- for (Map.Entry<Component< ? >, Boolean> entry : originalVisibilityStatus.entrySet())
+ for (Map.Entry<Component, Boolean> entry : originalVisibilityStatus.entrySet())
{
entry.getKey().setVisibilityAllowed(entry.getValue());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Thu Jun 19 09:52:58 2008
@@ -47,24 +47,24 @@
* HtmlHeaderResolver.
* <p>
* <ul>
- * <li> <head> will be inserted in output automatically if required</li>
- * <li> <head> is <b>not</b> a wicket specific tag and you must use add() to add components
+ * <li><head> will be inserted in output automatically if required</li>
+ * <li><head> is <b>not</b> a wicket specific tag and you must use add() to add components
* referenced in body of the head tag</li>
- * <li> <head> is supported by panels, borders and inherited markup, but is <b>not</b> copied
+ * <li><head> is supported by panels, borders and inherited markup, but is <b>not</b> copied
* to the output. They are for previewability only (except on Pages)</li>
- * <li> <wicket:head> does not make sense in page markup (but does in inherited page markup)</li>
- * <li> <wicket:head> makes sense in Panels, Borders and inherited markup (of Panels, Borders
+ * <li><wicket:head> does not make sense in page markup (but does in inherited page markup)</li>
+ * <li><wicket:head> makes sense in Panels, Borders and inherited markup (of Panels, Borders
* and Pages)</li>
- * <li> components within <wicket:head> must be added by means of add(), like always with
+ * <li>components within <wicket:head> must be added by means of add(), like always with
* Wicket. No difference.</li>
- * <li> <wicket:head> and it's content is copied to the output. Components contained in
+ * <li><wicket:head> and it's content is copied to the output. Components contained in
* <org.apache.wicket.head> are rendered as usual</li>
* </ul>
*
* @author Juergen Donnerstag
*
*/
-public class HtmlHeaderContainer extends WebMarkupContainer<Void>
+public class HtmlHeaderContainer extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -205,18 +205,18 @@
* @param container
* The header component container
*/
- private final void renderHeaderSections(final MarkupContainer< ? > page,
+ private final void renderHeaderSections(final MarkupContainer page,
final HtmlHeaderContainer container)
{
page.renderHead(container);
// Make sure all Components interested in contributing to the header
// and there attached behaviors are asked.
- page.visitChildren(new IVisitor<Component< ? >>()
+ page.visitChildren(new IVisitor<Component>()
{
/**
* @see org.apache.wicket.Component.IVisitor#component(org.apache.wicket.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/markup/html/link/AbstractLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java Thu Jun 19 09:52:58 2008
@@ -30,7 +30,7 @@
* @param <T>
* The model object type
*/
-public abstract class AbstractLink<T> extends WebMarkupContainer<T>
+public abstract class AbstractLink extends WebMarkupContainer
{
/**
@@ -45,7 +45,7 @@
* @param id
* @param model
*/
- public AbstractLink(String id, IModel<T> model)
+ public AbstractLink(String id, IModel<?> model)
{
super(id, model);
}
@@ -78,7 +78,7 @@
* The insertion string
* @return this
*/
- public AbstractLink<T> setAfterDisabledLink(final String afterDisabledLink)
+ public AbstractLink setAfterDisabledLink(final String afterDisabledLink)
{
if (afterDisabledLink == null)
{
@@ -106,7 +106,7 @@
* The insertion string
* @return this
*/
- public AbstractLink<T> setBeforeDisabledLink(final String beforeDisabledLink)
+ public AbstractLink setBeforeDisabledLink(final String beforeDisabledLink)
{
if (beforeDisabledLink == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Thu Jun 19 09:52:58 2008
@@ -57,7 +57,7 @@
* @param pageClass
* The class of page to link to
*/
- public <C extends Page<?>> BookmarkablePageLink(final String id, final Class<C> pageClass)
+ public <C extends Page> BookmarkablePageLink(final String id, final Class<C> pageClass)
{
this(id, pageClass, null);
}
@@ -113,7 +113,7 @@
* @param parameters
* The parameters to pass to the new page when the link is clicked
*/
- public <C extends Page<?>> BookmarkablePageLink(final String id, final Class<C> pageClass,
+ public <C extends Page> BookmarkablePageLink(final String id, final Class<C> pageClass,
final PageParameters parameters)
{
super(id);
@@ -137,7 +137,7 @@
*
* @return Page class
*/
- public final Class<? extends Page<?>> getPageClass()
+ public final Class<? extends Page> getPageClass()
{
return Classes.resolveClass(pageClassName);
}
@@ -165,7 +165,7 @@
* @see org.apache.wicket.markup.html.link.Link#linksTo(org.apache.wicket.Page)
*/
@Override
- public boolean linksTo(final Page<?> page)
+ public boolean linksTo(final Page page)
{
return page.getClass() == getPageClass();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java Thu Jun 19 09:52:58 2008
@@ -44,7 +44,7 @@
*
* @return The page to go to.
*/
- Page<?> getPage();
+ Page getPage();
/**
* Gets the class of the destination page, which serves as a form of identity that can be used
@@ -70,5 +70,5 @@
* @return The class of page linked to, as a form of identity
* @see Link#linksTo(Page)
*/
- Class<? extends Page<?>> getPageIdentity();
+ Class<? extends Page> getPageIdentity();
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java Thu Jun 19 09:52:58 2008
@@ -63,7 +63,7 @@
* @param c
* Page class
*/
- public <C extends Page<?>> InlineFrame(final String id, final IPageMap pageMap, final Class<C> c)
+ public <C extends Page> InlineFrame(final String id, final IPageMap pageMap, final Class<C> c)
{
this(id, pageMap, c, null);
}
@@ -83,14 +83,14 @@
* @param params
* Page parameters
*/
- public <C extends Page<?>> InlineFrame(final String id, final IPageMap pageMap,
+ public <C extends Page> InlineFrame(final String id, final IPageMap pageMap,
final Class<C> c, final PageParameters params)
{
this(id, pageMap, new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
if (params == null)
{
@@ -103,7 +103,7 @@
}
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return c;
}
@@ -125,22 +125,22 @@
* @param page
* The page
*/
- public InlineFrame(final String id, final Page<?> page)
+ public InlineFrame(final String id, final Page page)
{
this(id, page.getPageMap(), new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
// use given page
return page;
}
@SuppressWarnings("unchecked")
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
- return (Class<? extends Page<?>>)page.getClass();
+ return (Class<? extends Page>)page.getClass();
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java Thu Jun 19 09:52:58 2008
@@ -72,10 +72,8 @@
*
* @author Jonathan Locke
* @author Eelco Hillenius
- * @param <T>
- * type of model object
*/
-public abstract class Link<T> extends AbstractLink<T> implements ILinkListener
+public abstract class Link extends AbstractLink implements ILinkListener
{
/** Change record for when an anchor is changed. */
private final class AnchorChange extends Change
@@ -83,14 +81,14 @@
private static final long serialVersionUID = 1L;
/** the old anchor. */
- private final Component< ? > anchor;
+ private final Component anchor;
/**
* Construct.
*
* @param anchor
*/
- public AnchorChange(Component< ? > anchor)
+ public AnchorChange(Component anchor)
{
this.anchor = anchor;
}
@@ -111,7 +109,7 @@
* must be attached to a <a tag with a href attribute of more than one character starting
* with '#' ('<a href="#someAnchor" ... ').
*/
- private Component< ? > anchor;
+ private Component anchor;
/**
* True if link should automatically enable/disable based on current page; false by default.
@@ -135,7 +133,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public Link(final String id, IModel<T> object)
+ public Link(final String id, IModel<?> object)
{
super(id, object);
}
@@ -145,7 +143,7 @@
*
* @return Any anchor component to jump to, might be null
*/
- public Component< ? > getAnchor()
+ public Component getAnchor()
{
return anchor;
}
@@ -231,7 +229,7 @@
* The anchor
* @return this
*/
- public Link<T> setAnchor(Component< ? > anchor)
+ public Link setAnchor(Component anchor)
{
addStateChange(new AnchorChange(this.anchor));
this.anchor = anchor;
@@ -245,7 +243,7 @@
* whether this link should automatically enable/disable based on current page.
* @return This
*/
- public final Link<T> setAutoEnable(final boolean autoEnable)
+ public final Link setAutoEnable(final boolean autoEnable)
{
this.autoEnable = autoEnable;
return this;
@@ -259,7 +257,7 @@
* the popup specification.
* @return This
*/
- public final Link<T> setPopupSettings(final PopupSettings popupSettings)
+ public final Link setPopupSettings(final PopupSettings popupSettings)
{
this.popupSettings = popupSettings;
return this;
@@ -291,7 +289,7 @@
{
if (url != null)
{
- Component< ? > anchor = getAnchor();
+ Component anchor = getAnchor();
if (anchor != null)
{
if (url.toString().indexOf('#') == -1)
@@ -377,7 +375,7 @@
* A page
* @return True if this link goes to the given page
*/
- protected boolean linksTo(final Page< ? > page)
+ protected boolean linksTo(final Page page)
{
return false;
}