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/29 07:51:39 UTC
svn commit: r672603 [17/18] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/main/java/org/apache/w...
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_2.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class Page_2 extends WebPage<Void>
+public class Page_2 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/Page_3.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class Page_3 extends WebPage<Void>
+public class Page_3 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author pz65n8
*/
-public abstract class AbstractTest14WebPage extends WebPage<Void>
+public abstract class AbstractTest14WebPage extends WebPage
{
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
* @author jcompagner
*
*/
-public class DoubleHeaderPartPage extends WebPage<Void>
+public class DoubleHeaderPartPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class HeaderSectionBasePage_12 extends WebPage<Void>
+public class HeaderSectionBasePage_12 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java Sat Jun 28 22:50:41 2008
@@ -49,7 +49,7 @@
*/
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
- replaceComponentTagBody(markupStream, openTag, getModelObjectAsString());
+ replaceComponentTagBody(markupStream, openTag, getDefaultModelObjectAsString());
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_1 extends WebPage<Void>
+public class HeaderSectionPage_1 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_10 extends WebPage<Void>
+public class HeaderSectionPage_10 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_11 extends WebPage<Void>
+public class HeaderSectionPage_11 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_13 extends WebPage<Void>
+public class HeaderSectionPage_13 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_15 extends WebPage<Void>
+public class HeaderSectionPage_15 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_16 extends WebPage<Void>
+public class HeaderSectionPage_16 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_17 extends WebPage<Void>
+public class HeaderSectionPage_17 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_18 extends WebPage<Void>
+public class HeaderSectionPage_18 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_19 extends WebPage<Void>
+public class HeaderSectionPage_19 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_2 extends WebPage<Void>
+public class HeaderSectionPage_2 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_3 extends WebPage<Void>
+public class HeaderSectionPage_3 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_4 extends WebPage<Void>
+public class HeaderSectionPage_4 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_5 extends WebPage<Void>
+public class HeaderSectionPage_5 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_6.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_6.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_6.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_6.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_6 extends WebPage<Void>
+public class HeaderSectionPage_6 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_7.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_7.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_7.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_7.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_7 extends WebPage<Void>
+public class HeaderSectionPage_7 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_8 extends WebPage<Void>
+public class HeaderSectionPage_8 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_9 extends WebPage<Void>
+public class HeaderSectionPage_9 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Chris Turner
*/
-public class HeaderSectionPage_9a extends WebPage<Void>
+public class HeaderSectionPage_9a extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_1.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class SimplePage_1 extends WebPage<Void>
+public class SimplePage_1 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Chris Turner
*/
-public class SimplePage_2 extends WebPage<Void>
+public class SimplePage_2 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Chris Turner
*/
-public class SimplePage_3 extends WebPage<Void>
+public class SimplePage_3 extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@
{
ValueMap modelData = new ValueMap();
modelData.put("testData", "123456");
- setModel(new Model(modelData));
+ setDefaultModel(new Model(modelData));
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_4.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_4.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_4.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class SimplePage_4 extends WebPage<Void>
+public class SimplePage_4 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java Sat Jun 28 22:50:41 2008
@@ -40,12 +40,12 @@
InheritedTestPage page = new InheritedTestPage();
tester.setupRequestAndResponse();
- page.setModel(new CompoundPropertyModel(data1));
+ page.setDefaultModel(new CompoundPropertyModel(data1));
tester.startPage(page);
tester.assertLabel("label", "foo");
tester.setupRequestAndResponse();
- page.setModel(new CompoundPropertyModel(data2));
+ page.setDefaultModel(new CompoundPropertyModel(data2));
tester.startPage(page);
tester.assertLabel("label", "bar");
}
@@ -65,13 +65,13 @@
Label label = new Label("label");
parent.add(label);
- parent.setModel(new CompoundPropertyModel(data1));
- assertEquals("foo", label.getModelObject());
+ parent.setDefaultModel(new CompoundPropertyModel(data1));
+ assertEquals("foo", label.getDefaultModelObject());
- parent.setModel(new CompoundPropertyModel(data2));
- assertEquals("bar", label.getModelObject());
+ parent.setDefaultModel(new CompoundPropertyModel(data2));
+ assertEquals("bar", label.getDefaultModelObject());
data2.put("label", "foo");
- assertEquals("foo", label.getModelObject());
+ assertEquals("foo", label.getDefaultModelObject());
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
/**
* Testpage for inherited models. TestCases should set the model on the page.
*/
-public class InheritedTestPage extends WebPage<Void>
+public class InheritedTestPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java Sat Jun 28 22:50:41 2008
@@ -65,7 +65,7 @@
public void testAbstractPropertyModelDetach()
{
Detachable detachable = new Detachable();
- IModel<?> model = new AbstractPropertyModel<Void>(detachable)
+ IModel<?> model = new AbstractPropertyModel(detachable)
{
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
public void testPropertyModelDetach()
{
Detachable detachable = new Detachable();
- IModel<?> model = new PropertyModel<Void>(detachable, "foo");
+ IModel<?> model = new PropertyModel(detachable, "foo");
model.detach();
assertTrue(detachable.detached);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Sat Jun 28 22:50:41 2008
@@ -118,7 +118,7 @@
innerPOJO + "]:bindings=[]";
assertEquals(expected, pojoProperty.toString());
- Component<?> component1 = pojoProperty.bind(new Label<Object>("label"));
+ Component component1 = pojoProperty.bind(new Label("label"));
expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" +
innerPOJO + "]:bindings=[Binding(:component=[" + component1 + "]:expression=[label])]";
assertEquals(expected, pojoProperty.toString());
@@ -195,7 +195,7 @@
*/
public void testPropertyModel()
{
- PropertyModel<Void> emptyModel = new PropertyModel<Void>("", null);
+ PropertyModel emptyModel = new PropertyModel("", null);
String expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[]:expression=[null]";
assertEquals(expected, emptyModel.toString());
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java Sat Jun 28 22:50:41 2008
@@ -1,69 +1,69 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.model;
-
-import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-
-/**
- * Tests {@link ResourceModel}.
- */
-public class ResourceModelTest extends WicketTestCase
-{
- /**
- * Test page.
- */
- public static class TestPage extends WebPage<Void> {
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- */
- public TestPage()
- {
- add(new Label("testlabel", new ResourceModel("test.label")));
- }
- }
-
- /**
- * Construct.
- */
- public ResourceModelTest()
- {
- }
-
- /**
- * Construct.
- *
- * @param name
- */
- public ResourceModelTest(String name)
- {
- super(name);
- }
-
- /**
- * Tests a simple {@link ResourceModel} on a test page.
- *
- * @throws Exception
- */
- public void testResourceModel() throws Exception
- {
- executeTest(TestPage.class, "ResourceModelTest$TestPage_expected.html");
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.model;
+
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+
+/**
+ * Tests {@link ResourceModel}.
+ */
+public class ResourceModelTest extends WicketTestCase
+{
+ /**
+ * Test page.
+ */
+ public static class TestPage extends WebPage {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public TestPage()
+ {
+ add(new Label("testlabel", new ResourceModel("test.label")));
+ }
+ }
+
+ /**
+ * Construct.
+ */
+ public ResourceModelTest()
+ {
+ }
+
+ /**
+ * Construct.
+ *
+ * @param name
+ */
+ public ResourceModelTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Tests a simple {@link ResourceModel} on a test page.
+ *
+ * @throws Exception
+ */
+ public void testResourceModel() throws Exception
+ {
+ executeTest(TestPage.class, "ResourceModelTest$TestPage_expected.html");
+ }
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Sat Jun 28 22:50:41 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Sat Jun 28 22:50:41 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Juergen Donnerstag
*/
-public class TestPage extends WebPage<Void>
+public class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
import org.apache.wicket.markup.html.link.IPageLink;
import org.apache.wicket.markup.html.link.PageLink;
-public class FirstPage extends WebPage<Void>
+public class FirstPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Chris Turner
*/
-public class MockPage extends WebPage<Void>
+public class MockPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
import org.apache.wicket.markup.html.link.IPageLink;
import org.apache.wicket.markup.html.link.PageLink;
-public class SecondPage extends WebPage<Void>
+public class SecondPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
* Tests that an error page is displayed on runtime errors during ajax requests.
*/
-public class TestErrorPage extends WebPage<Void>
+public class TestErrorPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@
public TestErrorPage()
{
- add(new AjaxLink<Void>("link")
+ add(new AjaxLink("link")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
* Test page for session expiry (/ page not found).
*/
-public class TestExpirePage extends WebPage<Void>
+public class TestExpirePage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -33,7 +33,7 @@
public TestExpirePage()
{
- add(new AjaxLink<Void>("link")
+ add(new AjaxLink("link")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java Sat Jun 28 22:50:41 2008
@@ -58,7 +58,7 @@
public void testExpirePage()
{
tester.startPage(TestExpirePage.class);
- AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link");
+ AjaxLink link = (AjaxLink)tester.getComponentFromLastRenderedPage("link");
// Cannot use executeAjaxEvent or onClick because WicketTester creates
// an AjaxRequestTarget from scratch
@@ -97,7 +97,7 @@
public void testInternalErrorPage()
{
tester.startPage(TestErrorPage.class);
- AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link");
+ AjaxLink link = (AjaxLink)tester.getComponentFromLastRenderedPage("link");
// Cannot use executeAjaxEvent or onClick because WicketTester creates
// an AjaxRequestTarget from scratch
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Chris Turner
*/
-public class WicketPanelPage extends WebPage<Void>
+public class WicketPanelPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
/**
* @author Juergen Donnerstag
*/
-public class MyPage extends WebPage<Void>
+public class MyPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java Sat Jun 28 22:50:41 2008
@@ -18,7 +18,7 @@
import org.apache.wicket.markup.html.WebPage;
-public class LoginPage extends WebPage<Void>
+public class LoginPage extends WebPage
{
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
/**
* The page that is protected and needs to redirect to the login page.
*/
-public class ProtectedPage extends WebPage<Void>
+public class ProtectedPage extends WebPage
{
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Sat Jun 28 22:50:41 2008
@@ -32,7 +32,7 @@
*
* @author Peter Ertl
*/
-public class AbortExceptionPage extends WebPage<Object>
+public class AbortExceptionPage extends WebPage
{
private static final long serialVersionUID = -5906071716129043859L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/HomePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/HomePage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author marrink
*/
-public class HomePage extends WebPage<Void>
+public class HomePage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -34,7 +34,7 @@
*/
public HomePage()
{
- add(new Label<String>("label", "Home"));
+ add(new Label("label", "Home"));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author marrink
*/
-public class InterceptPage extends WebPage<Void>
+public class InterceptPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@
*/
public InterceptPage()
{
- add(new Link<Void>("link")
+ add(new Link("link")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Sat Jun 28 22:50:41 2008
@@ -50,12 +50,12 @@
private boolean block = true;
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (block &&
@@ -71,7 +71,7 @@
}
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/TargetPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/TargetPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/TargetPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/TargetPage.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author marrink
*/
-public class TargetPage extends WebPage<Void>
+public class TargetPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@
*/
public TargetPage()
{
- add(new Label<String>("label", "Target"));
+ add(new Label("label", "Target"));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java Sat Jun 28 22:50:41 2008
@@ -36,7 +36,7 @@
/**
*
*/
- public static class TestPage extends WebPage<Void>
+ public static class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -47,7 +47,7 @@
*/
public TestPage(PageParameters pars)
{
- add(new AjaxLink<Void>("ajax")
+ add(new AjaxLink("ajax")
{
private static final long serialVersionUID = 1L;
@@ -58,7 +58,7 @@
target.addComponent(this);
}
}.setOutputMarkupId(true));
- add(new Link<Void>("link")
+ add(new Link("link")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
*
* @author erik.van.oosten
*/
- public static class TestPage extends WebPage<Void>
+ public static class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
// EMPTY
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java Sat Jun 28 22:50:41 2008
@@ -32,7 +32,7 @@
*
* @author Eelco Hillenius
*/
-public class StatefulPage extends WebPage<Void>
+public class StatefulPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -70,7 +70,7 @@
*/
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject() + ", link click count: " +
+ info("Submitted text: " + field.getDefaultModelObject() + ", link click count: " +
linkClickCount);
}
};
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java Sat Jun 28 22:50:41 2008
@@ -29,7 +29,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage extends WebPage<Void>
+public class StatelessPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -52,7 +52,7 @@
*/
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Simple dummy page.
*/
-public class TestPage extends WebPage<Void>
+public class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java Sat Jun 28 22:50:41 2008
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.target.coding;
-
-import org.apache.wicket.IResourceListener;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WebPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestPageWithIFrame extends WebPage<Void>{
- private static final long serialVersionUID = 1L;
-
- private static final Logger log = LoggerFactory.getLogger(TestPageWithIFrame.class);
-
- static class TestFrame extends WebMarkupContainer implements IResourceListener
- {
- private static final long serialVersionUID = 1L;
-
- public TestFrame(String id)
- {
- super(id);
- }
-
- protected void onComponentTag(ComponentTag tag)
- {
- checkComponentTag(tag, "iframe");
- super.onComponentTag(tag);
- tag.put("src", urlFor(IResourceListener.INTERFACE));
- }
-
- public void onResourceRequested()
- {
- log.info("foobar - do nada nothing njet");
- }
- }
-
- public TestPageWithIFrame(PageParameters params)
- {
- TestFrame frame = new TestFrame("frame");
- add(frame);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.request.target.coding;
+
+import org.apache.wicket.IResourceListener;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestPageWithIFrame extends WebPage{
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger log = LoggerFactory.getLogger(TestPageWithIFrame.class);
+
+ static class TestFrame extends WebMarkupContainer implements IResourceListener
+ {
+ private static final long serialVersionUID = 1L;
+
+ public TestFrame(String id)
+ {
+ super(id);
+ }
+
+ protected void onComponentTag(ComponentTag tag)
+ {
+ checkComponentTag(tag, "iframe");
+ super.onComponentTag(tag);
+ tag.put("src", urlFor(IResourceListener.INTERFACE));
+ }
+
+ public void onResourceRequested()
+ {
+ log.info("foobar - do nada nothing njet");
+ }
+ }
+
+ public TestPageWithIFrame(PageParameters params)
+ {
+ TestFrame frame = new TestFrame("frame");
+ add(frame);
+ }
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
public class DummyApplication extends WebApplication
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Chris Turner
*/
-public class DummyPage extends WebPage<Void>
+public class DummyPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
* Mock page for testing.
*
*/
-public class XmlPage extends WebPage<Void>
+public class XmlPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/pages/Test1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/pages/Test1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/pages/Test1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/pages/Test1.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
/**
*
*/
-public class Test1 extends WebPage<Void>
+public class Test1 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/response/BrokenPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/response/BrokenPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/response/BrokenPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/response/BrokenPage.java Sat Jun 28 22:50:41 2008
@@ -18,7 +18,7 @@
import org.apache.wicket.markup.html.WebPage;
-public class BrokenPage extends WebPage<Void>
+public class BrokenPage extends WebPage
{
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java Sat Jun 28 22:50:41 2008
@@ -34,7 +34,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage1 extends Page<Void>
+ public static class AbortAndRespondPage1 extends Page
{
private static final long serialVersionUID = 1L;
@@ -58,7 +58,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage2 extends Page<Void>
+ public static class AbortAndRespondPage2 extends Page
{
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage3 extends Page<Void>
+ public static class AbortAndRespondPage3 extends Page
{
private static final long serialVersionUID = 1L;
@@ -125,7 +125,7 @@
}
- public static class PageThrowingCheckedException extends Page<Void>
+ public static class PageThrowingCheckedException extends Page
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
* @author jcompagner
*/
-public class StatelessComponentPage extends WebPage<Void>
+public class StatelessComponentPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
/**
* @author jcompagner
*/
-public class StatelessComponentPageWithParams extends WebPage<Void>
+public class StatelessComponentPageWithParams extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java Sat Jun 28 22:50:41 2008
@@ -41,8 +41,8 @@
private WebApplication application;
- private Class<? extends Page<?>> homePage = HomePage.class;
- private Class<? extends Page<?>> loginPage = LoginPage.class;
+ private Class<? extends Page> homePage = HomePage.class;
+ private Class<? extends Page> loginPage = LoginPage.class;
@Override
@@ -51,7 +51,7 @@
mock = new WicketTester(application = new WebApplication()
{
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return StatelessFormTest.this.getHomePage();
}
@@ -88,7 +88,7 @@
/**
* @return Returns the homePage.
*/
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
@@ -98,7 +98,7 @@
* @param homePage
* The homePage to set.
*/
- public <C extends Page<?>> void setHomePage(Class<C> homePage)
+ public <C extends Page> void setHomePage(Class<C> homePage)
{
this.homePage = homePage;
}
@@ -106,7 +106,7 @@
/**
* @return Returns the loginPage.
*/
- public Class<? extends Page<?>> getLoginPage()
+ public Class<? extends Page> getLoginPage()
{
return loginPage;
}
@@ -116,7 +116,7 @@
* @param loginPage
* The loginPage to set.
*/
- public <C extends Page<?>> void setLoginPage(Class<C> loginPage)
+ public <C extends Page> void setLoginPage(Class<C> loginPage)
{
this.loginPage = loginPage;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Sat Jun 28 22:50:41 2008
@@ -46,7 +46,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
* @author marrink
*
*/
-public class HomePage extends WebPage<Void>
+public class HomePage extends WebPage
{
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
*
* @author marrink
*/
-public class LoginPage extends WebPage<Void>
+public class LoginPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java Sat Jun 28 22:50:41 2008
@@ -40,7 +40,7 @@
* @param <T>
* The model object type
*/
-public class UsernamePasswordSignInPanel<T> extends Panel<T>
+public class UsernamePasswordSignInPanel extends Panel
{
/** */
private static final long serialVersionUID = 1L;
@@ -58,7 +58,7 @@
super(id);
add(new FeedbackPanel("feedback"));
- add(new Label<Object>("naam"));
+ add(new Label("naam"));
add(new SignInForm("signInForm", this));
}
@@ -84,7 +84,7 @@
/** Moeten de inlog waarden bewaard blijven? */
private boolean rememberMe = true;
- private final UsernamePasswordSignInPanel<?> panel;
+ private final UsernamePasswordSignInPanel panel;
/**
* Constructor.
@@ -93,7 +93,7 @@
* id of the form component
* @param panel
*/
- public SignInForm(final String id, UsernamePasswordSignInPanel<?> panel)
+ public SignInForm(final String id, UsernamePasswordSignInPanel panel)
{
super(id, new CompoundPropertyModel<IValueMap>(new ValueMap()));
this.panel = panel;
@@ -102,8 +102,7 @@
add(new TextField<String>("username").setPersistent(rememberMe));
add(new PasswordTextField("password"));
// MarkupContainer row for remember me checkbox
- WebMarkupContainer<Boolean> rememberMeRow = new WebMarkupContainer<Boolean>(
- "rememberMeRow");
+ WebMarkupContainer rememberMeRow = new WebMarkupContainer("rememberMeRow");
add(rememberMeRow);
// Add rememberMe checkbox
@@ -123,7 +122,7 @@
getPage().removePersistedFormData(SignInForm.class, true);
}
- ValueMap values = (ValueMap)getModelObject();
+ ValueMap values = (ValueMap)getDefaultModelObject();
String username = values.getString("username");
String password = values.getString("password");
@@ -161,7 +160,7 @@
public void setRememberMe(boolean rememberMe)
{
this.rememberMe = rememberMe;
- ((FormComponent<?>)get("username")).setPersistent(rememberMe);
+ ((FormComponent)get("username")).setPersistent(rememberMe);
}
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author jcompagner
*/
-public class PageA extends WebPage<Void>
+public class PageA extends WebPage
{
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author jcompagner
*/
-public class PageB extends WebPage<Void>
+public class PageB extends WebPage
{
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Sat Jun 28 22:50:41 2008
@@ -81,7 +81,7 @@
WebApplication app = new WebApplication()
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Sat Jun 28 22:50:41 2008
@@ -59,7 +59,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.java Sat Jun 28 22:50:41 2008
@@ -20,7 +20,7 @@
/**
*/
-public class Page1 extends WebPage<Void>
+public class Page1 extends WebPage
{
private static final long serialVersionUID = 1L;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java Sat Jun 28 22:50:41 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/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithLinkAndLabel.java Sat Jun 28 22:50:41 2008
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.tester;
-
-import org.apache.wicket.markup.html.WebPage;
-
-/**
- * Mock page containing a link with a label inside
- */
-public class MockPageWithLinkAndLabel extends WebPage<Void>
-{
-
- /**
- * Link wicket id
- */
- public static final String LINK_ID = "link";
-
- /**
- * Label wicket id
- */
- public static final String LABEL_ID = "label";
-
- /**
- * Label component path
- */
- public static final String LABEL_PATH = "link:label";
-
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.tester;
+
+import org.apache.wicket.markup.html.WebPage;
+
+/**
+ * Mock page containing a link with a label inside
+ */
+public class MockPageWithLinkAndLabel extends WebPage
+{
+
+ /**
+ * Link wicket id
+ */
+ public static final String LINK_ID = "link";
+
+ /**
+ * Label wicket id
+ */
+ public static final String LABEL_ID = "label";
+
+ /**
+ * Label component path
+ */
+ public static final String LABEL_PATH = "link:label";
+
+
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author frankbille
*/
-public class MockResourceLinkPage extends WebPage<Void>
+public class MockResourceLinkPage extends WebPage
{
private static final long serialVersionUID = 1L;