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/20 10:11:53 UTC
svn commit: r669816 [3/7] - in /wicket/sandbox/ivaynberg/generics:
archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src...
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Fri Jun 20 01:11:40 2008
@@ -44,7 +44,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
/** click count for Link. */
private int linkClickCount = 0;
@@ -58,7 +58,7 @@
public Home()
{
// Action link counts link clicks
- final Link<?> actionLink = new Link<Void>("actionLink")
+ final Link<?> actionLink = new Link("actionLink")
{
@Override
public void onClick()
@@ -71,7 +71,7 @@
add(actionLink);
// Action link counts link clicks on works with onclick handler
- final Link<?> actionOnClickLink = new Link<Void>("actionOnClickLink")
+ final Link<?> actionOnClickLink = new Link("actionOnClickLink")
{
@Override
public void onClick()
@@ -93,7 +93,7 @@
"3++2 & 5 � >< space + �"));
// Link to BookDetails page
- add(new PageLink<Void>("bookDetailsLink", new IPageLink()
+ add(new PageLink("bookDetailsLink", new IPageLink()
{
public Page getPage()
{
@@ -107,7 +107,7 @@
}));
// Delayed link to BookDetails page
- add(new PageLink<Void>("bookDetailsLink2", new IPageLink()
+ add(new PageLink("bookDetailsLink2", new IPageLink()
{
public Page getPage()
{
@@ -146,14 +146,14 @@
"Click this link to go to Google in a popup").setPopupSettings(googlePopupSettings));
// Shared resource link
- add(new ResourceLink<Void>("cancelButtonLink", new ResourceReference("cancelButton")));
+ add(new ResourceLink("cancelButtonLink", new ResourceReference("cancelButton")));
// redirect to external url form
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
add(feedbackPanel);
add(new RedirectForm("redirectForm"));
- Link<?> linkToAnchor = new Link<Void>("linkToAnchor")
+ Link<?> linkToAnchor = new Link("linkToAnchor")
{
@Override
public void onClick()
@@ -161,7 +161,7 @@
}
};
add(linkToAnchor);
- Link<?> anotherlinkToAnchor = new Link<Void>("anotherlinkToAnchor")
+ Link<?> anotherlinkToAnchor = new Link("anotherlinkToAnchor")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java Fri Jun 20 01:11:40 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class Page3 extends WicketExamplePage<Void>
+public class Page3 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.java Fri Jun 20 01:11:40 2008
@@ -25,13 +25,13 @@
*
* @author Jonathan Locke
*/
-public class Popup extends WicketExamplePage<Void>
+public class Popup extends WicketExamplePage
{
/**
* Constructor
*/
public Popup()
{
- add(new PopupCloseLink<Void>("close"));
+ add(new PopupCloseLink("close"));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
*
* @author Jonathan Locke
*/
-public class NavomaticBorder extends Border<Void>
+public class NavomaticBorder extends Border
{
/**
* Constructor
@@ -35,7 +35,7 @@
public NavomaticBorder(final String id)
{
super(id);
- add(new BoxBorder<Void>("navigationBorder"));
- add(new BoxBorder<Void>("bodyBorder"));
+ add(new BoxBorder("navigationBorder"));
+ add(new BoxBorder("bodyBorder"));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
*
* @author Jonathan Locke
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Page3 extends WicketExamplePage<Void>
+public class Page3 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Fri Jun 20 01:11:40 2008
@@ -40,7 +40,7 @@
*
* @author Eelco Hillenius
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
/**
* Constructor.
@@ -85,7 +85,7 @@
tree.setLinkType(LinkType.REGULAR);
add(tree);
- add(new Link<Void>("expandAll")
+ add(new Link("expandAll")
{
@Override
public void onClick()
@@ -94,7 +94,7 @@
}
});
- add(new Link<Void>("collapseAll")
+ add(new Link("collapseAll")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java Fri Jun 20 01:11:40 2008
@@ -85,9 +85,9 @@
// as we have to confirm to our HTML definition, and set it's
// visibility
// property to false as we do not want LI tags to be rendered.
- WebMarkupContainer row = new WebMarkupContainer<Void>("row");
+ WebMarkupContainer row = new WebMarkupContainer("row");
row.setVisible(false);
- row.add(new WebMarkupContainer<Void>("label"));
+ row.add(new WebMarkupContainer("label"));
listItem.add(row);
}
else
@@ -103,7 +103,7 @@
// add the row (with the LI element attached, and the label with
// the
// row's actual value to display
- WebMarkupContainer row = new WebMarkupContainer<Void>("row");
+ WebMarkupContainer row = new WebMarkupContainer("row");
row.add(new Label<String>("label", modelObject.toString()));
listItem.add(row);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java Fri Jun 20 01:11:40 2008
@@ -28,7 +28,7 @@
*
* @author Eelco Hillenius
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java Fri Jun 20 01:11:40 2008
@@ -26,7 +26,7 @@
*
* @author Eelco Hillenius
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java Fri Jun 20 01:11:40 2008
@@ -29,7 +29,7 @@
*
* @author Igor Vaynberg
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
private final Random random = new Random();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class Page3 extends WicketExamplePage<Void>
+public class Page3 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class Page4 extends WicketExamplePage<Void>
+public class Page4 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Igor Vaynberg
*/
-public class Page5 extends WicketExamplePage<Void>
+public class Page5 extends WicketExamplePage
{
private final Random random = new Random();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java Fri Jun 20 01:11:40 2008
@@ -37,7 +37,7 @@
* @author Juergen Donnerstag
* @author Eelco Hillenius
*/
-public abstract class SignInPanel extends Panel<Void>
+public abstract class SignInPanel extends Panel
{
/** True if the panel should display a remember-me checkbox */
private boolean includeRememberMe = true;
@@ -54,7 +54,7 @@
/**
* Sign in form.
*/
- public final class SignInForm extends Form<Void>
+ public final class SignInForm extends Form
{
/** El-cheapo model for form. */
private final ValueMap properties = new ValueMap();
@@ -80,7 +80,7 @@
password.setType(String.class);
// MarkupContainer row for remember me checkbox
- WebMarkupContainer rememberMeRow = new WebMarkupContainer<Void>("rememberMeRow");
+ WebMarkupContainer rememberMeRow = new WebMarkupContainer("rememberMeRow");
add(rememberMeRow);
// Add rememberMe checkbox
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java Fri Jun 20 01:11:40 2008
@@ -34,7 +34,7 @@
/**
* @author Ate Douma
*/
-public class EditPage extends WebPage<Void>
+public class EditPage extends WebPage
{
private static final IChoiceRenderer<ExampleApplication> exampleChoiceRenderer = new IChoiceRenderer<ExampleApplication>()
{
@@ -62,7 +62,7 @@
*/
public EditPage()
{
- Form<?> form = new Form<Void>("form")
+ Form<?> form = new Form("form")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -108,7 +108,7 @@
}
ddc.setDefaultModel(selected);
form.add(ddc);
- form.add(new Button<Void>("setButton"));
+ form.add(new Button("setButton"));
add(form);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java Fri Jun 20 01:11:40 2008
@@ -26,14 +26,14 @@
/**
* @author Ate Douma
*/
-public class HeaderPage extends WebPage<Void>
+public class HeaderPage extends WebPage
{
/**
* Construct.
*/
public HeaderPage()
{
- add(new Link<Void>("menu")
+ add(new Link("menu")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java Fri Jun 20 01:11:40 2008
@@ -28,7 +28,7 @@
/**
* @author ate
*/
-public class MenuPage extends WebPage<Void>
+public class MenuPage extends WebPage
{
/**
* Construct.
@@ -43,7 +43,7 @@
{
final int index = item.getIteration();
ExampleApplication ea = WicketExamplesMenuApplication.getExamples().get(index + 1);
- Link<?> link = new Link<Void>("example")
+ Link<?> link = new Link("example")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java Fri Jun 20 01:11:40 2008
@@ -34,7 +34,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public final class Home extends WicketExamplePage<Void>
+public final class Home extends WicketExamplePage
{
/**
* Constructor
@@ -44,7 +44,7 @@
*/
public Home(final PageParameters parameters)
{
- add(new Image<Void>("beer"));
+ add(new Image("beer"));
// create a dummy object to serve as our substitution model
ValueMap map = new ValueMap();
@@ -65,7 +65,7 @@
// Add a couple of links to be able to play around with the session
// locale
- add(new Link<Void>("goCanadian")
+ add(new Link("goCanadian")
{
@Override
public void onClick()
@@ -73,7 +73,7 @@
getSession().setLocale(Locale.CANADA);
}
});
- add(new Link<Void>("goUS")
+ add(new Link("goUS")
{
@Override
public void onClick()
@@ -81,7 +81,7 @@
getSession().setLocale(Locale.US);
}
});
- add(new Link<Void>("goDutch")
+ add(new Link("goDutch")
{
@Override
public void onClick()
@@ -89,7 +89,7 @@
getSession().setLocale(new Locale("nl", "NL"));
}
});
- add(new Link<Void>("goGerman")
+ add(new Link("goGerman")
{
@Override
public void onClick()
@@ -97,7 +97,7 @@
getSession().setLocale(new Locale("de", "DE"));
}
});
- add(new Link<Void>("goChinese")
+ add(new Link("goChinese")
{
@Override
public void onClick()
@@ -105,7 +105,7 @@
getSession().setLocale(new Locale("zh", "CN"));
}
});
- add(new Link<Void>("goDanish")
+ add(new Link("goDanish")
{
@Override
public void onClick()
@@ -113,7 +113,7 @@
getSession().setLocale(new Locale("da", "DK"));
}
});
- add(new Link<Void>("goKorean")
+ add(new Link("goKorean")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java Fri Jun 20 01:11:40 2008
@@ -33,7 +33,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public final class Home extends WicketExamplePage<Void>
+public final class Home extends WicketExamplePage
{
/**
* Constructor
@@ -62,7 +62,7 @@
// Add a couple of links to be able to play around with the session
// locale
- add(new Link<Void>("goCanadian")
+ add(new Link("goCanadian")
{
@Override
public void onClick()
@@ -70,7 +70,7 @@
getSession().setLocale(Locale.CANADA);
}
});
- add(new Link<Void>("goUS")
+ add(new Link("goUS")
{
@Override
public void onClick()
@@ -78,7 +78,7 @@
getSession().setLocale(Locale.US);
}
});
- add(new Link<Void>("goDutch")
+ add(new Link("goDutch")
{
@Override
public void onClick()
@@ -86,7 +86,7 @@
getSession().setLocale(new Locale("nl", "NL"));
}
});
- add(new Link<Void>("goGerman")
+ add(new Link("goGerman")
{
@Override
public void onClick()
@@ -94,7 +94,7 @@
getSession().setLocale(new Locale("de", "DE"));
}
});
- add(new Link<Void>("goChinese")
+ add(new Link("goChinese")
{
@Override
public void onClick()
@@ -102,7 +102,7 @@
getSession().setLocale(new Locale("zh", "CN"));
}
});
- add(new Link<Void>("goDanish")
+ add(new Link("goDanish")
{
@Override
public void onClick()
@@ -110,7 +110,7 @@
getSession().setLocale(new Locale("da", "DK"));
}
});
- add(new Link<Void>("goKorean")
+ add(new Link("goKorean")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java Fri Jun 20 01:11:40 2008
@@ -29,7 +29,7 @@
*
* @author igor
*/
-public class BasePage extends ExamplePage<Void>
+public class BasePage extends ExamplePage
{
private Contact selected;
@@ -72,7 +72,7 @@
public ActionPanel(String id, IModel<Contact> model)
{
super(id, model);
- add(new Link<Void>("select")
+ add(new Link("select")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java Fri Jun 20 01:11:40 2008
@@ -46,7 +46,7 @@
*/
public FormPage()
{
- form = new Form<Void>("form");
+ form = new Form("form");
add(form);
// create a repeater that will display the list of contacts.
@@ -122,7 +122,7 @@
public ActionPanel(String id, IModel<Contact> model)
{
super(id, model);
- add(new Link<Void>("select")
+ add(new Link("select")
{
@Override
public void onClick()
@@ -131,7 +131,7 @@
}
});
- SubmitLink<?> removeLink = new SubmitLink<Void>("remove", form)
+ SubmitLink<?> removeLink = new SubmitLink("remove", form)
{
@Override
public void onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
* @author igor
*
*/
-public class Index extends ExamplePage<Void>
+public class Index extends ExamplePage
{
/**
* constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java Fri Jun 20 01:11:40 2008
@@ -84,7 +84,7 @@
{
Contact contact = item.getDefaultModelObject();
item.add(new ActionPanel("actions", item.getDefaultModel()));
- item.add(new Link<Void>("toggleHighlite")
+ item.add(new Link("toggleHighlite")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java Fri Jun 20 01:11:40 2008
@@ -90,7 +90,7 @@
add(view);
- add(new Link<Void>("refreshLink")
+ add(new Link("refreshLink")
{
@Override
public void onClick()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java Fri Jun 20 01:11:40 2008
@@ -39,13 +39,13 @@
{
Iterator<Contact> contacts = new ContactDataProvider().iterator(0, 10);
- RepeatingView<?> repeating = new RepeatingView<Void>("repeating");
+ RepeatingView<?> repeating = new RepeatingView("repeating");
add(repeating);
int index = 0;
while (contacts.hasNext())
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(repeating.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(repeating.newChildId());
repeating.add(item);
Contact contact = contacts.next();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends WicketExamplePage<Void> implements AuthenticatedWebPage
+public class Home extends WicketExamplePage implements AuthenticatedWebPage
{
// Nothing in here.
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn extends WicketExamplePage<Void>
+public final class SignIn extends WicketExamplePage
{
/**
* Constructor
@@ -64,7 +64,7 @@
*
* @author Jonathan Locke
*/
- public final class SignInForm extends Form<Void>
+ public final class SignInForm extends Form
{
// El-cheapo model for form
private final ValueMap properties = new ValueMap();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends AuthenticatedWebPage<Void>
+public class Home extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn2 extends WicketExamplePage<Void>
+public final class SignIn2 extends WicketExamplePage
{
/**
* Construct
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class SignOut extends AuthenticatedWebPage<Void>
+public class SignOut extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Fri Jun 20 01:11:40 2008
@@ -62,7 +62,7 @@
*
* @author Martijn Dashorst
*/
-public class SourcesPage extends WebPage<Void>
+public class SourcesPage extends WebPage
{
private static final Log log = LogFactory.getLog(SourcesPage.class);
@@ -360,7 +360,7 @@
/**
* Displays the resources embedded in a package in a list.
*/
- public class FilesBrowser extends WebMarkupContainer<Void>
+ public class FilesBrowser extends WebMarkupContainer
{
/**
* Constructor.
@@ -403,7 +403,7 @@
* Container for displaying the source of the selected page, resource or other element from the
* package.
*/
- public class CodePanel extends WebMarkupContainer<Void>
+ public class CodePanel extends WebMarkupContainer
{
/**
* Constructor.
@@ -485,6 +485,6 @@
codePanel = new CodePanel("codepanel").setOutputMarkupId(true);
add(codePanel);
add(new FilesBrowser("filespanel"));
- add(new PopupCloseLink<Void>("close"));
+ add(new PopupCloseLink("close"));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WebPage<Void>
+public class Index extends WebPage
{
/**
* Constructor
@@ -43,7 +43,7 @@
add(new BookmarkablePageLink("linkToStatelessPage3", StatelessPage3.class));
// The second with a stateless link, so the onclick will be called but
// on a stateless page.
- add(new StatelessLink<Void>("linkToStatefulPage")
+ add(new StatelessLink("linkToStatefulPage")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -54,7 +54,7 @@
setResponsePage(StatefulPage.class);
}
});
- add(new StatelessLink<Void>("invalidatesession")
+ add(new StatelessLink("invalidatesession")
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public class StatefulPage extends WebPage<Void>
+public class StatefulPage extends WebPage
{
/** click count for Link. */
private int linkClickCount = 0;
@@ -45,7 +45,7 @@
add(new BookmarkablePageLink("indexLink", Index.class));
// Action link counts link clicks
- final Link<?> actionLink = new Link<Void>("actionLink")
+ final Link<?> actionLink = new Link("actionLink")
{
@Override
public void onClick()
@@ -59,7 +59,7 @@
final TextField<String> field = new TextField<String>("textfield", new Model<String>());
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage extends WebPage<Void>
+public class StatelessPage extends WebPage
{
private final Integer number = new Integer(10);
@@ -47,7 +47,7 @@
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage1 extends WebPage<Void>
+public class StatelessPage1 extends WebPage
{
private final Integer number = new Integer(10);
@@ -47,7 +47,7 @@
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage2 extends WebPage<Void>
+public class StatelessPage2 extends WebPage
{
private final Integer number = new Integer(10);
@@ -47,7 +47,7 @@
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage3 extends WebPage<Void>
+public class StatelessPage3 extends WebPage
{
private final Integer number = new Integer(10);
@@ -47,7 +47,7 @@
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java Fri Jun 20 01:11:40 2008
@@ -21,7 +21,7 @@
/**
* @author jbq
*/
-public class EmailPage extends WicketExamplePage<Void>
+public class EmailPage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java Fri Jun 20 01:11:40 2008
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
/**
* @author jbq
*/
-public class Page extends WicketExamplePage<Void>
+public class Page extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java Fri Jun 20 01:11:40 2008
@@ -21,6 +21,6 @@
/**
* @author jbq
*/
-public class Sent extends WicketExamplePage<Void>
+public class Sent extends WicketExamplePage
{
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* @author Martijn Dashorst
*/
-public class StockQuotePage extends WicketExamplePage<Void>
+public class StockQuotePage extends WicketExamplePage
{
/**
* Constructor
@@ -52,7 +52,7 @@
final IModel<String> model = new PropertyModel<String>(quote, "symbol");
// form holding the input field.
- final Form<?> form = new Form<Void>("form");
+ final Form<?> form = new Form("form");
add(form);
form.add(new TextField<String>("symbol", model));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
*
* @author Eelco Hillenius
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java Fri Jun 20 01:11:40 2008
@@ -28,10 +28,10 @@
*
* @author Eelco Hillenius
*/
-public class TemplateBorder extends Border<Void>
+public class TemplateBorder extends Border
{
/** the current banner. */
- private Banner<Void> currentBanner;
+ private Banner currentBanner;
/**
* Constructor
@@ -41,8 +41,8 @@
public TemplateBorder(String id)
{
super(id);
- add(currentBanner = new Banner1<Void>("ad"));
- add(new Link<Void>("changeAdLink")
+ add(currentBanner = new Banner1("ad"));
+ add(new Link("changeAdLink")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -52,11 +52,11 @@
{
if (currentBanner.getClass() == Banner1.class)
{
- TemplateBorder.this.replace(currentBanner = new Banner2<Void>("ad"));
+ TemplateBorder.this.replace(currentBanner = new Banner2("ad"));
}
else
{
- TemplateBorder.this.replace(currentBanner = new Banner1<Void>("ad"));
+ TemplateBorder.this.replace(currentBanner = new Banner1("ad"));
}
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java Fri Jun 20 01:11:40 2008
@@ -31,6 +31,6 @@
public Page1()
{
setPageTitle("Template example, page 1");
- add(new Panel1<Void>("panel1"));
+ add(new Panel1("panel1"));
}
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java Fri Jun 20 01:11:40 2008
@@ -31,13 +31,13 @@
*
* @author Eelco Hillenius
*/
-public abstract class TemplatePage extends WicketExamplePage<Void>
+public abstract class TemplatePage extends WicketExamplePage
{
/** title of the current page. */
private String pageTitle = "(no title)";
/** the current banner. */
- private Banner<Void> currentBanner;
+ private Banner currentBanner;
/**
* Constructor
@@ -45,8 +45,8 @@
public TemplatePage()
{
add(new Label<String>("title", new PropertyModel<String>(this, "pageTitle")));
- add(currentBanner = new Banner1<Void>("ad"));
- add(new Link<Void>("changeAdLink")
+ add(currentBanner = new Banner1("ad"));
+ add(new Link("changeAdLink")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -56,11 +56,11 @@
{
if (currentBanner.getClass() == Banner1.class)
{
- TemplatePage.this.replace(currentBanner = new Banner2<Void>("ad"));
+ TemplatePage.this.replace(currentBanner = new Banner2("ad"));
}
else
{
- TemplatePage.this.replace(currentBanner = new Banner1<Void>("ad"));
+ TemplatePage.this.replace(currentBanner = new Banner1("ad"));
}
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java Fri Jun 20 01:11:40 2008
@@ -35,7 +35,7 @@
*
* @author Eelco Hillenius
*/
-public class UnicodeConverter extends WicketExamplePage<Void>
+public class UnicodeConverter extends WicketExamplePage
{
private static final String FROM_ESCAPED_UNICODE = "from escaped unicode";
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Fri Jun 20 01:11:40 2008
@@ -49,7 +49,7 @@
*
* @author Eelco Hillenius
*/
-public class MultiUploadPage extends WicketExamplePage<Void>
+public class MultiUploadPage extends WicketExamplePage
{
/**
* List view for files in upload folder.
@@ -77,7 +77,7 @@
{
final File file = listItem.getDefaultModelObject();
listItem.add(new Label<String>("file", file.getName()));
- listItem.add(new Link<Void>("delete")
+ listItem.add(new Link("delete")
{
@Override
public void onClick()
@@ -92,7 +92,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form<Void>
+ private class FileUploadForm extends Form
{
// collection that will hold uploaded FileUpload objects
private final Collection<FileUpload> uploads = new ArrayList<FileUpload>();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Fri Jun 20 01:11:40 2008
@@ -46,7 +46,7 @@
*
* @author Eelco Hillenius
*/
-public class UploadPage extends WicketExamplePage<Void>
+public class UploadPage extends WicketExamplePage
{
/**
* List view for files in upload folder.
@@ -74,7 +74,7 @@
{
final File file = listItem.getDefaultModelObject();
listItem.add(new Label<String>("file", file.getName()));
- listItem.add(new Link<Void>("delete")
+ listItem.add(new Link("delete")
{
@Override
public void onClick()
@@ -89,7 +89,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form<Void>
+ private class FileUploadForm extends Form
{
private FileUploadField fileUploadField;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Fri Jun 20 01:11:40 2008
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class DynamicPage extends WicketExamplePage<Void>
+public class DynamicPage extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java Fri Jun 20 01:11:40 2008
@@ -21,6 +21,6 @@
/**
* Home page of this example.
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java Fri Jun 20 01:11:40 2008
@@ -38,12 +38,12 @@
*
* @author Eelco Hillenius
*/
-public class TemplatePage extends WicketExamplePage<Void>
+public class TemplatePage extends WicketExamplePage
{
/**
* Form for changing the template contents.
*/
- private final class TemplateForm extends Form<Void>
+ private final class TemplateForm extends Form
{
private TextArea<IStringResourceStream> templateTextArea;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java Fri Jun 20 01:11:40 2008
@@ -26,7 +26,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/**
* Link to the wizard. It's an internal link instead of a bookmarkable page to help us with
@@ -36,7 +36,7 @@
* wizard, there is still the first access to the wizard. But if you link to the page that
* renders it using and internal link, you'll circumvent that.
*/
- private static final class WizardLink extends Link<Void>
+ private static final class WizardLink extends Link
{
private final Class<? extends Wizard<?>> wizardClass;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java Fri Jun 20 01:11:40 2008
@@ -72,7 +72,7 @@
/**
* The user details step.
*/
- private final class UserDetailsStep extends WizardStep<Void>
+ private final class UserDetailsStep extends WizardStep
{
/**
* Construct.
@@ -92,7 +92,7 @@
/**
* The user name step.
*/
- private final class UserNameStep extends WizardStep<Void>
+ private final class UserNameStep extends WizardStep
{
/**
* Construct.
@@ -108,7 +108,7 @@
/**
* The user details step.
*/
- private final class UserRolesStep extends WizardStep<Void> implements ICondition
+ private final class UserRolesStep extends WizardStep implements ICondition
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public class StaticWizard extends Wizard<Void>
+public class StaticWizard extends Wizard
{
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java Fri Jun 20 01:11:40 2008
@@ -32,13 +32,13 @@
*
* @author Eelco Hillenius
*/
-public class StaticWizardWithPanels extends Wizard<Void>
+public class StaticWizardWithPanels extends Wizard
{
/**
* The first step of this wizard.
*/
- private static final class Step1 extends WizardStep<Void>
+ private static final class Step1 extends WizardStep
{
/**
* Construct.
@@ -52,7 +52,7 @@
/**
* The second step of this wizard.
*/
- private static final class Step2 extends WizardStep<Void>
+ private static final class Step2 extends WizardStep
{
/**
* Construct.
@@ -66,7 +66,7 @@
/**
* The third step of this wizard.
*/
- private static final class Step3 extends WizardStep<Void>
+ private static final class Step3 extends WizardStep
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardPage extends WicketExamplePage<Void>
+public class WizardPage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class BasePage extends WicketExamplePage<Void>
+public class BasePage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java Fri Jun 20 01:11:40 2008
@@ -22,7 +22,7 @@
/**
* Just a totally do nothing page; has to be here to have any page at all for the CookieTest.
*/
-public class MockPage extends WebPage<Void>
+public class MockPage extends WebPage
{
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Fri Jun 20 01:11:40 2008
@@ -37,7 +37,7 @@
*
* @author Andrew Lombardi
*/
-public class UploadProgressBar extends Panel<Void>
+public class UploadProgressBar extends Panel
{
private static final Logger log = LoggerFactory.getLogger(UploadProgressBar.class);
@@ -93,11 +93,11 @@
add(HeaderContributor.forCss(css));
}
- final WebMarkupContainer<Void> barDiv = new WebMarkupContainer<Void>("bar");
+ final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
barDiv.setOutputMarkupId(true);
add(barDiv);
- final WebMarkupContainer<Void> statusDiv = new WebMarkupContainer<Void>("status");
+ final WebMarkupContainer statusDiv = new WebMarkupContainer("status");
statusDiv.setOutputMarkupId(true);
add(statusDiv);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Fri Jun 20 01:11:40 2008
@@ -162,7 +162,7 @@
{
setVersioned(false);
cookieName = null;
- add(empty = new WebMarkupContainer<Void>(getContentId()));
+ add(empty = new WebMarkupContainer(getContentId()));
add(new CloseButtonBehavior());
add(new WindowClosedBehavior());
@@ -820,7 +820,7 @@
super.remove(component);
if (component.getId().equals(getContentId()))
{
- add(empty = new WebMarkupContainer<Void>(getContentId()));
+ add(empty = new WebMarkupContainer(getContentId()));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java Fri Jun 20 01:11:40 2008
@@ -33,7 +33,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public abstract class AjaxFallbackOrderByBorder extends Border<Void>
+public abstract class AjaxFallbackOrderByBorder extends Border
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Fri Jun 20 01:11:40 2008
@@ -115,7 +115,7 @@
while (it.hasNext())
{
// we need a container to represent a row in repeater
- WebMarkupContainer row = new WebMarkupContainer<Void>(newChildId());
+ WebMarkupContainer row = new WebMarkupContainer(newChildId());
row.setRenderBodyOnly(true);
add(row);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
* @author Igor Vaynberg ( ivaynberg )
*
*/
-public class OrderByBorder extends Border<Void>
+public class OrderByBorder extends Border
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
* @author Phil Kulak
* @author Igor Vaynberg (ivaynberg)
*/
-public class OrderByLink extends Link<Void>
+public class OrderByLink extends Link
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Fri Jun 20 01:11:40 2008
@@ -175,7 +175,7 @@
datagrid.setRowsPerPage(rowsPerPage);
add(datagrid);
- topToolbars = new RepeatingView<Void>("topToolbars")
+ topToolbars = new RepeatingView("topToolbars")
{
private static final long serialVersionUID = 1L;
@@ -187,7 +187,7 @@
};
- bottomToolbars = new RepeatingView<Void>("bottomToolbars")
+ bottomToolbars = new RepeatingView("bottomToolbars")
{
private static final long serialVersionUID = 1L;
@@ -323,7 +323,7 @@
toolbar.setRenderBodyOnly(true);
// create a container item for the toolbar (required by repeating view)
- WebMarkupContainer item = new WebMarkupContainer<Void>(container.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(container.newChildId());
item.setRenderBodyOnly(true);
item.add(toolbar);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class HeadersToolbar extends AbstractToolbar<Void>
+public class HeadersToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
@@ -48,13 +48,13 @@
super(table);
- RepeatingView<?> headers = new RepeatingView<Void>("headers");
+ RepeatingView<?> headers = new RepeatingView("headers");
add(headers);
final IColumn<?>[] columns = table.getColumns();
for (final IColumn<?> column : columns)
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(headers.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(headers.newChildId());
headers.add(item);
WebMarkupContainer header = null;
@@ -64,7 +64,7 @@
}
else
{
- header = new WebMarkupContainer<Void>("header");
+ header = new WebMarkupContainer("header");
}
if (column instanceof IStyledColumn)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Fri Jun 20 01:11:40 2008
@@ -29,7 +29,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class NavigationToolbar extends AbstractToolbar<Void>
+public class NavigationToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
super(table);
this.table = table;
- WebMarkupContainer span = new WebMarkupContainer<Void>("span");
+ WebMarkupContainer span = new WebMarkupContainer("span");
add(span);
span.add(new AttributeModifier("colspan", true, new Model<String>(
String.valueOf(table.getColumns().length))));
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Fri Jun 20 01:11:40 2008
@@ -34,7 +34,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class NoRecordsToolbar extends AbstractToolbar<Void>
+public class NoRecordsToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
@@ -61,7 +61,7 @@
public NoRecordsToolbar(final DataTable<?> table, IModel<String> messageModel)
{
super(table);
- WebMarkupContainer td = new WebMarkupContainer<Void>("td");
+ WebMarkupContainer td = new WebMarkupContainer("td");
add(td);
td.add(new AttributeModifier("colspan", true, new Model<String>(
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Fri Jun 20 01:11:40 2008
@@ -54,7 +54,7 @@
this.locator = locator;
// add hidden field used for managing current focus
- hidden = new HiddenField<Void>("focus-tracker", new Model());
+ hidden = new HiddenField("focus-tracker", new Model());
hidden.add(new AbstractBehavior()
{
@@ -70,7 +70,7 @@
add(hidden);
// add javascript to restore focus to a filter component
- add(new WebMarkupContainer<Void>("focus-restore")
+ add(new WebMarkupContainer("focus-restore")
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class FilterToolbar extends AbstractToolbar<Void>
+public class FilterToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
private static final String FILTER_COMPONENT_ID = "filter";
@@ -62,14 +62,14 @@
// populate the toolbar with components provided by filtered columns
- RepeatingView<?> filters = new RepeatingView<Void>("filters");
+ RepeatingView<?> filters = new RepeatingView("filters");
filters.setRenderBodyOnly(true);
add(filters);
IColumn<?>[] cols = table.getColumns();
for (int i = 0; i < cols.length; i++)
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(filters.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(filters.newChildId());
item.setRenderBodyOnly(true);
IColumn<?> col = cols[i];