You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/29 07:51:39 UTC
svn commit: r672603 [5/18] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/main/java/org/apache/wi...
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java Sat Jun 28 22:50:41 2008
@@ -41,14 +41,14 @@
protected void populateItem(Item<Contact> item)
{
final Contact contact = item.getModelObject();
- item.add(new Label<String>("firstName", contact.getFirstName() + " " +
+ item.add(new Label("firstName", contact.getFirstName() + " " +
contact.getLastName()));
}
@Override
protected void populateEmptyItem(Item<Contact> item)
{
- item.add(new Label<String>("firstName", "*empty*"));
+ item.add(new Label("firstName", "*empty*"));
}
};
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
* @author igor
*
*/
-public class Index extends ExamplePage<Void>
+public class Index extends ExamplePage
{
/**
* constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java Sat Jun 28 22:50:41 2008
@@ -62,7 +62,7 @@
add(new AttributeModifier("style", true, new Model<String>("background-color:#80b6ed;"))
{
@Override
- public boolean isEnabled(Component<?> component)
+ public boolean isEnabled(Component component)
{
return HighlitableDataItem.this.highlite;
}
@@ -84,7 +84,7 @@
{
Contact contact = item.getModelObject();
item.add(new ActionPanel("actions", item.getModel()));
- item.add(new Link<Void>("toggleHighlite")
+ item.add(new Link("toggleHighlite")
{
@Override
public void onClick()
@@ -93,11 +93,11 @@
hitem.toggleHighlite();
}
});
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java Sat Jun 28 22:50:41 2008
@@ -45,11 +45,11 @@
{
Contact contact = item.getModelObject();
item.add(new ActionPanel("actions", item.getModel()));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java Sat Jun 28 22:50:41 2008
@@ -69,13 +69,13 @@
protected void populateItem(final Item<Contact> item)
{
Contact contact = item.getModelObject();
- item.add(new Label<String>("itemid", item.getId()));
+ item.add(new Label("itemid", item.getId()));
item.add(new ActionPanel("actions", item.getModel()));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
@@ -90,7 +90,7 @@
add(view);
- add(new Link<Void>("refreshLink")
+ add(new Link("refreshLink")
{
@Override
public void onClick()
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -59,7 +59,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java Sat Jun 28 22:50:41 2008
@@ -39,22 +39,22 @@
{
Iterator<Contact> contacts = new ContactDataProvider().iterator(0, 10);
- RepeatingView<?> repeating = new RepeatingView<Void>("repeating");
+ RepeatingView repeating = new RepeatingView("repeating");
add(repeating);
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();
item.add(new ActionPanel("actions", new DetachableContactModel(contact)));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
final int idx = index;
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java Sat Jun 28 22:50:41 2008
@@ -41,11 +41,11 @@
{
Contact contact = item.getModelObject();
item.add(new ActionPanel("actions", item.getModel()));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java Sat Jun 28 22:50:41 2008
@@ -46,11 +46,11 @@
{
Contact contact = item.getModelObject();
item.add(new ActionPanel("actions", item.getModel()));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/Home.java Sat Jun 28 22:50:41 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/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignIn.java Sat Jun 28 22:50:41 2008
@@ -31,7 +31,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn extends WicketExamplePage<Void>
+public final class SignIn extends WicketExamplePage
{
/**
* Constructor
@@ -64,7 +64,7 @@
*
* @author Jonathan Locke
*/
- public final class SignInForm extends Form<Void>
+ public final class SignInForm extends Form
{
// El-cheapo model for form
private final ValueMap properties = new ValueMap();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java Sat Jun 28 22:50:41 2008
@@ -45,7 +45,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
@@ -67,12 +67,12 @@
{
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (AuthenticatedWebPage.class.isAssignableFrom(componentClass))
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -24,6 +24,6 @@
* @author Jonathan Locke
* @param <T>
*/
-public class AuthenticatedWebPage<T> extends WicketExamplePage<T>
+public class AuthenticatedWebPage extends WicketExamplePage
{
}
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class Home extends AuthenticatedWebPage<Void>
+public class Home extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Jonathan Locke
*/
-public final class SignIn2 extends WicketExamplePage<Void>
+public final class SignIn2 extends WicketExamplePage
{
/**
* Construct
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -50,7 +50,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
@@ -75,12 +75,12 @@
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (AuthenticatedWebPage.class.isAssignableFrom(componentClass))
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignOut.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-public class SignOut extends AuthenticatedWebPage<Void>
+public class SignOut extends AuthenticatedWebPage
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Sat Jun 28 22:50:41 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.
@@ -376,13 +376,12 @@
@Override
protected void populateItem(ListItem<String> item)
{
- AjaxFallbackLink<String> link = new AjaxFallbackLink<String>("link",
- item.getModel())
+ AjaxFallbackLink link = new AjaxFallbackLink("link", item.getModel())
{
@Override
public void onClick(AjaxRequestTarget target)
{
- setName(getModelObjectAsString());
+ setName(getDefaultModelObjectAsString());
if (target != null)
{
@@ -391,7 +390,7 @@
}
}
};
- link.add(new Label<String>("name", item.getModelObjectAsString()));
+ link.add(new Label("name", item.getDefaultModelObjectAsString()));
item.add(link);
}
};
@@ -403,7 +402,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.
@@ -414,7 +413,7 @@
public CodePanel(String id)
{
super(id);
- Label<String> code = new Label<String>("code", new SourceModel());
+ Label code = new Label("code", new SourceModel());
code.setEscapeModelStrings(false);
code.setOutputMarkupId(true);
add(code);
@@ -429,14 +428,14 @@
/**
* The class of the page of which the sources need to be displayed.
*/
- private final Class<? extends Page<?>> page;
+ private final Class<? extends Page> page;
/**
* The panel for setting the ajax calls.
*/
- private final Component<?> codePanel;
+ private final Component codePanel;
- private final Label<String> filename;
+ private final Label filename;
/**
* Sets the name.
@@ -475,16 +474,16 @@
* @param page
* the page where the sources need to be shown from.
*/
- public <C extends Page<?>> SourcesPage(Class<C> page)
+ public <C extends Page> SourcesPage(Class<C> page)
{
this.page = page;
- filename = new Label<String>("filename", new PropertyModel<String>(this, "name"));
+ filename = new Label("filename", new PropertyModel<String>(this, "name"));
filename.setOutputMarkupId(true);
add(filename);
codePanel = new CodePanel("codepanel").setOutputMarkupId(true);
add(codePanel);
add(new FilesBrowser("filespanel"));
- add(new PopupCloseLink<Void>("close"));
+ add(new PopupCloseLink("close"));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WebPage<Void>
+public class Index extends WebPage
{
/**
* Constructor
@@ -35,7 +35,7 @@
public Index()
{
setStatelessHint(true);
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
// First a normal bookmarkable link (which is stateless by default)
add(new BookmarkablePageLink("linkToStatelessPage", StatelessPage.class));
add(new BookmarkablePageLink("linkToStatelessPage1", StatelessPage1.class));
@@ -43,7 +43,7 @@
add(new BookmarkablePageLink("linkToStatelessPage3", StatelessPage3.class));
// The second with a stateless link, so the onclick will be called but
// on a stateless page.
- add(new StatelessLink<Void>("linkToStatefulPage")
+ add(new StatelessLink("linkToStatefulPage")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -54,7 +54,7 @@
setResponsePage(StatefulPage.class);
}
});
- add(new StatelessLink<Void>("invalidatesession")
+ add(new StatelessLink("invalidatesession")
{
@Override
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java Sat Jun 28 22:50:41 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;
@@ -41,11 +41,11 @@
*/
public StatefulPage()
{
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
add(new BookmarkablePageLink("indexLink", Index.class));
// Action link counts link clicks
- final Link<?> actionLink = new Link<Void>("actionLink")
+ final Link actionLink = new Link("actionLink")
{
@Override
public void onClick()
@@ -54,12 +54,12 @@
}
};
add(actionLink);
- actionLink.add(new Label<Integer>("linkClickCount", new PropertyModel<Integer>(this,
+ actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this,
"linkClickCount")));
final TextField<String> field = new TextField<String>("textfield", new Model<String>());
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -67,7 +67,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject() + ", link click count: " +
+ info("Submitted text: " + field.getDefaultModelObject() + ", link click count: " +
linkClickCount);
}
};
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java Sat Jun 28 22:50:41 2008
@@ -40,7 +40,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java Sat Jun 28 22:50:41 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);
@@ -40,14 +40,14 @@
public StatelessPage()
{
setStatelessHint(true);
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java Sat Jun 28 22:50:41 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);
@@ -40,14 +40,14 @@
public StatelessPage1()
{
setStatelessHint(true);
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java Sat Jun 28 22:50:41 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);
@@ -40,14 +40,14 @@
public StatelessPage2()
{
setStatelessHint(true);
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java Sat Jun 28 22:50:41 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);
@@ -40,14 +40,14 @@
public StatelessPage3()
{
setStatelessHint(true);
- add(new Label<String>("message", new SessionModel()));
+ add(new Label("message", new SessionModel()));
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
field.add(NumberValidator.maximum(20));
field.setRequired(true);
- StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
+ StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java Sat Jun 28 22:50:41 2008
@@ -39,7 +39,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
*/
public abstract class CapturingBookmarkablePageRequestTarget extends BookmarkablePageRequestTarget
{
- Class<? extends Page<?>> displayedPageClass;
+ Class<? extends Page> displayedPageClass;
/**
* @see org.apache.wicket.request.target.component.BookmarkablePageRequestTarget#respond(org.apache.wicket.RequestCycle)
@@ -60,7 +60,7 @@
* @param pageParameters
* the page parameters
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTarget(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTarget(
Class<C> capturedPageClass, Class<D> displayedPageClass, PageParameters pageParameters)
{
super(capturedPageClass, pageParameters);
@@ -78,7 +78,7 @@
* @param displayedPageClass
* the bookmarkable page to display in the browser
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTarget(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTarget(
Class<C> capturedPageClass, Class<D> displayedPageClass)
{
super(capturedPageClass);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java Sat Jun 28 22:50:41 2008
@@ -28,8 +28,8 @@
public class CapturingBookmarkablePageRequestTargetUrlCodingStrategy extends
BookmarkablePageRequestTargetUrlCodingStrategy
{
- Class<? extends Page<?>> capturedPageClass;
- Class<? extends Page<?>> displayedPageClass;
+ Class<? extends Page> capturedPageClass;
+ Class<? extends Page> displayedPageClass;
/**
* Construct.
@@ -41,7 +41,7 @@
* @param capturedPageClass
* @param displayedPageClass
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTargetUrlCodingStrategy(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTargetUrlCodingStrategy(
String mountPath, Class<C> capturedPageClass, Class<D> displayedPageClass)
{
super(mountPath, capturedPageClass, null);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author jbq
*/
-public class EmailPage extends WicketExamplePage<Void>
+public class EmailPage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java Sat Jun 28 22:50:41 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.
@@ -43,9 +43,9 @@
public Home()
{
// Hello World as a Static Page
- add(new StaticLink<String>("hellostream", new Model<String>("docs/hello.html")));
+ add(new StaticLink("hellostream", new Model<String>("docs/hello.html")));
// Hello World as a Static Page with XSLT layout
- add(new StaticLink<String>("helloxslt", new Model<String>("xsldocs/hello.html")));
+ add(new StaticLink("helloxslt", new Model<String>("xsldocs/hello.html")));
/*
* Sending a Wicket page by email: all requests to bookmarkable page "Page" will be
@@ -58,9 +58,9 @@
add(new BookmarkablePageLink("emailwicketpage", EmailPage.class));
}
- private class StaticLink<T> extends WebMarkupContainer<T>
+ private class StaticLink 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/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Page.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
* @author jbq
*/
-public class Page extends WicketExamplePage<Void>
+public class Page extends WicketExamplePage
{
/**
* Construct.
@@ -32,6 +32,6 @@
*/
public Page(PageParameters parameters)
{
- add(new Label<String>("uri", parameters.getString("uri")));
+ add(new Label("uri", parameters.getString("uri")));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Sent.java Sat Jun 28 22:50:41 2008
@@ -21,6 +21,6 @@
/**
* @author jbq
*/
-public class Sent extends WicketExamplePage<Void>
+public class Sent extends WicketExamplePage
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return StockQuotePage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
* You can use this component in your webapplication just as you might want to use a
* <code>Label</code>.
*/
-public class StockQuoteLabel extends WebComponent<String>
+public class StockQuoteLabel extends WebComponent
{
/**
* Constructor
@@ -76,7 +76,7 @@
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
- String symbol = getModelObjectAsString();
+ String symbol = getDefaultModelObjectAsString();
StockQuote quote = new StockQuote(symbol);
replaceComponentTagBody(markupStream, openTag, quote.getQuote());
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* Note that this component doesn't work with CompoundPropertyModel's lazy initialization.
*/
-public class StockQuoteLabel2 extends Label<String>
+public class StockQuoteLabel2 extends Label
{
/**
* Constructor taking the symbol directly.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java Sat Jun 28 22:50:41 2008
@@ -30,7 +30,7 @@
*
* @author Martijn Dashorst
*/
-public class StockQuotePage extends WicketExamplePage<Void>
+public class StockQuotePage extends WicketExamplePage
{
/**
* Constructor
@@ -52,12 +52,12 @@
final IModel<String> model = new PropertyModel<String>(quote, "symbol");
// form holding the input field.
- final Form<?> form = new Form<Void>("form");
+ final Form<?> form = new Form("form");
add(form);
form.add(new TextField<String>("symbol", model));
// labels for displaying the chosen symbol
- add(new Label<String>("symbol", model));
+ add(new Label("symbol", model));
// and its quote
add(new StockQuoteLabel("quote", model));
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public abstract class Banner<T> extends Panel<T>
+public abstract class Banner 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/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Banner1<T> extends Banner<T>
+public class Banner1<T> extends Banner
{
/**
* Construct.
@@ -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/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Banner2<T> extends Banner<T>
+public class Banner2<T> extends Banner
{
/**
* Construct.
@@ -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/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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/**
* 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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Eelco Hillenius
*/
-public class Page1 extends WicketExamplePage<Void>
+public class Page1 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class Page2 extends WicketExamplePage<Void>
+public class Page2 extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java Sat Jun 28 22:50:41 2008
@@ -28,10 +28,10 @@
*
* @author Eelco Hillenius
*/
-public class TemplateBorder extends Border<Void>
+public class TemplateBorder extends Border
{
/** the current banner. */
- private Banner<Void> currentBanner;
+ private Banner currentBanner;
/**
* Constructor
@@ -41,8 +41,8 @@
public TemplateBorder(String id)
{
super(id);
- add(currentBanner = new Banner1<Void>("ad"));
- add(new Link<Void>("changeAdLink")
+ add(currentBanner = new Banner1("ad"));
+ add(new Link("changeAdLink")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -52,11 +52,11 @@
{
if (currentBanner.getClass() == Banner1.class)
{
- TemplateBorder.this.replace(currentBanner = new Banner2<Void>("ad"));
+ TemplateBorder.this.replace(currentBanner = new Banner2("ad"));
}
else
{
- TemplateBorder.this.replace(currentBanner = new Banner1<Void>("ad"));
+ TemplateBorder.this.replace(currentBanner = new Banner1("ad"));
}
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java Sat Jun 28 22:50:41 2008
@@ -31,6 +31,6 @@
public Page1()
{
setPageTitle("Template example, page 1");
- add(new Panel1<Void>("panel1"));
+ add(new Panel1("panel1"));
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Panel1<T> extends TemplatePanel<T>
+public class Panel1 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/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java Sat Jun 28 22:50:41 2008
@@ -31,22 +31,22 @@
*
* @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)";
/** the current banner. */
- private Banner<Void> currentBanner;
+ private Banner currentBanner;
/**
* Constructor
*/
public TemplatePage()
{
- add(new Label<String>("title", new PropertyModel<String>(this, "pageTitle")));
- add(currentBanner = new Banner1<Void>("ad"));
- add(new Link<Void>("changeAdLink")
+ add(new Label("title", new PropertyModel<String>(this, "pageTitle")));
+ add(currentBanner = new Banner1("ad"));
+ add(new Link("changeAdLink")
{
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -56,11 +56,11 @@
{
if (currentBanner.getClass() == Banner1.class)
{
- TemplatePage.this.replace(currentBanner = new Banner2<Void>("ad"));
+ TemplatePage.this.replace(currentBanner = new Banner2("ad"));
}
else
{
- TemplatePage.this.replace(currentBanner = new Banner1<Void>("ad"));
+ TemplatePage.this.replace(currentBanner = new Banner1("ad"));
}
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java Sat Jun 28 22:50:41 2008
@@ -23,9 +23,8 @@
* Base panel to be extended.
*
* @author Eelco Hillenius
- * @param <T>
*/
-public abstract class TemplatePanel<T> extends Panel<T>
+public abstract class TemplatePanel extends Panel
{
/**
* Construct.
@@ -46,7 +45,7 @@
* @param model
* the model
*/
- public TemplatePanel(String id, IModel<T> model)
+ public TemplatePanel(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java Sat Jun 28 22:50:41 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";
@@ -55,7 +55,7 @@
* source, which should be updated on every form post (e.g. by overriding {@link Form#onSubmit}
* and in that method explicitly setting the new value). But as you can see, this method is
* slighly easier, and if we wanted to use the translated value in e.g. a database, we could
- * just query this model directly or indirectly by calling {@link Component#getModelObject()} on
+ * just query this model directly or indirectly by calling {@link Component#getDefaultModelObject()} on
* the component that holds it, and we would have a recent value.
*/
private final class ConverterModel extends Model<String>
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return UnicodeConverter.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Sat Jun 28 22:50:41 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.
@@ -76,8 +76,8 @@
protected void populateItem(ListItem<File> listItem)
{
final File file = listItem.getModelObject();
- listItem.add(new Label<String>("file", file.getName()));
- listItem.add(new Link<Void>("delete")
+ listItem.add(new Label("file", file.getName()));
+ listItem.add(new Link("delete")
{
@Override
public void onClick()
@@ -92,7 +92,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form<Void>
+ private class FileUploadForm extends Form
{
// collection that will hold uploaded FileUpload objects
private final Collection<FileUpload> uploads = new ArrayList<FileUpload>();
@@ -187,7 +187,7 @@
add(simpleUploadForm);
// Add folder view
- add(new Label<String>("dir", uploadFolder.getAbsolutePath()));
+ add(new Label("dir", uploadFolder.getAbsolutePath()));
fileListView = new FileListView("fileList", new LoadableDetachableModel<List<File>>()
{
@Override
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java Sat Jun 28 22:50:41 2008
@@ -46,7 +46,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return UploadPage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Sat Jun 28 22:50:41 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.
@@ -73,8 +73,8 @@
protected void populateItem(ListItem<File> listItem)
{
final File file = listItem.getModelObject();
- listItem.add(new Label<String>("file", file.getName()));
- listItem.add(new Link<Void>("delete")
+ listItem.add(new Label("file", file.getName()));
+ listItem.add(new Link("delete")
{
@Override
public void onClick()
@@ -89,7 +89,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form<Void>
+ private class FileUploadForm extends Form
{
private FileUploadField fileUploadField;
@@ -171,7 +171,7 @@
add(simpleUploadForm);
// Add folder view
- add(new Label<String>("dir", uploadFolder.getAbsolutePath()));
+ add(new Label("dir", uploadFolder.getAbsolutePath()));
fileListView = new FileListView("fileList", new LoadableDetachableModel<List<File>>()
{
@Override
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Sat Jun 28 22:50:41 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/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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -21,6 +21,6 @@
/**
* Home page of this example.
*/
-public class Home extends WicketExamplePage<Void>
+public class Home extends WicketExamplePage
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java Sat Jun 28 22:50:41 2008
@@ -38,12 +38,12 @@
*
* @author Eelco Hillenius
*/
-public class TemplatePage extends WicketExamplePage<Void>
+public class TemplatePage extends WicketExamplePage
{
/**
* Form for changing the template contents.
*/
- private final class TemplateForm extends Form<Void>
+ private final class TemplateForm extends Form
{
private TextArea<IStringResourceStream> templateTextArea;
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=672603&r1=672602&r2=672603&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 Jun 28 22:50:41 2008
@@ -80,7 +80,7 @@
* @return class
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java Sat Jun 28 22:50:41 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
@@ -36,9 +36,9 @@
* wizard, there is still the first access to the wizard. But if you link to the page that
* renders it using and internal link, you'll circumvent that.
*/
- private static final class WizardLink extends Link<Void>
+ private static final class WizardLink extends Link
{
- private final Class<? extends Wizard<?>> wizardClass;
+ private final Class<? extends Wizard> wizardClass;
/**
* Construct.
@@ -50,7 +50,7 @@
* @param wizardClass
* Class of the wizard to instantiate
*/
- public <C extends Wizard<?>> WizardLink(String id, Class<C> wizardClass)
+ public <C extends Wizard> WizardLink(String id, Class<C> wizardClass)
{
super(id);
this.wizardClass = wizardClass;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java Sat Jun 28 22:50:41 2008
@@ -43,13 +43,13 @@
/**
* This wizard shows some basic form use. It uses custom panels for the form elements, and a single
- * domain object ({@link User}) as it's subject. Also, the user roles step}is an optional step,
- * that will only be executed when assignRoles is true (and that value is edited in the user details
+ * domain object ({@link User}) as it's subject. Also, the user roles step}is an optional step, that
+ * will only be executed when assignRoles is true (and that value is edited in the user details
* step).
*
* @author Eelco Hillenius
*/
-public class NewUserWizard extends Wizard<NewUserWizard>
+public class NewUserWizard extends Wizard
{
/**
* The confirmation step.
@@ -72,7 +72,7 @@
/**
* The user details step.
*/
- private final class UserDetailsStep extends WizardStep<Void>
+ private final class UserDetailsStep extends WizardStep
{
/**
* Construct.
@@ -92,7 +92,7 @@
/**
* The user name step.
*/
- private final class UserNameStep extends WizardStep<Void>
+ private final class UserNameStep extends WizardStep
{
/**
* Construct.
@@ -108,7 +108,7 @@
/**
* The user details step.
*/
- private final class UserRolesStep extends WizardStep<Void> implements ICondition
+ private final class UserRolesStep extends WizardStep implements ICondition
{
/**
* Construct.
@@ -125,7 +125,7 @@
add(rolesSetNameField);
add(new AbstractFormValidator()
{
- public FormComponent<?>[] getDependentFormComponents()
+ public FormComponent[] getDependentFormComponents()
{
// name and roles don't have anything to validate,
// so might as well just skip them here
@@ -178,7 +178,7 @@
// create a blank user
user = new User();
- setModel(new CompoundPropertyModel<NewUserWizard>(this));
+ setDefaultModel(new CompoundPropertyModel<NewUserWizard>(this));
WizardModel model = new WizardModel();
model.add(new UserNameStep());
model.add(new UserDetailsStep());
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java Sat Jun 28 22:50:41 2008
@@ -31,7 +31,7 @@
*
* @author Eelco Hillenius
*/
-public class StaticWizard extends Wizard<Void>
+public class StaticWizard extends Wizard
{
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java Sat Jun 28 22:50:41 2008
@@ -32,13 +32,13 @@
*
* @author Eelco Hillenius
*/
-public class StaticWizardWithPanels extends Wizard<Void>
+public class StaticWizardWithPanels extends Wizard
{
/**
* The first step of this wizard.
*/
- private static final class Step1 extends WizardStep<Void>
+ private static final class Step1 extends WizardStep
{
/**
* Construct.
@@ -52,7 +52,7 @@
/**
* The second step of this wizard.
*/
- private static final class Step2 extends WizardStep<Void>
+ private static final class Step2 extends WizardStep
{
/**
* Construct.
@@ -66,7 +66,7 @@
/**
* The third step of this wizard.
*/
- private static final class Step3 extends WizardStep<Void>
+ private static final class Step3 extends WizardStep
{
/**
* Construct.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java Sat Jun 28 22:50:41 2008
@@ -30,7 +30,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardPage extends WicketExamplePage<Void>
+public class WizardPage extends WicketExamplePage
{
/**
* Construct.
@@ -37,7 +37,7 @@
* @param wizardClass
* class of the wizard component
*/
- public <C extends Wizard<?>> WizardPage(Class<C> wizardClass)
+ public <C extends Wizard> WizardPage(Class<C> wizardClass)
{
if (wizardClass == null)
{
@@ -45,8 +45,8 @@
}
try
{
- Constructor<? extends Wizard<?>> ctor = wizardClass.getConstructor(String.class);
- Wizard<?> wizard = ctor.newInstance("wizard");
+ Constructor<? extends Wizard> ctor = wizardClass.getConstructor(String.class);
+ Wizard wizard = ctor.newInstance("wizard");
add(wizard);
}
catch (Exception e)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class BasePage extends WicketExamplePage<Void>
+public class BasePage extends WicketExamplePage
{
/**
* Construct.
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java Sat Jun 28 22:50:41 2008
@@ -125,7 +125,7 @@
Assert.assertNotNull(cookieUsername);
- Assert.assertEquals(cookieUsername.getValue(), username.getModelObjectAsString());
+ Assert.assertEquals(cookieUsername.getValue(), username.getDefaultModelObjectAsString());
}
/**
@@ -169,10 +169,10 @@
Cookie cookie = (Cookie)iter.next();
Assert.assertNotNull(page.get(cookie.getName()));
// Skip "deleted" cookies
- if (page.get(cookie.getName()).getModelObjectAsString() != "")
+ if (page.get(cookie.getName()).getDefaultModelObjectAsString() != "")
{
Assert.assertEquals(cookie.getValue(), page.get(cookie.getName())
- .getModelObjectAsString());
+ .getDefaultModelObjectAsString());
}
}
}
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/MockPage.java Sat Jun 28 22:50:41 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/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Sat Jun 28 22:50:41 2008
@@ -139,7 +139,7 @@
@SuppressWarnings("unchecked")
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices)
{
- this(id, model, Model.valueOf(choices));
+ this(id, model, Model.of(choices));
}
/**
@@ -158,7 +158,7 @@
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices,
IChoiceRenderer<T> renderer)
{
- this(id, model, Model.valueOf(choices), renderer);
+ this(id, model, Model.of(choices), renderer);
}
@@ -167,8 +167,7 @@
* java.lang.String, org.apache.wicket.model.IModel)
*/
@Override
- protected FormComponent<T> newEditor(MarkupContainer<?> parent, String componentId,
- IModel<T> model)
+ protected FormComponent<T> newEditor(MarkupContainer parent, String componentId, IModel<T> model)
{
IModel<List<? extends T>> choiceModel = new AbstractReadOnlyModel<List<? extends T>>()
{
@@ -222,10 +221,9 @@
}
@Override
- protected WebComponent<T> newLabel(MarkupContainer<?> parent, String componentId,
- IModel<T> model)
+ protected WebComponent newLabel(MarkupContainer parent, String componentId, IModel<T> model)
{
- Label<T> label = new Label<T>(componentId, model)
+ Label label = new Label(componentId, model)
{
private static final long serialVersionUID = 1L;
@@ -236,13 +234,14 @@
return c != null ? c : super.getConverter(type);
}
+ @SuppressWarnings("unchecked")
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- String displayValue = getModelObjectAsString();
+ String displayValue = getDefaultModelObjectAsString();
if (renderer != null)
{
- Object displayObject = renderer.getDisplayValue(getModelObject());
+ Object displayObject = renderer.getDisplayValue((T)getDefaultModelObject());
Class<?> objectClass = (displayObject == null ? null : displayObject.getClass());