You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/07 04:20:57 UTC
svn commit: r664242 [3/7] - in /wicket/sandbox/ivaynberg/generics:
archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src...
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java Fri Jun 6 19:20:43 2008
@@ -45,7 +45,7 @@
int index = 0;
while (contacts.hasNext())
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(repeating.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(repeating.newChildId());
repeating.add(item);
Contact contact = contacts.next();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java Fri Jun 6 19:20:43 2008
@@ -24,7 +24,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends WicketExamplePage<Void> implements AuthenticatedWebPage
+public class Home extends WicketExamplePage implements AuthenticatedWebPage
{
// Nothing in here.
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java Fri Jun 6 19:20:43 2008
@@ -31,7 +31,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn extends WicketExamplePage<Void>
+public final class SignIn extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/Home.java Fri Jun 6 19:20:43 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends AuthenticatedWebPage<Void>
+public class Home extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java Fri Jun 6 19:20:43 2008
@@ -27,7 +27,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn2 extends WicketExamplePage<Void>
+public final class SignIn2 extends WicketExamplePage
{
/**
* Construct
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java Fri Jun 6 19:20:43 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class SignOut extends AuthenticatedWebPage<Void>
+public class SignOut extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Fri Jun 6 19:20:43 2008
@@ -62,7 +62,7 @@
*
* @author Martijn Dashorst
*/
-public class SourcesPage extends WebPage<Void>
+public class SourcesPage extends WebPage
{
private static final Log log = LogFactory.getLog(SourcesPage.class);
@@ -360,7 +360,7 @@
/**
* Displays the resources embedded in a package in a list.
*/
- public class FilesBrowser extends WebMarkupContainer<Void>
+ public class FilesBrowser extends WebMarkupContainer
{
/**
* Constructor.
@@ -403,7 +403,7 @@
* Container for displaying the source of the selected page, resource or other element from the
* package.
*/
- public class CodePanel extends WebMarkupContainer<Void>
+ public class CodePanel extends WebMarkupContainer
{
/**
* Constructor.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java Fri Jun 6 19:20:43 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WebPage<Void>
+public class Index extends WebPage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java Fri Jun 6 19:20:43 2008
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public class StatefulPage extends WebPage<Void>
+public class StatefulPage extends WebPage
{
/** click count for Link. */
private int linkClickCount = 0;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java Fri Jun 6 19:20:43 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage extends WebPage<Void>
+public class StatelessPage extends WebPage
{
private final Integer number = new Integer(10);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java Fri Jun 6 19:20:43 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage1 extends WebPage<Void>
+public class StatelessPage1 extends WebPage
{
private final Integer number = new Integer(10);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java Fri Jun 6 19:20:43 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage2 extends WebPage<Void>
+public class StatelessPage2 extends WebPage
{
private final Integer number = new Integer(10);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java Fri Jun 6 19:20:43 2008
@@ -30,7 +30,7 @@
*
* @author Eelco Hillenius
*/
-public class StatelessPage3 extends WebPage<Void>
+public class StatelessPage3 extends WebPage
{
private final Integer number = new Integer(10);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java Fri Jun 6 19:20:43 2008
@@ -21,7 +21,7 @@
/**
* @author jbq
*/
-public class EmailPage extends WicketExamplePage<Void>
+public class EmailPage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java Fri Jun 6 19:20:43 2008
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
/**
* Construct.
@@ -60,7 +60,7 @@
private class StaticLink<T> extends WebMarkupContainer
{
- public StaticLink(String id, IModel<T> model)
+ public StaticLink(String id, IModel<?> model)
{
super(id, model);
add(new AttributeModifier("href", true, model));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java Fri Jun 6 19:20:43 2008
@@ -23,7 +23,7 @@
/**
* @author jbq
*/
-public class Page extends WicketExamplePage<Void>
+public class Page extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java Fri Jun 6 19:20:43 2008
@@ -21,6 +21,6 @@
/**
* @author jbq
*/
-public class Sent extends WicketExamplePage<Void>
+public class Sent extends WicketExamplePage
{
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java Fri Jun 6 19:20:43 2008
@@ -30,7 +30,7 @@
*
* @author Martijn Dashorst
*/
-public class StockQuotePage extends WicketExamplePage<Void>
+public class StockQuotePage extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java Fri Jun 6 19:20:43 2008
@@ -25,7 +25,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public abstract class Banner<T> extends Panel<T>
+public abstract class Banner<T> extends Panel
{
/**
* Construct.
@@ -43,7 +43,7 @@
* @param id
* @param model
*/
- public Banner(String id, IModel<T> model)
+ public Banner(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java Fri Jun 6 19:20:43 2008
@@ -42,7 +42,7 @@
* @param id
* @param model
*/
- public Banner1(String id, IModel<T> model)
+ public Banner1(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java Fri Jun 6 19:20:43 2008
@@ -42,7 +42,7 @@
* @param id
* @param model
*/
- public Banner2(String id, IModel<T> model)
+ public Banner2(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java Fri Jun 6 19:20:43 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java Fri Jun 6 19:20:43 2008
@@ -24,7 +24,7 @@
*
* @author Eelco Hillenius
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java Fri Jun 6 19:20:43 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java Fri Jun 6 19:20:43 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Panel1<T> extends TemplatePanel<T>
+public class Panel1<T> extends TemplatePanel
{
/**
* Construct.
@@ -45,7 +45,7 @@
* @param model
* the model
*/
- public Panel1(String id, IModel<T> model)
+ public Panel1(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java Fri Jun 6 19:20:43 2008
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public abstract class TemplatePage extends WicketExamplePage<Void>
+public abstract class TemplatePage extends WicketExamplePage
{
/** title of the current page. */
private String pageTitle = "(no title)";
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java Fri Jun 6 19:20:43 2008
@@ -25,7 +25,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public abstract class TemplatePanel<T> extends Panel<T>
+public abstract class TemplatePanel extends Panel
{
/**
* Construct.
@@ -46,7 +46,7 @@
* @param model
* the model
*/
- public TemplatePanel(String id, IModel<T> model)
+ public TemplatePanel(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java Fri Jun 6 19:20:43 2008
@@ -35,7 +35,7 @@
*
* @author Eelco Hillenius
*/
-public class UnicodeConverter extends WicketExamplePage<Void>
+public class UnicodeConverter extends WicketExamplePage
{
private static final String FROM_ESCAPED_UNICODE = "from escaped unicode";
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Fri Jun 6 19:20:43 2008
@@ -49,7 +49,7 @@
*
* @author Eelco Hillenius
*/
-public class MultiUploadPage extends WicketExamplePage<Void>
+public class MultiUploadPage extends WicketExamplePage
{
/**
* List view for files in upload folder.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Fri Jun 6 19:20:43 2008
@@ -46,7 +46,7 @@
*
* @author Eelco Hillenius
*/
-public class UploadPage extends WicketExamplePage<Void>
+public class UploadPage extends WicketExamplePage
{
/**
* List view for files in upload folder.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Fri Jun 6 19:20:43 2008
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class DynamicPage extends WicketExamplePage<Void>
+public class DynamicPage extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java Fri Jun 6 19:20:43 2008
@@ -21,6 +21,6 @@
/**
* Home page of this example.
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java Fri Jun 6 19:20:43 2008
@@ -38,7 +38,7 @@
*
* @author Eelco Hillenius
*/
-public class TemplatePage extends WicketExamplePage<Void>
+public class TemplatePage extends WicketExamplePage
{
/**
* Form for changing the template contents.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java Fri Jun 6 19:20:43 2008
@@ -26,7 +26,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/**
* Link to the wizard. It's an internal link instead of a bookmarkable page to help us with
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java Fri Jun 6 19:20:43 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardPage extends WicketExamplePage<Void>
+public class WizardPage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Fri Jun 6 19:20:43 2008
@@ -24,7 +24,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class BasePage extends WicketExamplePage<Void>
+public class BasePage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java Fri Jun 6 19:20:43 2008
@@ -22,7 +22,7 @@
/**
* Just a totally do nothing page; has to be here to have any page at all for the CookieTest.
*/
-public class MockPage extends WebPage<Void>
+public class MockPage extends WebPage
{
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Fri Jun 6 19:20:43 2008
@@ -71,7 +71,7 @@
* @param model
* The model
*/
- public AjaxEditableChoiceLabel(String id, IModel<T> model)
+ public AjaxEditableChoiceLabel(String id, IModel<?> model)
{
super(id, model);
}
@@ -99,7 +99,7 @@
* @param choices
* The collection of choices in the dropdown
*/
- public AjaxEditableChoiceLabel(String id, IModel<T> model,
+ public AjaxEditableChoiceLabel(String id, IModel<?> model,
IModel<? extends List<? extends T>> choices)
{
super(id, model);
@@ -118,7 +118,7 @@
* @param renderer
* The rendering engine
*/
- public AjaxEditableChoiceLabel(String id, IModel<T> model,
+ public AjaxEditableChoiceLabel(String id, IModel<?> model,
IModel<? extends List<? extends T>> choices, IChoiceRenderer<T> renderer)
{
super(id, model);
@@ -137,7 +137,7 @@
* The collection of choices in the dropdown
*/
@SuppressWarnings("unchecked")
- public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices)
+ public AjaxEditableChoiceLabel(String id, IModel<?> model, List<? extends T> choices)
{
this(id, model, Model.valueOf(choices));
}
@@ -155,7 +155,7 @@
* The rendering engine
*/
@SuppressWarnings("unchecked")
- public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices,
+ public AjaxEditableChoiceLabel(String id, IModel<?> model, List<? extends T> choices,
IChoiceRenderer<T> renderer)
{
this(id, model, Model.valueOf(choices), renderer);
@@ -168,7 +168,7 @@
*/
@Override
protected FormComponent newEditor(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
IModel<List<? extends T>> choiceModel = new AbstractReadOnlyModel<List<? extends T>>()
{
@@ -223,7 +223,7 @@
@Override
protected WebComponent newLabel(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
Label<T> label = new Label<T>(componentId, model)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Fri Jun 6 19:20:43 2008
@@ -72,7 +72,7 @@
* The model object type
*/
// TODO wonder if it makes sense to refactor this into a formcomponentpanel
-public class AjaxEditableLabel<T> extends Panel<T>
+public class AjaxEditableLabel<T> extends Panel
{
private static final long serialVersionUID = 1L;
@@ -182,7 +182,7 @@
* @param id
* @param model
*/
- public AjaxEditableLabel(String id, IModel<T> model)
+ public AjaxEditableLabel(String id, IModel<?> model)
{
super(id, model);
setOutputMarkupId(true);
@@ -236,7 +236,7 @@
* @see org.apache.wicket.MarkupContainer#setModel(org.apache.wicket.model.IModel)
*/
@Override
- public final AjaxEditableLabel<T> setModel(IModel<T> model)
+ public final AjaxEditableLabel<T> setModel(IModel<?> model)
{
super.setModel(model);
getLabel().setModel(model);
@@ -281,7 +281,7 @@
* @return The editor
*/
protected FormComponent newEditor(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
TextField<T> editor = new TextField<T>(componentId, model)
{
@@ -326,7 +326,7 @@
* @return The editor
*/
protected WebComponent newLabel(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
Label<T> label = new Label<T>(componentId, model)
{
@@ -490,7 +490,7 @@
* @param model
* The model for the label and editor
*/
- private void initLabelAndEditor(IModel<T> model)
+ private void initLabelAndEditor(IModel<?> model)
{
editor = newEditor(this, "editor", model);
label = newLabel(this, "label", model);
@@ -501,13 +501,13 @@
/**
* @return Gets the parent model in case no explicit model was specified.
*/
- private IModel<T> getParentModel()
+ private IModel<?> getParentModel()
{
// the #getModel() call below will resolve and assign any inheritable
// model this component can use. Set that directly to the label and
// editor so that those components work like this enclosing panel
// does not exist (must have that e.g. with CompoundPropertyModels)
- IModel<T> m = getModel();
+ IModel<?> m = getModel();
// check that a model was found
if (m == null)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Fri Jun 6 19:20:43 2008
@@ -64,7 +64,7 @@
* @param model
* The model
*/
- public AjaxEditableMultiLineLabel(String id, IModel<T> model)
+ public AjaxEditableMultiLineLabel(String id, IModel<?> model)
{
super(id, model);
}
@@ -75,7 +75,7 @@
*/
@Override
protected MultiLineLabel<T> newLabel(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
MultiLineLabel<T> label = new MultiLineLabel<T>(componentId, model)
{
@@ -118,7 +118,7 @@
*/
@Override
protected FormComponent newEditor(MarkupContainer parent, String componentId,
- IModel<T> model)
+ IModel<?> model)
{
TextArea<T> editor = new TextArea<T>(componentId, model)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxFallbackLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxFallbackLink.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxFallbackLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxFallbackLink.java Fri Jun 6 19:20:43 2008
@@ -58,7 +58,7 @@
* @param id
* @param model
*/
- public IndicatingAjaxFallbackLink(String id, IModel<T> model)
+ public IndicatingAjaxFallbackLink(String id, IModel<?> model)
{
super(id, model);
add(indicatorAppender);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java Fri Jun 6 19:20:43 2008
@@ -55,7 +55,7 @@
* @param id
* @param model
*/
- public IndicatingAjaxLink(String id, IModel<T> model)
+ public IndicatingAjaxLink(String id, IModel<?> model)
{
super(id, model);
add(indicatorAppender);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java Fri Jun 6 19:20:43 2008
@@ -47,7 +47,7 @@
*/
public AutoCompleteTextField(String id, Class<T> type)
{
- this(id, (IModel<T>)null, type, new AutoCompleteSettings());
+ this(id, (IModel<?>)null, type, new AutoCompleteSettings());
}
/**
@@ -59,7 +59,7 @@
* @deprecated use the constructor {@link AutoCompleteTextField}{@link #AutoCompleteTextField(String, IModel, Class, AutoCompleteSettings)}
*/
@Deprecated
- public AutoCompleteTextField(String id, IModel<T> model, Class<T> type, boolean preselect)
+ public AutoCompleteTextField(String id, IModel<?> model, Class<T> type, boolean preselect)
{
this(id, model, type, StringAutoCompleteRenderer.INSTANCE,
new AutoCompleteSettings().setPreselect(preselect));
@@ -73,7 +73,7 @@
* @param type
* @param settings
*/
- public AutoCompleteTextField(String id, IModel<T> model, Class<T> type,
+ public AutoCompleteTextField(String id, IModel<?> model, Class<T> type,
AutoCompleteSettings settings)
{
this(id, model, type, StringAutoCompleteRenderer.INSTANCE, settings);
@@ -86,7 +86,7 @@
* @deprecated use the constructor {@link AutoCompleteTextField}{@link #AutoCompleteTextField(String, IModel, AutoCompleteSettings)}
*/
@Deprecated
- public AutoCompleteTextField(String id, IModel<T> object, boolean preselect)
+ public AutoCompleteTextField(String id, IModel<?> object, boolean preselect)
{
this(id, object, (Class<T>)null, new AutoCompleteSettings().setPreselect(preselect));
}
@@ -98,7 +98,7 @@
* @param object
* @param settings
*/
- public AutoCompleteTextField(String id, IModel<T> object, AutoCompleteSettings settings)
+ public AutoCompleteTextField(String id, IModel<?> object, AutoCompleteSettings settings)
{
this(id, object, (Class<T>)null, settings);
}
@@ -108,7 +108,7 @@
* @param id
* @param object
*/
- public AutoCompleteTextField(String id, IModel<T> object)
+ public AutoCompleteTextField(String id, IModel<?> object)
{
this(id, object, (Class<T>)null, new AutoCompleteSettings());
}
@@ -121,7 +121,7 @@
@Deprecated
public AutoCompleteTextField(String id, boolean preselect)
{
- this(id, (IModel<T>)null, new AutoCompleteSettings().setPreselect(preselect));
+ this(id, (IModel<?>)null, new AutoCompleteSettings().setPreselect(preselect));
}
/**
@@ -132,7 +132,7 @@
*/
public AutoCompleteTextField(String id, AutoCompleteSettings settings)
{
- this(id, (IModel<T>)null, settings);
+ this(id, (IModel<?>)null, settings);
}
@@ -141,7 +141,7 @@
*/
public AutoCompleteTextField(String id)
{
- this(id, (IModel<T>)null, new AutoCompleteSettings());
+ this(id, (IModel<?>)null, new AutoCompleteSettings());
}
@@ -151,7 +151,7 @@
*/
public AutoCompleteTextField(String id, IAutoCompleteRenderer<T> renderer)
{
- this(id, (IModel<T>)null, renderer);
+ this(id, (IModel<?>)null, renderer);
}
/**
@@ -169,7 +169,7 @@
* @param model
* @param renderer
*/
- public AutoCompleteTextField(String id, IModel<T> model, IAutoCompleteRenderer<T> renderer)
+ public AutoCompleteTextField(String id, IModel<?> model, IAutoCompleteRenderer<T> renderer)
{
this(id, model, (Class<T>)null, renderer, new AutoCompleteSettings());
}
@@ -183,7 +183,7 @@
* @deprecated use the constructor {@link AutoCompleteTextField}{@link #AutoCompleteTextField(String, IModel, Class, IAutoCompleteRenderer, AutoCompleteSettings)}
*/
@Deprecated
- public AutoCompleteTextField(String id, IModel<T> model, Class<T> type,
+ public AutoCompleteTextField(String id, IModel<?> model, Class<T> type,
IAutoCompleteRenderer<T> renderer, boolean preselect)
{
this(id, model, type, renderer, new AutoCompleteSettings().setPreselect(preselect));
@@ -198,7 +198,7 @@
* @param renderer
* @param settings
*/
- public AutoCompleteTextField(String id, IModel<T> model, Class<T> type,
+ public AutoCompleteTextField(String id, IModel<?> model, Class<T> type,
IAutoCompleteRenderer<T> renderer, AutoCompleteSettings settings)
{
super(id, model, type);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Fri Jun 6 19:20:43 2008
@@ -37,7 +37,7 @@
*
* @author Andrew Lombardi
*/
-public class UploadProgressBar extends Panel<Void>
+public class UploadProgressBar extends Panel
{
private static final Logger log = LoggerFactory.getLogger(UploadProgressBar.class);
@@ -93,11 +93,11 @@
add(HeaderContributor.forCss(css));
}
- final WebMarkupContainer<Void> barDiv = new WebMarkupContainer<Void>("bar");
+ final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
barDiv.setOutputMarkupId(true);
add(barDiv);
- final WebMarkupContainer<Void> statusDiv = new WebMarkupContainer<Void>("status");
+ final WebMarkupContainer statusDiv = new WebMarkupContainer("status");
statusDiv.setOutputMarkupId(true);
add(statusDiv);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java Fri Jun 6 19:20:43 2008
@@ -93,7 +93,7 @@
}
@Override
- protected Item<T> newRowItem(String id, int index, IModel<T> model)
+ protected Item<T> newRowItem(String id, int index, IModel<?> model)
{
return new OddEvenItem<T>(id, index, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java Fri Jun 6 19:20:43 2008
@@ -52,7 +52,7 @@
/**
* @see Label#Label(String, IModel)
*/
- public SmartLinkLabel(String name, IModel<T> model)
+ public SmartLinkLabel(String name, IModel<?> model)
{
super(name, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java Fri Jun 6 19:20:43 2008
@@ -52,7 +52,7 @@
/**
* @see MultiLineLabel#MultiLineLabel(String, IModel)
*/
- public SmartLinkMultiLineLabel(String name, IModel<T> model)
+ public SmartLinkMultiLineLabel(String name, IModel<?> model)
{
super(name, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java Fri Jun 6 19:20:43 2008
@@ -44,5 +44,5 @@
* @param value
* @return model that will contain the value object
*/
- public IModel<T> getModel(Object value);
+ public IModel<?> getModel(Object value);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java Fri Jun 6 19:20:43 2008
@@ -46,7 +46,7 @@
/**
* @see WebMarkupContainer#WebMarkupContainer(String, IModel)
*/
- public SelectOption(String id, IModel<T> model)
+ public SelectOption(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Fri Jun 6 19:20:43 2008
@@ -115,14 +115,14 @@
while (it.hasNext())
{
// we need a container to represent a row in repeater
- WebMarkupContainer row = new WebMarkupContainer<Void>(newChildId());
+ WebMarkupContainer row = new WebMarkupContainer(newChildId());
row.setRenderBodyOnly(true);
add(row);
// we add our actual SelectOption component to the row
Object value = it.next();
String text = renderer.getDisplayValue(value);
- IModel<T> model = renderer.getModel(value);
+ IModel<?> model = renderer.getModel(value);
row.add(newOption(text, model));
}
}
@@ -137,7 +137,7 @@
* @param model
* @return a {@link SelectOption}
*/
- protected SelectOption<T> newOption(String text, IModel<T> model)
+ protected SelectOption<T> newOption(String text, IModel<?> model)
{
return new SimpleSelectOption<T>("option", model, text);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java Fri Jun 6 19:20:43 2008
@@ -124,7 +124,7 @@
}
@Override
- protected final Item<T> newItem(String id, int index, IModel<T> model)
+ protected final Item<T> newItem(String id, int index, IModel<?> model)
{
return newRowItem(id, index, model);
}
@@ -144,7 +144,7 @@
*
* @return DataItem created DataItem
*/
- protected Item<T> newRowItem(final String id, int index, final IModel<T> model)
+ protected Item<T> newRowItem(final String id, int index, final IModel<?> model)
{
return new Item<T>(id, index, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java Fri Jun 6 19:20:43 2008
@@ -70,5 +70,5 @@
* @see Item
*/
void populateItem(final Item<ICellPopulator<T>> cellItem, final String componentId,
- final IModel<T> rowModel);
+ final IModel<?> rowModel);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java Fri Jun 6 19:20:43 2008
@@ -29,7 +29,7 @@
* The toolbar's model object type
*
*/
-public abstract class AbstractToolbar<T> extends Panel<T>
+public abstract class AbstractToolbar<T> extends Panel
{
private static final long serialVersionUID = 1L;
@@ -43,7 +43,7 @@
* @param table
* data table this toolbar will be attached to
*/
- public AbstractToolbar(IModel<T> model, DataTable<?> table)
+ public AbstractToolbar(IModel<?> model, DataTable<?> table)
{
super(DataTable.TOOLBAR_COMPONENT_ID, model);
this.table = table;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Fri Jun 6 19:20:43 2008
@@ -71,7 +71,7 @@
* The model object type
*
*/
-public class DataTable<T> extends Panel<T> implements IPageable
+public class DataTable<T> extends Panel implements IPageable
{
static abstract class CssAttributeBehavior extends AbstractBehavior
{
@@ -167,7 +167,7 @@
}
@Override
- protected Item<T> newRowItem(String id, int index, IModel<T> model)
+ protected Item<T> newRowItem(String id, int index, IModel<?> model)
{
return DataTable.this.newRowItem(id, index, model);
}
@@ -323,7 +323,7 @@
toolbar.setRenderBodyOnly(true);
// create a container item for the toolbar (required by repeating view)
- WebMarkupContainer item = new WebMarkupContainer<Void>(container.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(container.newChildId());
item.setRenderBodyOnly(true);
item.add(toolbar);
@@ -344,7 +344,7 @@
*
* @return DataItem created DataItem
*/
- protected Item<T> newCellItem(final String id, final int index, final IModel<T> model)
+ protected Item<T> newCellItem(final String id, final int index, final IModel<?> model)
{
return new Item<T>(id, index, model);
}
@@ -363,7 +363,7 @@
*
* @return DataItem created DataItem
*/
- protected Item<T> newRowItem(final String id, int index, final IModel<T> model)
+ protected Item<T> newRowItem(final String id, int index, final IModel<?> model)
{
return new Item<T>(id, index, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java Fri Jun 6 19:20:43 2008
@@ -84,7 +84,7 @@
}
@Override
- protected Item<T> newRowItem(String id, int index, IModel<T> model)
+ protected Item<T> newRowItem(String id, int index, IModel<?> model)
{
return new OddEvenItem<T>(id, index, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java Fri Jun 6 19:20:43 2008
@@ -54,7 +54,7 @@
final IColumn<?>[] columns = table.getColumns();
for (final IColumn<?> column : columns)
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(headers.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(headers.newChildId());
headers.add(item);
WebMarkupContainer header = null;
@@ -64,7 +64,7 @@
}
else
{
- header = new WebMarkupContainer<Void>("header");
+ header = new WebMarkupContainer("header");
}
if (column instanceof IStyledColumn)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Fri Jun 6 19:20:43 2008
@@ -46,7 +46,7 @@
super(table);
this.table = table;
- WebMarkupContainer span = new WebMarkupContainer<Void>("span");
+ WebMarkupContainer span = new WebMarkupContainer("span");
add(span);
span.add(new AttributeModifier("colspan", true, new Model<String>(
String.valueOf(table.getColumns().length))));
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Fri Jun 6 19:20:43 2008
@@ -61,7 +61,7 @@
public NoRecordsToolbar(final DataTable<?> table, IModel<String> messageModel)
{
super(table);
- WebMarkupContainer td = new WebMarkupContainer<Void>("td");
+ WebMarkupContainer td = new WebMarkupContainer("td");
add(td);
td.add(new AttributeModifier("colspan", true, new Model<String>(
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java Fri Jun 6 19:20:43 2008
@@ -28,7 +28,7 @@
* The model object type
*
*/
-public class AbstractFilter<T> extends Panel<T>
+public class AbstractFilter<T> extends Panel
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java Fri Jun 6 19:20:43 2008
@@ -50,7 +50,7 @@
* @param choices
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm form,
+ public ChoiceFilter(String id, IModel<?> model, FilterForm form,
IModel<List<? extends T>> choices, boolean autoSubmit)
{
this(id, model, form, choices, defaultRenderer, autoSubmit);
@@ -63,7 +63,7 @@
* @param choices
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<? extends T> choices,
+ public ChoiceFilter(String id, IModel<?> model, FilterForm form, List<? extends T> choices,
boolean autoSubmit)
{
this(id, model, form, Model.valueOf(choices), defaultRenderer, autoSubmit);
@@ -77,7 +77,7 @@
* @param renderer
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<? extends T> choices,
+ public ChoiceFilter(String id, IModel<?> model, FilterForm form, List<? extends T> choices,
IChoiceRenderer<T> renderer, boolean autoSubmit)
{
this(id, model, form, Model.valueOf(choices), renderer, autoSubmit);
@@ -99,7 +99,7 @@
* if true this filter will submit the form on selection change
* @see DropDownChoice
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm form,
+ public ChoiceFilter(String id, IModel<?> model, FilterForm form,
IModel<List<? extends T>> choices, IChoiceRenderer<T> renderer, boolean autoSubmit)
{
super(id, form);
@@ -129,7 +129,7 @@
* choice renderer
* @return created drop down component
*/
- protected DropDownChoice<T> newDropDownChoice(String id, IModel<T> model,
+ protected DropDownChoice<T> newDropDownChoice(String id, IModel<?> model,
IModel<List<? extends T>> choices, IChoiceRenderer<T> renderer)
{
return new DropDownChoice<T>(id, model, choices, renderer);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Fri Jun 6 19:20:43 2008
@@ -104,7 +104,7 @@
* filter form
* @return model passed on to the text filter
*/
- protected IModel<T> getFilterModel(FilterForm form)
+ protected IModel<?> getFilterModel(FilterForm form)
{
return new PropertyModel<T>(form.getModel(), getPropertyExpression());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Fri Jun 6 19:20:43 2008
@@ -70,7 +70,7 @@
add(hidden);
// add javascript to restore focus to a filter component
- add(new WebMarkupContainer<Void>("focus-restore")
+ add(new WebMarkupContainer("focus-restore")
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java Fri Jun 6 19:20:43 2008
@@ -69,7 +69,7 @@
IColumn<?>[] cols = table.getColumns();
for (int i = 0; i < cols.length; i++)
{
- WebMarkupContainer item = new WebMarkupContainer<Void>(filters.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer(filters.newChildId());
item.setRenderBodyOnly(true);
IColumn<?> col = cols[i];
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java Fri Jun 6 19:20:43 2008
@@ -27,7 +27,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class GoFilter extends Panel<Void>
+public class GoFilter extends Panel
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java Fri Jun 6 19:20:43 2008
@@ -25,7 +25,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class NoFilter extends Panel<Void>
+public class NoFilter extends Panel
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java Fri Jun 6 19:20:43 2008
@@ -43,7 +43,7 @@
* @param form
* filter form this filter will be added to
*/
- public TextFilter(String id, IModel<T> model, FilterForm form)
+ public TextFilter(String id, IModel<?> model, FilterForm form)
{
super(id, form);
filter = new TextField<T>("filter", model);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java Fri Jun 6 19:20:43 2008
@@ -72,7 +72,7 @@
* filter form
* @return model passed on to the text filter
*/
- protected IModel<T> getFilterModel(FilterForm form)
+ protected IModel<?> getFilterModel(FilterForm form)
{
return new PropertyModel<T>(form.getModel(), getPropertyExpression());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Fri Jun 6 19:20:43 2008
@@ -126,7 +126,7 @@
}
};
- WebMarkupContainer tabsContainer = new WebMarkupContainer<Void>("tabs-container")
+ WebMarkupContainer tabsContainer = new WebMarkupContainer("tabs-container")
{
private static final long serialVersionUID = 1L;
@@ -229,7 +229,7 @@
if (tabs.size() == 0)
{
- add(new WebMarkupContainer<Void>(TAB_PANEL_ID)).setVisible(false);
+ add(new WebMarkupContainer(TAB_PANEL_ID)).setVisible(false);
}
}
super.onBeforeRender();
@@ -344,7 +344,7 @@
if (tab.isVisible())
component = tab.getPanel(TAB_PANEL_ID);
else
- component = new WebMarkupContainer<Void>(TAB_PANEL_ID);
+ component = new WebMarkupContainer(TAB_PANEL_ID);
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java Fri Jun 6 19:20:43 2008
@@ -66,7 +66,7 @@
* If true, any html of the content will be rendered as is. Otherwise, it will be
* escaped.
*/
- public <T> StaticContentStep(IModel<String> title, IModel<String> summary, IModel<T> content,
+ public <T> StaticContentStep(IModel<String> title, IModel<String> summary, IModel<?> content,
boolean allowHtml)
{
super(title, summary);
@@ -169,7 +169,7 @@
* @param content
* The content model
*/
- public final <T> void setContentModel(IModel<T> content)
+ public final <T> void setContentModel(IModel<?> content)
{
this.content = content;
replace(new Label<T>("content", content).setEscapeModelStrings(!allowHtml));
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java Fri Jun 6 19:20:43 2008
@@ -49,7 +49,7 @@
*
* @author Eelco Hillenius
*/
-public class Wizard<T> extends Panel<T> implements IWizardModelListener, IWizard
+public class Wizard<T> extends Panel implements IWizardModelListener, IWizard
{
/** Component id of the buttons panel as used by the default wizard panel. */
public static final String BUTTONS_ID = "buttons";
@@ -262,10 +262,10 @@
form = newForm(FORM_ID);
addOrReplace(form);
// dummy view to be replaced
- form.addOrReplace(new WebMarkupContainer<Void>(HEADER_ID));
+ form.addOrReplace(new WebMarkupContainer(HEADER_ID));
form.addOrReplace(newFeedbackPanel(FEEDBACK_ID));
// add dummy view; will be replaced on initialization
- form.addOrReplace(new WebMarkupContainer<Void>(VIEW_ID));
+ form.addOrReplace(new WebMarkupContainer(VIEW_ID));
form.addOrReplace(newButtonBar(BUTTONS_ID));
form.addOrReplace(newOverviewBar(OVERVIEW_ID));
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java Fri Jun 6 19:20:43 2008
@@ -32,7 +32,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardButtonBar extends Panel<Void> implements IDefaultButtonProvider
+public class WizardButtonBar extends Panel implements IDefaultButtonProvider
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java Fri Jun 6 19:20:43 2008
@@ -78,7 +78,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardStep<T> extends Panel<T> implements IWizardStep
+public class WizardStep<T> extends Panel implements IWizardStep
{
/**
* Adds form validators. We don't need this in 2.0 as the hierarchy is know at construction time
@@ -271,7 +271,7 @@
* @param model
* Any model which is to be used for this step
*/
- public WizardStep(IModel<String> title, IModel<String> summary, IModel<T> model)
+ public WizardStep(IModel<String> title, IModel<String> summary, IModel<?> model)
{
super(Wizard.VIEW_ID, model);
@@ -304,7 +304,7 @@
* @param model
* Any model which is to be used for this step
*/
- public WizardStep(String title, String summary, IModel<T> model)
+ public WizardStep(String title, String summary, IModel<?> model)
{
this(new Model<String>(title), new Model<String>(summary), model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java Fri Jun 6 19:20:43 2008
@@ -81,7 +81,7 @@
* Any model which is to be used for this step
*/
public DynamicWizardStep(IDynamicWizardStep previousStep, IModel<String> title,
- IModel<String> summary, IModel<T> model)
+ IModel<String> summary, IModel<?> model)
{
super(title, summary, model);
this.previousStep = previousStep;
@@ -118,7 +118,7 @@
* Any model which is to be used for this step
*/
public DynamicWizardStep(IDynamicWizardStep previousStep, String title, String summary,
- IModel<T> model)
+ IModel<?> model)
{
super(title, summary, model);
this.previousStep = previousStep;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java Fri Jun 6 19:20:43 2008
@@ -24,7 +24,7 @@
/**
* @author Gerolf Seitz
*/
-public class AjaxEditableLabelPage extends WebPage<Void>
+public class AjaxEditableLabelPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java Fri Jun 6 19:20:43 2008
@@ -28,7 +28,7 @@
*
* @see org.apache.wicket.velocity.markup.html.VelocityPanel
*/
-public class VelocityPage extends WebPage<Void>
+public class VelocityPage extends WebPage
{
protected static final String TEST_STRING = "Hello, World!";
Modified: wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java?rev=664242&r1=664241&r2=664242&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java Fri Jun 6 19:20:43 2008
@@ -31,7 +31,7 @@
*
* @see org.apache.wicket.velocity.markup.html.VelocityPanel
*/
-public class VelocityWithMarkupParsingPage extends WebPage<Void>
+public class VelocityWithMarkupParsingPage extends WebPage
{
/**
* Adds a VelocityPanel to the page with markup parsing