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 [7/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/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java Fri Jun 20 01:11:40 2008
@@ -24,7 +24,7 @@
/**
*/
-public class Page2 extends WebPage<Void>
+public class Page2 extends WebPage
{
private static final Logger log = LoggerFactory.getLogger(Page2.class);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
*
* @author frankbille
*/
-public class BlockedResourceLinkPage extends WebPage<Void>
+public class BlockedResourceLinkPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java Fri Jun 20 01:11:40 2008
@@ -32,7 +32,7 @@
*
* @author Kare Nuorteva
*/
-public class MockAjaxFormPage extends WebPage<Void>
+public class MockAjaxFormPage extends WebPage
{
private static final class MockDomainObject implements Serializable
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
*
* @author frankbille
*/
-public class MockFormFileUploadPage extends WebPage<Void>
+public class MockFormFileUploadPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java Fri Jun 20 01:11:40 2008
@@ -31,7 +31,7 @@
*
* @author frankbille
*/
-public class MockFormPage extends WebPage<Void>
+public class MockFormPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Fri Jun 20 01:11:40 2008
@@ -26,7 +26,7 @@
*
* @author Frank Bille Jensen (frankbille)
*/
-public class MockPageParameterPage extends WebPage<Void>
+public class MockPageParameterPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -45,7 +45,7 @@
/**
* Mock Page for testing WebPages implements as inner pages.
*/
- public static final class MockInnerClassPage extends WebPage<Void>
+ public static final class MockInnerClassPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java Fri Jun 20 01:11:40 2008
@@ -32,7 +32,7 @@
*
* @author Frank Bille (billen)
*/
-public class MockPageWithFormAndAjaxFormSubmitBehavior extends WebPage<Void>
+public class MockPageWithFormAndAjaxFormSubmitBehavior extends WebPage
{
static final String EVENT_COMPONENT = "eventComponent";
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java Fri Jun 20 01:11:40 2008
@@ -35,7 +35,7 @@
*
* @author Frank Bille (billen)
*/
-public class MockPageWithFormAndCheckGroup extends WebPage<Void>
+public class MockPageWithFormAndCheckGroup extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
*/
public MockPageWithFormAndCheckGroup()
{
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form("form");
add(form);
@@ -57,7 +57,7 @@
checkGroup.add(new Check<Integer>("check1", new Model<Integer>(1)));
checkGroup.add(new Check<Integer>("check2", new Model<Integer>(2)));
- add(new AjaxSubmitLink<Void>("submitLink", form)
+ add(new AjaxSubmitLink("submitLink", form)
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java Fri Jun 20 01:11:40 2008
@@ -21,7 +21,7 @@
/**
* Mock page containing a link with a label inside
*/
-public class MockPageWithLinkAndLabel extends WebPage<Void>
+public class MockPageWithLinkAndLabel extends WebPage
{
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
*
* @author frankbille
*/
-public class MockResourceLinkPage extends WebPage<Void>
+public class MockResourceLinkPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Fri Jun 20 01:11:40 2008
@@ -295,7 +295,7 @@
public void testAssertComponentOnAjaxResponse()
{
final Page page = new MockPageWithLink();
- AjaxLink<?> ajaxLink = new AjaxLink<Void>(MockPageWithLink.LINK_ID)
+ AjaxLink ajaxLink = new AjaxLink(MockPageWithLink.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -303,7 +303,7 @@
public void onClick(AjaxRequestTarget target)
{
// Replace the link with a normal Link
- Link<?> link = new Link<Void>(MockPageWithLink.LINK_ID)
+ Link link = new Link(MockPageWithLink.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -379,7 +379,7 @@
label.setOutputMarkupId(true);
final Page page = new MockPageWithLinkAndLabel();
- AjaxLink<?> ajaxLink = new AjaxLink<Void>(MockPageWithLinkAndLabel.LINK_ID)
+ AjaxLink ajaxLink = new AjaxLink(MockPageWithLinkAndLabel.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -575,7 +575,7 @@
public void testToggleAjaxFormButton()
{
tester.startPage(new MockAjaxFormPage());
- Button<?> submit = getSubmitButton();
+ Button submit = getSubmitButton();
assertFalse(submit.isEnabled());
FormTester form = tester.newFormTester("form");
@@ -596,13 +596,13 @@
private void setTextFieldAndAssertSubmit(boolean expected)
{
tester.executeAjaxEvent("form:text", "onkeyup");
- Button<?> submit = getSubmitButton();
+ Button submit = getSubmitButton();
// System.out.println(Session.get().getFeedbackMessages());
assertEquals(expected, submit.isEnabled());
}
- private Button<?> getSubmitButton()
+ private Button getSubmitButton()
{
- return (Button<?>)tester.getComponentFromLastRenderedPage("form:submit");
+ return (Button)tester.getComponentFromLastRenderedPage("form:submit");
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Juergen Donnerstag
*/
-public class CreateBook extends WebPage<Void>
+public class CreateBook extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/SuccessPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/SuccessPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/SuccessPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/SuccessPage.java Fri Jun 20 01:11:40 2008
@@ -22,7 +22,7 @@
*
* @author Juergen Donnerstag
*/
-public class SuccessPage extends WebPage<Void>
+public class SuccessPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/ViewBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/ViewBook.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/ViewBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/ViewBook.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
*
* @author Juergen Donnerstag
*/
-public class ViewBook extends WebPage<Void>
+public class ViewBook extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/LoginPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/LoginPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/LoginPage.java Fri Jun 20 01:11:40 2008
@@ -22,7 +22,7 @@
*
* @author Juergen Donnerstag
*/
-public class LoginPage extends WebPage<Void>
+public class LoginPage extends WebPage
{
private static final long serialVersionUID = 1L;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/RedirectPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/RedirectPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/RedirectPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/RedirectPage.java Fri Jun 20 01:11:40 2008
@@ -22,7 +22,7 @@
*
* @author Juergen Donnerstag
*/
-public class RedirectPage extends WebPage<Void>
+public class RedirectPage extends WebPage
{
private static final long serialVersionUID = 1L;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java Fri Jun 20 01:11:40 2008
@@ -44,7 +44,7 @@
/**
* @author Ingram Chen
*/
-public class ChoicePage extends WebPage<Void>
+public class ChoicePage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -128,7 +128,7 @@
form.add(new CheckBoxMultipleChoice<Book>("checkBoxMultipleChoice", candidateChoices,
bookChoiceRenderer));
form.add(newCheckGroup("checkGroup", candidateChoices));
- form.add(new Button<Void>("anotherButton")
+ form.add(new Button("anotherButton")
{
private static final long serialVersionUID = 1L;
@@ -151,7 +151,7 @@
@Override
protected void populateItem(ListItem<S> item)
{
- item.add(new Check<S>("check", new Model<S>(item.getDefaultModelObject())));
+ item.add(new Check<S>("check", new Model<S>(item.getModelObject())));
}
};
@@ -169,7 +169,7 @@
@Override
protected void populateItem(ListItem<Book> item)
{
- item.add(new Radio<Book>("radio", new Model<Book>(item.getDefaultModelObject())));
+ item.add(new Radio<Book>("radio", new Model<Book>(item.getModelObject())));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java Fri Jun 20 01:11:40 2008
@@ -25,7 +25,7 @@
/**
* @author Juergen Donnerstag
*/
-public class EmailPage extends WebPage<Void>
+public class EmailPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java Fri Jun 20 01:11:40 2008
@@ -62,7 +62,7 @@
public void testBasicAjaxLinkClick()
{
// Create a link, which we test is actually invoked
- final AjaxLink<?> ajaxLink = new AjaxLink<Void>("ajaxLink")
+ final AjaxLink ajaxLink = new AjaxLink("ajaxLink")
{
private static final long serialVersionUID = 1L;
@@ -107,7 +107,7 @@
final Page page = new MockPageWithLink();
// Create a link, which we test is actually invoked
- page.add(new AjaxFallbackLink<Void>("ajaxLink")
+ page.add(new AjaxFallbackLink("ajaxLink")
{
private static final long serialVersionUID = 1L;
@@ -147,7 +147,7 @@
final Page page = new MockPageWithLink();
// Create a link, which we test is actually invoked
- page.add(new AjaxFallbackLink<Void>("ajaxLink")
+ page.add(new AjaxFallbackLink("ajaxLink")
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java Fri Jun 20 01:11:40 2008
@@ -61,7 +61,7 @@
mockPojo.setName("Mock name");
final MockPageWithFormAndContainedLink page = new MockPageWithFormAndContainedLink(mockPojo);
- page.addLink(new AjaxSubmitLink<Void>("link")
+ page.addLink(new AjaxSubmitLink("link")
{
private static final long serialVersionUID = 1L;
@@ -107,7 +107,7 @@
mockPojo.setName("Mock name");
final MockPageWithFormAndLink page = new MockPageWithFormAndLink(mockPojo);
- AjaxSubmitLink<?> link = new AjaxSubmitLink<Void>("link", page.getForm())
+ AjaxSubmitLink link = new AjaxSubmitLink("link", page.getForm())
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java Fri Jun 20 01:11:40 2008
@@ -19,8 +19,8 @@
import org.apache.wicket.markup.html.link.AbstractLink;
/**
- * Contains a form with a textfield on it and a link inside the form. Use the {@link
- * #addLink(AbstractLink)} method to add a link to the form.
+ * Contains a form with a textfield on it and a link inside the form. Use the
+ * {@link #addLink(AbstractLink)} method to add a link to the form.
*
* @author Gerolf Seitz
*/
@@ -42,7 +42,7 @@
/**
* @param link
*/
- public void addLink(AbstractLink<?> link)
+ public void addLink(AbstractLink link)
{
getForm().add(link);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java Fri Jun 20 01:11:40 2008
@@ -27,7 +27,7 @@
*
* @author Frank Bille
*/
-public class MockPageWithFormAndLink extends WebPage<Void>
+public class MockPageWithFormAndLink extends WebPage
{
/**
* @author Frank Bille
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithLink.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithLink.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
*
* @author Frank Bille
*/
-public class MockPageWithLink extends WebPage<Void>
+public class MockPageWithLink extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java Fri Jun 20 01:11:40 2008
@@ -30,7 +30,7 @@
*
* Add more links when needed.
*/
-public class LinkPage extends WebPage<Void>
+public class LinkPage extends WebPage
{
/**
* Construct.
@@ -38,7 +38,7 @@
public LinkPage()
{
// Link
- add(new Link<Void>("linkWithSetResponsePageClass")
+ add(new Link("linkWithSetResponsePageClass")
{
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@
}
});
- add(new Link<Void>("linkWithSetResponsePage")
+ add(new Link("linkWithSetResponsePage")
{
private static final long serialVersionUID = 1L;
@@ -61,7 +61,7 @@
});
// AjaxLink
- add(new AjaxLink<Void>("ajaxLinkWithSetResponsePageClass")
+ add(new AjaxLink("ajaxLinkWithSetResponsePageClass")
{
private static final long serialVersionUID = 1L;
@@ -72,7 +72,7 @@
}
});
- add(new AjaxLink<Void>("ajaxLinkWithSetResponsePage")
+ add(new AjaxLink("ajaxLinkWithSetResponsePage")
{
private static final long serialVersionUID = 1L;
@@ -84,7 +84,7 @@
});
// AjaxFallbackLink
- add(new AjaxFallbackLink<Void>("ajaxFallbackLinkWithSetResponsePageClass")
+ add(new AjaxFallbackLink("ajaxFallbackLinkWithSetResponsePageClass")
{
private static final long serialVersionUID = 1L;
@@ -95,7 +95,7 @@
}
});
- add(new AjaxFallbackLink<Void>("ajaxFallbackLinkWithSetResponsePage")
+ add(new AjaxFallbackLink("ajaxFallbackLinkWithSetResponsePage")
{
private static final long serialVersionUID = 1L;
@@ -107,9 +107,9 @@
});
// AjaxSubmitLink
- final Form<Void> form = new Form<Void>("form");
+ final Form form = new Form("form");
add(form);
- final AjaxSubmitLink<Void> submit = new AjaxSubmitLink<Void>("submit")
+ final AjaxSubmitLink submit = new AjaxSubmitLink("submit")
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java?rev=669816&r1=669815&r2=669816&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java Fri Jun 20 01:11:40 2008
@@ -23,7 +23,7 @@
/**
* Result page
*/
-public class ResultPage extends WebPage<String>
+public class ResultPage extends WebPage
{
/**
* Construct.
@@ -42,6 +42,6 @@
{
super(new Model<String>(label));
- add(new Label<String>("label", getDefaultModel()));
+ add(new Label<String>("label", (Model<String>)getDefaultModel()));
}
}