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/05/04 02:58:13 UTC
svn commit: r653168 [1/2] - in /wicket/trunk:
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
wicket-examples/src/main/java/org/apache/wicket/examples/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket-exam...
Author: ivaynberg
Date: Sat May 3 17:58:11 2008
New Revision: 653168
URL: http://svn.apache.org/viewvc?rev=653168&view=rev
Log:
generics cleanup
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/CaptchaApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/AbstractPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java Sat May 3 17:58:11 2008
@@ -79,7 +79,7 @@
/**
* @see IUnauthorizedComponentInstantiationListener#onUnauthorizedInstantiation(Component)
*/
- public final void onUnauthorizedInstantiation(final Component component)
+ public final void onUnauthorizedInstantiation(final Component< ? > component)
{
// If there is a sign in page class declared, and the unauthorized
// component is a page, but it's not the sign in page
@@ -92,7 +92,7 @@
}
else
{
- onUnauthorizedPage((Page)component);
+ onUnauthorizedPage((Page< ? >)component);
}
}
else
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java Sat May 3 17:58:11 2008
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class WicketExamplePage extends WebPage
+public class WicketExamplePage<T> extends WebPage<T>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.ajax.builtin;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.examples.ajax.builtin.modal.ModalWindowPage;
import org.apache.wicket.examples.ajax.builtin.tree.EditableTreeTablePage;
@@ -72,7 +73,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
/**
* Base page for ajax example
*/
-public class BasePage extends WicketExamplePage
+public class BasePage<T> extends WicketExamplePage<T>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java Sat May 3 17:58:11 2008
@@ -21,7 +21,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class Index extends BasePage
+public class Index extends BasePage<Void>
{
/**
* Constructor.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java Sat May 3 17:58:11 2008
@@ -33,7 +33,7 @@
*
* @author ivaynberg
*/
-public class Index extends WicketExamplePage
+public class Index extends WicketExamplePage<Void>
{
/** Click count. */
private int count = 0;
@@ -53,6 +53,7 @@
* Handles a click on the link. This method is accessed normally using a standard http
* request, but in this example, we use Ajax to perform the call.
*/
+ @Override
public void onClick()
{
// Increment count
@@ -66,11 +67,13 @@
* Alter the javascript 'onclick' event to emit the Ajax call and update the counter
* label.
*/
+ @Override
protected String getOnClickScript(String url)
{
return new AppendingStringBuffer("new Ajax.Updater('counter', '").append(
- urlFor(ILinkListener.INTERFACE))
- .append("', {method:'get'}); return false;").toString();
+ urlFor(ILinkListener.INTERFACE))
+ .append("', {method:'get'}); return false;")
+ .toString();
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.ajax.prototype;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.markup.html.AjaxServerAndClientTimeFilter;
@@ -48,7 +49,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java Sat May 3 17:58:11 2008
@@ -21,7 +21,7 @@
/**
* @author almaw
*/
-public class BasePage extends WicketExamplePage
+public class BasePage<T> extends WicketExamplePage<T>
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java Sat May 3 17:58:11 2008
@@ -22,6 +22,6 @@
*
* @author Jonathan Locke
*/
-public class HomePage extends BasePage
+public class HomePage extends BasePage<Void>
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.authentication;
+import org.apache.wicket.Page;
import org.apache.wicket.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
@@ -44,7 +45,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<HomePage> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java Sat May 3 17:58:11 2008
@@ -21,7 +21,7 @@
/**
* @author almaw
*/
-public class BasePage extends WicketExamplePage
+public class BasePage<T> extends WicketExamplePage<T>
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java Sat May 3 17:58:11 2008
@@ -36,7 +36,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends BasePage
+public class Index extends BasePage<Void>
{
/**
* Construct.
@@ -76,7 +76,7 @@
// pages that are protected using annotations
add(new BookmarkablePageLink("adminAnnotBookmarkableLink",
- AdminAnnotationsBookmarkablePage.class));
+ AdminAnnotationsBookmarkablePage.class));
add(new Link("adminAnnotInternalLink")
{
@Override
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java Sat May 3 17:58:11 2008
@@ -19,6 +19,7 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
@@ -31,7 +32,7 @@
/**
* Application object for this example.
- *
+ *
* @author Eelco Hillenius
*/
public class RolesApplication extends WebApplication
@@ -54,7 +55,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java Sat May 3 17:58:11 2008
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.examples.breadcrumb;
+import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
/**
* Application class for the bread crumb example.
- *
+ *
* @author Eelco Hillenius
*/
public class BreadCrumbApplication extends WebApplication
@@ -29,7 +30,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.java Sat May 3 17:58:11 2008
@@ -25,7 +25,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage
+public class Index extends WicketExamplePage<Void>
{
/**
* Construct.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java Sat May 3 17:58:11 2008
@@ -33,7 +33,7 @@
*
* @author Joshua Perlow
*/
-public class Captcha extends WicketExamplePage
+public class Captcha extends WicketExamplePage<Void>
{
private final class CaptchaForm extends Form
{
@@ -54,6 +54,7 @@
add(new Image("captchaImage", captchaImageResource));
add(new RequiredTextField("password", new PropertyModel(properties, "password"))
{
+ @Override
protected final void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
@@ -66,12 +67,13 @@
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
public void onSubmit()
{
if (!imagePass.equals(getPassword()))
{
error("Captcha password '" + getPassword() + "' is wrong.\n" +
- "Correct password was: " + imagePass);
+ "Correct password was: " + imagePass);
}
else
{
@@ -100,7 +102,7 @@
}
/** Random captcha password to match against. */
- private String imagePass = randomString(6, 8);
+ private final String imagePass = randomString(6, 8);
private final ValueMap properties = new ValueMap();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/CaptchaApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/CaptchaApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/CaptchaApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/CaptchaApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.captcha;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Captcha> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Captcha.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java Sat May 3 17:58:11 2008
@@ -19,12 +19,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
* Application class for the component reference.
- *
+ *
* @author Eelco Hillenius
*/
public class ComponentReferenceApplication extends WicketExampleApplication
@@ -67,7 +68,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage
+public class Index extends WicketExamplePage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java Sat May 3 17:58:11 2008
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.protocol.http.WebApplication;
@@ -33,7 +34,7 @@
/**
* Application class for the custom resource loading example.
- *
+ *
* @author Eelco Hillenius
*/
public class CustomResourceLoadingApplication extends WicketExampleApplication
@@ -107,7 +108,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java Sat May 3 17:58:11 2008
@@ -25,7 +25,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage
+public class Index extends WicketExamplePage<Void>
{
/**
* Constructor.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.dates;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -34,7 +35,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<DatesPage> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return DatesPage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java Sat May 3 17:58:11 2008
@@ -40,7 +40,7 @@
/**
* Demonstrates components from the wicket-date project and a bunch of locale fiddling.
*/
-public class DatesPage extends WicketExamplePage
+public class DatesPage extends WicketExamplePage<Void>
{
/**
* Choice for a locale.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java Sat May 3 17:58:11 2008
@@ -28,7 +28,7 @@
*
* @author Eelco Hillenius
*/
-public class Echo extends WicketExamplePage
+public class Echo extends WicketExamplePage<Void>
{
private String message = "[type your message to the world here]";
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.echo;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -37,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Echo> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Echo.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.encodings;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -37,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java Sat May 3 17:58:11 2008
@@ -30,7 +30,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends WicketExamplePage
+public class Home extends WicketExamplePage<Void>
{
private static final Log log = LogFactory.getLog(Home.class);
@@ -49,6 +49,7 @@
* Because only servlet 2.4 supports web.xml locale-encoding-mapping-list deployment
* descriptors, this is a workaround for servlet 2.3
*/
+ @Override
protected void configureResponse()
{
final Locale originalLocale = getSession().getLocale();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java Sat May 3 17:58:11 2008
@@ -57,7 +57,7 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public class FormInput extends WicketExamplePage
+public class FormInput extends WicketExamplePage<Void>
{
/**
* Form for collecting input.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java Sat May 3 17:58:11 2008
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Locale;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
@@ -54,7 +55,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<FormInput> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return FormInput.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.frames;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Home extends WebPage
+public class Home extends WebPage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java Sat May 3 17:58:11 2008
@@ -42,7 +42,7 @@
* @author Jonathan Locke
* @author Martijn Dashorst
*/
-public final class GuestBook extends WicketExamplePage
+public final class GuestBook extends WicketExamplePage<Void>
{
/** A global list of all comments from all users across all sessions */
private static final List commentList = new ArrayList();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.guestbook;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -37,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<GuestBook> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return GuestBook.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.guice;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.guice.GuiceComponentInjector;
@@ -39,7 +40,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<HomePage> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java Sat May 3 17:58:11 2008
@@ -29,7 +29,7 @@
*
* @author Alastair Maw
*/
-public class HomePage extends WicketExamplePage
+public class HomePage extends WicketExamplePage<Void>
{
@Inject
private IMyService service;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.hangman;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
@@ -41,7 +42,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class HangmanPage extends WicketExamplePage
+public class HangmanPage<T> extends WicketExamplePage<T>
{
/**
* @return Returns the hangman.
@@ -36,6 +36,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java Sat May 3 17:58:11 2008
@@ -26,7 +26,7 @@
* @author Chris Turner
* @author Jonathan Locke
*/
-public class Home extends HangmanPage
+public class Home extends HangmanPage<Void>
{
/**
* Create the home page.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java Sat May 3 17:58:11 2008
@@ -35,7 +35,7 @@
*
* @author Eelco Hillenius
*/
-public class HelloBrowser extends WicketExamplePage
+public class HelloBrowser extends WicketExamplePage<Void>
{
/**
* Construct.
@@ -53,8 +53,7 @@
// don't use a property model here or anything else that is resolved
// during rendering, as changing the request target during rendering
// is not allowed.
- final ClientProperties properties = ((WebClientInfo)getRequestCycle().getClientInfo())
- .getProperties();
+ final ClientProperties properties = ((WebClientInfo)getRequestCycle().getClientInfo()).getProperties();
add(new MultiLineLabel("clientinfo", properties.toString()));
@@ -63,6 +62,7 @@
/**
* @see org.apache.wicket.model.AbstractReadOnlyModel#getObject()
*/
+ @Override
public Object getObject()
{
TimeZone timeZone = properties.getTimeZone();
@@ -80,7 +80,7 @@
return b.toString();
}
return "Unfortunately, we were not able to figure out what your time zone is, so we have"
- + "no idea what your time is";
+ + "no idea what your time is";
}
};
add(new Label("clienttime", clientTimeModel));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.hellobrowser;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.util.lang.PackageName;
@@ -37,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<HelloBrowser> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return HelloBrowser.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.java Sat May 3 17:58:11 2008
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class HelloWorld extends WicketExamplePage
+public class HelloWorld extends WicketExamplePage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.helloworld;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
@@ -65,7 +66,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<HelloWorld> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return HelloWorld.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java Sat May 3 17:58:11 2008
@@ -36,7 +36,7 @@
*
* @author Jonathan Locke
*/
-public final class Home extends WicketExamplePage
+public final class Home extends WicketExamplePage<Void>
{
/**
* A dynamic image resource using {@link Home#drawCircle(Graphics2D)} to draw a random circle on
@@ -50,6 +50,7 @@
super(width, height);
}
+ @Override
protected boolean render(Graphics2D graphics)
{
drawCircle(graphics);
@@ -58,7 +59,7 @@
}
private static final ResourceReference RESOURCE_REF = new ResourceReference(Home.class,
- "Image2.gif");
+ "Image2.gif");
/**
* Constructor
@@ -99,6 +100,7 @@
{
return new ResourceReference(Home.class, "image5")
{
+ @Override
public Resource newResource()
{
final BufferedDynamicImageResource resource = new BufferedDynamicImageResource();
@@ -134,6 +136,7 @@
{
return new ResourceReference("okButton")
{
+ @Override
protected Resource newResource()
{
return new DefaultButtonImageResource("Ok");
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.images;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.protocol.http.request.urlcompressing.UrlCompressingWebRequestProcessor;
@@ -42,7 +43,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java Sat May 3 17:58:11 2008
@@ -31,9 +31,9 @@
*
* @author Jonathan Locke
*/
-public class AuthenticatedWebPage extends WicketExamplePage
+public class AuthenticatedWebPage<T> extends WicketExamplePage<T>
{
- private Border border;
+ private final Border border;
/**
* Contruct
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java Sat May 3 17:58:11 2008
@@ -33,7 +33,7 @@
*
* @author Jonathan Locke
*/
-public final class Home extends AuthenticatedWebPage
+public final class Home extends AuthenticatedWebPage<Void>
{
/**
* Constructor
@@ -46,11 +46,12 @@
final PageableListView listView;
add(listView = new PageableListView("books", new PropertyModel(this, "books"), 4)
{
+ @Override
public void populateItem(final ListItem listItem)
{
final Book book = (Book)listItem.getModelObject();
listItem.add(BookDetails.link("details", book, getLocalizer().getString(
- "noBookTitle", this)));
+ "noBookTitle", this)));
listItem.add(new Label("author", new Model(book)));
listItem.add(moveUpLink("moveUp", listItem));
listItem.add(moveDownLink("moveDown", listItem));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.library;
+import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
@@ -43,7 +44,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Sat May 3 17:58:11 2008
@@ -44,7 +44,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends WicketExamplePage
+public class Home extends WicketExamplePage<Void>
{
/** click count for Link. */
private int linkClickCount = 0;
@@ -60,6 +60,7 @@
// Action link counts link clicks
final Link actionLink = new Link("actionLink")
{
+ @Override
public void onClick()
{
linkClickCount++;
@@ -71,6 +72,7 @@
// Action link counts link clicks on works with onclick handler
final Link actionOnClickLink = new Link("actionOnClickLink")
{
+ @Override
public void onClick()
{
onClickLinkClickCount++;
@@ -86,7 +88,7 @@
// Link to Page2 is automaticLink, so no code
// Link to Page3 is an external link which takes a parameter
add(new BookmarkablePageLink("page3Link", Page3.class).setParameter("bookmarkparameter",
- "3++2 & 5 � >< space + �"));
+ "3++2 & 5 � >< space + �"));
// Link to BookDetails page
add(new PageLink("bookDetailsLink", new IPageLink()
@@ -118,29 +120,28 @@
// Image map link example
add(new ImageMap("imageMap").addRectangleLink(0, 0, 100, 100,
- new BookmarkablePageLink("page1", Page1.class)).addCircleLink(160, 50, 35,
- new BookmarkablePageLink("page2", Page2.class)).addPolygonLink(
- new int[] { 212, 79, 241, 4, 279, 54, 212, 79 },
- new BookmarkablePageLink("page3", Page3.class)).add(
- RelativePathPrefixHandler.RELATIVE_PATH_BEHAVIOR));
+ new BookmarkablePageLink("page1", Page1.class)).addCircleLink(160, 50, 35,
+ new BookmarkablePageLink("page2", Page2.class)).addPolygonLink(
+ new int[] { 212, 79, 241, 4, 279, 54, 212, 79 },
+ new BookmarkablePageLink("page3", Page3.class)).add(
+ RelativePathPrefixHandler.RELATIVE_PATH_BEHAVIOR));
// Popup example
PopupSettings popupSettings = new PopupSettings(PageMap.forName("popuppagemap")).setHeight(
- 500).setWidth(500);
+ 500).setWidth(500);
add(new BookmarkablePageLink("popupLink", Popup.class).setPopupSettings(popupSettings));
// Popup example
- add(new BookmarkablePageLink("popupButtonLink", Popup.class)
- .setPopupSettings(popupSettings));
+ add(new BookmarkablePageLink("popupButtonLink", Popup.class).setPopupSettings(popupSettings));
// External site link
add(new ExternalLink("google", "http://www.google.com", "Click this link to go to Google"));
// And that link as a popup
PopupSettings googlePopupSettings = new PopupSettings(PopupSettings.RESIZABLE |
- PopupSettings.SCROLLBARS).setHeight(500).setWidth(700);
+ PopupSettings.SCROLLBARS).setHeight(500).setWidth(700);
add(new ExternalLink("googlePopup", "http://www.google.com",
- "Click this link to go to Google in a popup").setPopupSettings(googlePopupSettings));
+ "Click this link to go to Google in a popup").setPopupSettings(googlePopupSettings));
// Shared resource link
add(new ResourceLink("cancelButtonLink", new ResourceReference("cancelButton")));
@@ -152,6 +153,7 @@
Link linkToAnchor = new Link("linkToAnchor")
{
+ @Override
public void onClick()
{
}
@@ -159,13 +161,14 @@
add(linkToAnchor);
Link anotherlinkToAnchor = new Link("anotherlinkToAnchor")
{
+ @Override
public void onClick()
{
}
};
add(anotherlinkToAnchor);
Component anchorLabel = new Label("anchorLabel",
- "this label is here to function as an anchor for a link").setOutputMarkupId(true);
+ "this label is here to function as an anchor for a link").setOutputMarkupId(true);
add(anchorLabel);
linkToAnchor.setAnchor(anchorLabel);
}
@@ -194,6 +197,7 @@
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
protected void onSubmit()
{
setResponsePage(new RedirectPage(redirectUrl));
@@ -262,6 +266,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.linkomatic;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.ServerHostNameAndTimeFilter;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
@@ -39,7 +40,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.navomatic;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Page1> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Page1.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Page1 extends WicketExamplePage
+public class Page1 extends WicketExamplePage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Sat May 3 17:58:11 2008
@@ -40,7 +40,7 @@
*
* @author Eelco Hillenius
*/
-public class Home extends WicketExamplePage
+public class Home extends WicketExamplePage<Void>
{
/**
* Constructor.
@@ -72,12 +72,13 @@
TreeModel treeModel = convertToTreeModel(l1);
final Tree tree = new Tree("tree", treeModel)
{
+ @Override
protected String renderNode(TreeNode node)
{
DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)node;
Object userObject = treeNode.getUserObject();
- return (userObject instanceof List) ? "<subtree>" : String.valueOf(treeNode
- .getUserObject());
+ return (userObject instanceof List) ? "<subtree>"
+ : String.valueOf(treeNode.getUserObject());
}
};
// disable ajax links in this example
@@ -86,6 +87,7 @@
add(tree);
add(new Link("expandAll")
{
+ @Override
public void onClick()
{
tree.getTreeState().expandAll();
@@ -94,6 +96,7 @@
add(new Link("collapseAll")
{
+ @Override
public void onClick()
{
tree.getTreeState().collapseAll();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.nested;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -47,7 +48,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java Sat May 3 17:58:11 2008
@@ -28,7 +28,7 @@
*
* @author Eelco Hillenius
*/
-public class Home extends WicketExamplePage
+public class Home extends WicketExamplePage<Void>
{
/**
* Construct.
@@ -49,6 +49,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.niceurl;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.examples.niceurl.mounted.Page3;
import org.apache.wicket.protocol.http.WebRequestCycleProcessor;
@@ -45,7 +46,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java Sat May 3 17:58:11 2008
@@ -34,7 +34,7 @@
/**
* @author Ate Douma
*/
-public class EditPage extends WebPage
+public class EditPage extends WebPage<Void>
{
private static final IChoiceRenderer exampleChoiceRenderer = new IChoiceRenderer()
{
@@ -55,7 +55,7 @@
}
};
- private DropDownChoice ddc;
+ private final DropDownChoice ddc;
public EditPage()
{
@@ -71,12 +71,12 @@
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
PortletPreferences prefs = prc.getPortletRequest().getPreferences();
prc.getPortletRequest().getPortletSession().setAttribute(
- WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, selected);
+ WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, selected);
try
{
((ActionResponse)prc.getPortletResponse()).setPortletMode(PortletMode.VIEW);
- prefs.setValue(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, selected
- .getFilterPath());
+ prefs.setValue(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF,
+ selected.getFilterPath());
prefs.store();
}
catch (Exception pe)
@@ -90,7 +90,7 @@
ddc.setNullValid(false);
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
String eaFilterPath = prc.getPortletRequest().getPreferences().getValue(
- WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, null);
+ WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, null);
Model selected = new Model((ExampleApplication)examples.get(0));
if (eaFilterPath != null)
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java Sat May 3 17:58:11 2008
@@ -28,7 +28,7 @@
/**
* @author ate
*/
-public class MenuPage extends WebPage
+public class MenuPage extends WebPage<Void>
{
public MenuPage()
{
@@ -39,21 +39,19 @@
protected void populateItem(LoopItem item)
{
final int index = item.getIteration();
- ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication
- .getExamples().get(index + 1);
+ ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication.getExamples()
+ .get(index + 1);
Link link = new Link("example")
{
@Override
public void onClick()
{
int index = ((LoopItem)getParent()).getIteration();
- ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication
- .getExamples().get(index + 1);
- PortletSession session = ((PortletRequestContext)RequestContext.get())
- .getPortletRequest().getPortletSession();
- session
- .setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR,
- ea);
+ ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication.getExamples()
+ .get(index + 1);
+ PortletSession session = ((PortletRequestContext)RequestContext.get()).getPortletRequest()
+ .getPortletSession();
+ session.setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, ea);
}
};
link.add(new Label("name", ea.getDisplayName()));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java Sat May 3 17:58:11 2008
@@ -22,8 +22,8 @@
import javax.portlet.PortletMode;
import javax.servlet.ServletContext;
+import org.apache.wicket.Page;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
@@ -48,7 +48,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends WebPage> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
if (PortletMode.EDIT.equals(prc.getPortletRequest().getPortletMode()))
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java Sat May 3 17:58:11 2008
@@ -34,7 +34,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public final class Home extends WicketExamplePage
+public final class Home extends WicketExamplePage<Void>
{
/**
* Constructor
@@ -66,6 +66,7 @@
// locale
add(new Link("goCanadian")
{
+ @Override
public void onClick()
{
getSession().setLocale(Locale.CANADA);
@@ -73,6 +74,7 @@
});
add(new Link("goUS")
{
+ @Override
public void onClick()
{
getSession().setLocale(Locale.US);
@@ -80,6 +82,7 @@
});
add(new Link("goDutch")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("nl", "NL"));
@@ -87,6 +90,7 @@
});
add(new Link("goGerman")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("de", "DE"));
@@ -94,6 +98,7 @@
});
add(new Link("goChinese")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("zh", "CN"));
@@ -101,6 +106,7 @@
});
add(new Link("goDanish")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("da", "DK"));
@@ -108,6 +114,7 @@
});
add(new Link("goKorean")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("ko", "KR"));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.pub;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java Sat May 3 17:58:11 2008
@@ -33,7 +33,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public final class Home extends WicketExamplePage
+public final class Home extends WicketExamplePage<Void>
{
/**
* Constructor
@@ -63,6 +63,7 @@
// locale
add(new Link("goCanadian")
{
+ @Override
public void onClick()
{
getSession().setLocale(Locale.CANADA);
@@ -70,6 +71,7 @@
});
add(new Link("goUS")
{
+ @Override
public void onClick()
{
getSession().setLocale(Locale.US);
@@ -77,6 +79,7 @@
});
add(new Link("goDutch")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("nl", "NL"));
@@ -84,6 +87,7 @@
});
add(new Link("goGerman")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("de", "DE"));
@@ -91,6 +95,7 @@
});
add(new Link("goChinese")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("zh", "CN"));
@@ -98,6 +103,7 @@
});
add(new Link("goDanish")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("da", "DK"));
@@ -105,6 +111,7 @@
});
add(new Link("goKorean")
{
+ @Override
public void onClick()
{
getSession().setLocale(new Locale("ko", "KR"));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.pub2;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java Sat May 3 17:58:11 2008
@@ -22,7 +22,7 @@
* Base class for all pages in the QuickStart application. Any page which subclasses this page can
* get session properties from QuickStartSession via getQuickStartSession().
*/
-public abstract class ExamplePage extends WicketExamplePage
+public abstract class ExamplePage<T> extends WicketExamplePage<T>
{
/**
* Get downcast session object for easy access by subclasses
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
* @author igor
*
*/
-public class Index extends ExamplePage
+public class Index extends ExamplePage<Void>
{
/**
* constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.repeater;
+import org.apache.wicket.Page;
import org.apache.wicket.markup.html.ServerAndClientTimeFilter;
import org.apache.wicket.protocol.http.WebApplication;
@@ -58,7 +59,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java Sat May 3 17:58:11 2008
@@ -23,6 +23,6 @@
*
* @author Jonathan Locke
*/
-public class AuthenticatedWebPage extends WicketExamplePage
+public class AuthenticatedWebPage<T> extends WicketExamplePage<T>
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends AuthenticatedWebPage
+public class Home extends AuthenticatedWebPage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java Sat May 3 17:58:11 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.signin2;
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;
@@ -49,7 +50,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Home> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java Sat May 3 17:58:11 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage
+public class Index extends WicketExamplePage<Void>
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java Sat May 3 17:58:11 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.template;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -36,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<Index> getHomePage()
+ public Class< ? extends Page< ? >> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java Sat May 3 17:58:11 2008
@@ -21,6 +21,6 @@
/**
* Home page of this example.
*/
-public class Home extends WicketExamplePage
+public class Home extends WicketExamplePage<Void>
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java Sat May 3 17:58:11 2008
@@ -79,7 +79,8 @@
/**
* @return class
*/
- public Class< ? extends Page> getHomePage()
+ @Override
+ public Class< ? extends Page< ? >> getHomePage()
{
return Home.class;
}