Author: jcompagner
Date: Thu Apr 10 06:32:43 2008
New Revision: 646796
URL: http://svn.apache.org/viewvc?rev=646796&view=rev
Log:
generics WICKET-1409
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
Thu Apr 10 06:32:43 2008
@@ -433,7 +433,7 @@
*
* @return Home page class for this application
*/
- public abstract Class getHomePage();
+ public abstract Class<? extends Page> getHomePage();
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java Thu
Apr 10 06:32:43 2008
@@ -513,7 +513,7 @@
/**
* @see org.apache.wicket.session.pagemap.IPageMapEntry#getPageClass()
*/
- public final Class getPageClass()
+ public final Class<? extends Page> getPageClass()
{
return getClass();
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
Thu Apr 10 06:32:43 2008
@@ -411,7 +411,7 @@
*
* @return the page class or null
*/
- public final Class getResponsePageClass()
+ public final Class<? extends Page> getResponsePageClass()
{
IRequestTarget target = getRequestTarget();
if (target != null && (target instanceof
IBookmarkablePageRequestTarget))
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
Thu Apr 10 06:32:43 2008
@@ -128,7 +128,7 @@
*
* @return Page class
*/
- public final Class getPageClass()
+ public final Class<? extends Page> getPageClass()
{
return Classes.resolveClass(pageClassName);
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Thu Apr 10 06:32:43 2008
@@ -1175,7 +1175,7 @@
final String pageMapName = pageMap.isDefault() ? "" :
pageMap.getName();
if (component instanceof BookmarkablePageLink)
{
- final Class clazz =
((BookmarkablePageLink)component).getPageClass();
+ final Class<? extends Page> clazz =
((BookmarkablePageLink)component).getPageClass();
parameters.put(WebRequestCodingStrategy.BOOKMARKABLE_PAGE_PARAMETER_NAME,
pageMapName +
':' + clazz.getName());
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
Thu Apr 10 06:32:43 2008
@@ -476,7 +476,7 @@
// create a new request cycle for the
newPage call
createRequestCycle();
IBookmarkablePageRequestTarget
pageClassRequestTarget = (IBookmarkablePageRequestTarget)target;
- Class pageClass =
pageClassRequestTarget.getPageClass();
+ Class<? extends Page> pageClass =
pageClassRequestTarget.getPageClass();
PageParameters parameters =
pageClassRequestTarget.getPageParameters();
if (parameters == null ||
parameters.size() == 0)
{
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
Thu Apr 10 06:32:43 2008
@@ -716,7 +716,7 @@
final AppendingStringBuffer url = new AppendingStringBuffer(64);
// Get page Class
- final Class pageClass = requestTarget.getPageClass();
+ final Class<? extends Page> pageClass =
requestTarget.getPageClass();
final Application application = Application.get();
// Find pagemap name
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
Thu Apr 10 06:32:43 2008
@@ -317,7 +317,7 @@
try
{
// Get the home page class
- Class homePageClass = application.getHomePage();
+ Class<? extends Page> homePageClass =
application.getHomePage();
PageParameters parameters = new
PageParameters(requestParameters.getParameters());
// and create a dummy target for looking up whether the
home page is
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
Thu Apr 10 06:32:43 2008
@@ -168,9 +168,9 @@
/**
* @see
org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget#getPageClass()
*/
- public final Class getPageClass()
+ public final Class<? extends Page> getPageClass()
{
- return (Class)pageClassRef.get();
+ return (Class<? extends Page>)pageClassRef.get();
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
Thu Apr 10 06:32:43 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.request.target.component;
import org.apache.wicket.IRequestTarget;
+import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.request.target.IEventProcessor;
@@ -33,7 +34,7 @@
*
* @return the page class
*/
- Class getPageClass();
+ Class<? extends Page> getPageClass();
/**
* Gets the optional page parameters.
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
Thu Apr 10 06:32:43 2008
@@ -52,7 +52,7 @@
*
* @see org.apache.wicket.session.pagemap.IPageMapEntry#getPageClass()
*/
- public Class getPageClass()
+ public Class<? extends Page> getPageClass()
{
return getPage().getClass();
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
Thu Apr 10 06:32:43 2008
@@ -45,7 +45,7 @@
* @return The class of page stored in this page map entry (which can
be used by an eviction
* strategy to prioritize evictions)
*/
- Class getPageClass();
+ Class<? extends Page> getPageClass();
/**
* @param id
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Thu Apr 10 06:32:43 2008
@@ -116,7 +116,7 @@
*/
public static class DummyWebApplication extends WebApplication
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -156,7 +156,7 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
Thu Apr 10 06:32:43 2008
@@ -160,7 +160,7 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -256,7 +256,7 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
Thu Apr 10 06:32:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.form.imagebutton;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
/**
@@ -35,7 +36,7 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
Thu Apr 10 06:32:43 2008
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.apache.wicket.Component;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -161,7 +162,7 @@
{
private static final long serialVersionUID = 1L;
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return MockHomePage.class;
}
@@ -175,7 +176,7 @@
*
* @return Class
*/
- public Class getLoginPage()
+ public Class<? extends Page> getLoginPage()
{
return MockLoginPage.class;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
Thu Apr 10 06:32:43 2008
@@ -18,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
@@ -72,7 +73,7 @@
return new
WebSession(request).setStyle("myStyle");
}
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return ConcretePage2.class;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
Thu Apr 10 06:32:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.image;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
/**
@@ -35,7 +36,7 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
Thu Apr 10 06:32:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.properties;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.session.ISessionStore;
@@ -28,7 +29,7 @@
{
private static final long serialVersionUID = 1L;
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
Thu Apr 10 06:32:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.properties;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.session.ISessionStore;
@@ -28,7 +29,7 @@
{
private static final long serialVersionUID = 1L;
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
Thu Apr 10 06:32:43 2008
@@ -18,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebResponse;
@@ -31,7 +32,7 @@
*/
public class DummyApplication extends WebApplication
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
Thu Apr 10 06:32:43 2008
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.session.ISessionStore;
@@ -40,15 +41,15 @@
private WebApplication application;
- private Class homePage = HomePage.class;
- private Class loginPage = LoginPage.class;
+ private Class<? extends Page> homePage = HomePage.class;
+ private Class<? extends Page> loginPage = LoginPage.class;
protected void setUp() throws Exception
{
mock = new WicketTester(application = new WebApplication()
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return StatelessFormTest.this.getHomePage();
}
@@ -82,7 +83,7 @@
/**
* @return Returns the homePage.
*/
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
@@ -91,7 +92,7 @@
* @param homePage
* The homePage to set.
*/
- public void setHomePage(Class homePage)
+ public void setHomePage(Class<? extends Page> homePage)
{
this.homePage = homePage;
}
@@ -99,7 +100,7 @@
/**
* @return Returns the loginPage.
*/
- public Class getLoginPage()
+ public Class<? extends Page> getLoginPage()
{
return loginPage;
}
@@ -108,7 +109,7 @@
* @param loginPage
* The loginPage to set.
*/
- public void setLoginPage(Class loginPage)
+ public void setLoginPage(Class<? extends Page> loginPage)
{
this.loginPage = loginPage;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
Thu Apr 10 06:32:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.stateless;
+import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
@@ -43,7 +44,7 @@
tester = new WicketTester(new WebApplication()
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return HomePage.class;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
Thu Apr 10 06:32:43 2008
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.apache.wicket.Page;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.HttpSessionStore;
@@ -79,7 +80,7 @@
{
WebApplication app = new WebApplication()
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=646796&r1=646795&r2=646796&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
Thu Apr 10 06:32:43 2008
@@ -27,6 +27,7 @@
import junit.framework.TestCase;
+import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.MockWebApplication;
@@ -56,7 +57,7 @@
app = new MockWebApplication(new WebApplication()
{
- public Class getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
