Author: thrantal
Date: Sat Sep 6 15:48:30 2008
New Revision: 692759
URL: http://svn.apache.org/viewvc?rev=692759&view=rev
Log:
WICKET-1745: Adding missing type parameters, mostly to Model
- and some other fixes not changing the functionality, such as adding missing
@Overrides
LabelTree and LinkTree are a bit problematic, maybe we need a TreeModelModel :)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/InvalidImagePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifier.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
Sat Sep 6 15:48:30 2008
@@ -23,7 +23,7 @@
* <p>
*
* <pre>
- * new DropDownChoice("users", new Model(selectedUser), listOfUsers)
+ * new DropDownChoice<User>("users", new
Model<User>(selectedUser), listOfUsers)
* </pre>
*
* creates a DropDownChoice of users and the display value will be toString()
and the id the index
@@ -32,7 +32,7 @@
* <p>
*
* <pre>
- * new DropDownChoice("users", new Model(selectedUser), listOfUsers,
new ChoiceRenderer("name"))
+ * new DropDownChoice<User>("users", new
Model<User>(selectedUser), listOfUsers, new
ChoiceRenderer<User>("name"))
* </pre>
*
* creates a DropDownChoice of users and the display value will be looked up
by property expression
@@ -41,7 +41,7 @@
* <p>
*
* <pre>
- * new DropDownChoice("users", new Model(selectedUser), listOfUsers,
new ChoiceRenderer("name", "id"))
+ * new DropDownChoice<User>("users", new
Model<User>(selectedUser), listOfUsers, new
ChoiceRenderer<User>("name", "id"))
* </pre>
*
* creates a DropDownChoice of users and the display value will be looked up
by property expression
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
Sat Sep 6 15:48:30 2008
@@ -33,9 +33,6 @@
* [EMAIL PROTECTED] LocalizedImageResource}.
*
* @author Jonathan Locke
- *
- * @param <T>
- * The model object type, can be only of type Resource,
ResouceReference or a String
*/
public class ImageButton extends Button implements IResourceListener
{
@@ -138,7 +135,7 @@
@SuppressWarnings("unchecked")
public ImageButton(final String id, final String string)
{
- this(id, new Model(string));
+ this(id, new Model<String>(string));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
Sat Sep 6 15:48:30 2008
@@ -138,7 +138,7 @@
@SuppressWarnings("unchecked")
public Image(final String id, final String string)
{
- this(id, new Model(string));
+ this(id, new Model<String>(string));
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
Sat Sep 6 15:48:30 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.html.tree;
import java.io.Serializable;
-
import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
@@ -72,12 +71,14 @@
* @see
org.apache.wicket.markup.html.tree.BaseTree#newNodeComponent(java.lang.String,
* org.apache.wicket.model.IModel)
*/
+ @Override
protected Component newNodeComponent(String id, IModel<Object> model)
{
return new LabelIconPanel(id, model, this)
{
private static final long serialVersionUID = 1L;
+ @Override
protected Component newContentComponent(String
componentId, BaseTree tree,
IModel<Object> model)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Sat Sep 6 15:48:30 2008
@@ -71,7 +71,7 @@
* And in the java
*
* <pre>
- * add(new Label("amount", new Model("$5.00")));
+ * add(new Label("amount", new
Model<String>("$5.00")));
* add(new BookmarkablePageLink("link", DetailsPage.class));
* </pre>
*
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
Sat Sep 6 15:48:30 2008
@@ -104,7 +104,7 @@
* {
* WeatherStation ws = new WeatherStation();
* add(new Label("weatherMessage",
- * new StringResourceModel("weather.${currentStatus}",
this, new Model(ws)));
+ * new StringResourceModel("weather.${currentStatus}",
this, new Model<String>(ws)));
* }
* }
* </pre>
@@ -132,7 +132,7 @@
* {
* WeatherStation ws = new WeatherStation();
* add(new Label("weatherMessage",
- * new StringResourceModel("weather.message", this, new
Model(ws)));
+ * new StringResourceModel("weather.message", this, new
Model<String>(ws)));
* }
* }
* </pre>
@@ -151,16 +151,16 @@
* public MyPage(final PageParameters parameters)
* {
* WeatherStation ws = new WeatherStation();
- * Model model = new Model(ws);
+ * IModel<WeatherStation> model = new
Model<WeatherStation>(ws);
* add(new Label("weatherMessage",
* new StringResourceModel(
* "weather.detail", this, model,
* new Object[]
* {
* new Date(),
- * new PropertyModel(model, "currentStatus"),
- * new PropertyModel(model,
"currentTemperature"),
- * new PropertyModel(model, "units")
+ * new PropertyModel<?>(model,
"currentStatus"),
+ * new PropertyModel<?>(model,
"currentTemperature"),
+ * new PropertyModel<?>(model, "units")
* }));
* }
* }
@@ -256,7 +256,7 @@
{
return StringResourceModel.this;
}
- };
+ }
/**
* Construct.
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
Sat Sep 6 15:48:30 2008
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
/**
@@ -38,12 +38,12 @@
*/
public CheckGroupTestPage5()
{
- List list = new ArrayList();
- Form form = new Form("form");
- CheckGroup group = new CheckGroup("group", new
Model((Serializable)list));
+ List<String> list = new ArrayList<String>();
+ Form<Void> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new
CollectionModel<String>(list));
WebMarkupContainer container = new
WebMarkupContainer("container");
- Check check1 = new Check("check1", new Model("check1"));
- Check check2 = new Check("check2", new Model("check2"));
+ Check<String> check1 = new Check<String>("check1", new
Model<String>("check1"));
+ Check<String> check2 = new Check<String>("check2", new
Model<String>("check2"));
add(form);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
Sat Sep 6 15:48:30 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import java.io.Serializable;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -46,7 +48,7 @@
ft.submit();
}
- private static class TestFormComponentPanel extends FormComponentPanel
+ private static class TestFormComponentPanel extends
FormComponentPanel<Serializable>
implements
IMarkupResourceStreamProvider
{
@@ -55,10 +57,10 @@
private boolean childValidated = false;
private boolean childModelUpdated = false;
- private TestFormComponentPanel(String id, IModel model)
+ private TestFormComponentPanel(String id, IModel<Serializable>
model)
{
super(id, model);
- add(new TextField("text", new Model())
+ add(new TextField<Serializable>("text", new
Model<Serializable>())
{
private static final long serialVersionUID = 1L;
@@ -109,7 +111,7 @@
}
public IResourceStream getMarkupResourceStream(MarkupContainer
container,
- Class containerClass)
+ Class<?> containerClass)
{
return new StringResourceStream(
"<wicket:panel><input wicket:id='text'
type='text'/></wicket:panel>");
@@ -123,13 +125,13 @@
public TestPage()
{
- Form form = new Form("form");
+ Form<Void> form = new Form<Void>("form");
add(form);
- form.add(new TestFormComponentPanel("panel", new
Model()));
+ form.add(new TestFormComponentPanel("panel", new
Model<Serializable>()));
}
public IResourceStream getMarkupResourceStream(MarkupContainer
container,
- Class containerClass)
+ Class<?> containerClass)
{
return new StringResourceStream(
"<body><form wicket:id='form'><div
wicket:id='panel'></div></form></body>");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java
Sat Sep 6 15:48:30 2008
@@ -38,12 +38,12 @@
*/
public RadioGroupDisabledTestPage()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new
Model<String>("radio2"));
group.setRenderBodyOnly(false);
WebMarkupContainer container = new
WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new
Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new
Model<String>("radio2"));
add(form);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
Sat Sep 6 15:48:30 2008
@@ -18,7 +18,6 @@
import java.io.Serializable;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -107,38 +106,39 @@
MockModelObject modelObject = new MockModelObject();
// object used to test regular model
- Model model = new Model();
+ Model<String> model = new Model<String>();
// set up necessary objects to emulate a form submission
- RequestCycle cycle = tester.createRequestCycle();
+ tester.createRequestCycle();
// this could have been any page it seems. see comment at method
MockPage page = new MockPage();
// create component hierarchy
- final Form form = new Form("form", new
CompoundPropertyModel(modelObject))
+ final Form<MockModelObject> form = new
Form<MockModelObject>("form", new
CompoundPropertyModel<MockModelObject>(modelObject))
{
private static final long serialVersionUID = 1L;
- public String getMarkupId()
+ @Override
+ public String getMarkupId()
{
// hack for the fact that this test doesn't
relate to any markup
return "foo";
}
};
- final RadioGroup group = new RadioGroup("prop1");
+ final RadioGroup<String> group = new
RadioGroup<String>("prop1");
final WebMarkupContainer container = new
WebMarkupContainer("container");
- final Radio choice1 = new Radio("radio1", new Model(radio1));
- final Radio choice2 = new Radio("prop2");
+ final Radio<String> choice1 = new Radio<String>("radio1", new
Model<String>(radio1));
+ final Radio<String> choice2 = new Radio<String>("prop2");
- final RadioGroup group2 = new RadioGroup("group2", model);
+ final RadioGroup<String> group2 = new
RadioGroup<String>("group2", model);
- final Radio choice3 = new Radio("radio3", new Model(radio1));
+ final Radio<String> choice3 = new Radio<String>("radio3", new
Model<String>(radio1));
page.add(form);
form.add(group);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java
Sat Sep 6 15:48:30 2008
@@ -38,11 +38,11 @@
*/
public RadioGroupTestPage1()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new
Model<String>("radio2"));
WebMarkupContainer container = new
WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new
Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new
Model<String>("radio2"));
add(form);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java
Sat Sep 6 15:48:30 2008
@@ -38,11 +38,11 @@
*/
public RadioGroupTestPage2()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new
Model<String>("radio2"));
WebMarkupContainer container = new
WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new
Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new
Model<String>("radio2"));
add(form);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
Sat Sep 6 15:48:30 2008
@@ -34,15 +34,16 @@
*/
public FeedbackFormPage()
{
- final TextField tf = new TextField("input", new Model());
+ final TextField<String> tf = new TextField<String>("input", new
Model<String>());
final FormComponentFeedbackBorder feedback = new
FormComponentFeedbackBorder("feedback");
feedback.add(tf);
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
- protected void onSubmit()
+ @Override
+ protected void onSubmit()
{
tf.error("an error");
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
Sat Sep 6 15:48:30 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.feedback;
+import java.io.Serializable;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
@@ -34,15 +36,16 @@
*/
public FeedbackIndicatorFormPage()
{
- final TextField tf = new TextField("input", new Model());
+ final TextField<Serializable> tf = new
TextField<Serializable>("input", new Model<Serializable>());
final FormComponentFeedbackIndicator feedback = new
FormComponentFeedbackIndicator(
"feedback");
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
- protected void onSubmit()
+ @Override
+ protected void onSubmit()
{
tf.error("an error");
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
Sat Sep 6 15:48:30 2008
@@ -29,6 +29,6 @@
public InvalidImageButtonPage()
{
- add(new ImageButton("invalidImage", new Model("toto.gif")));
+ add(new ImageButton("invalidImage", new
Model<String>("toto.gif")));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
Sat Sep 6 15:48:30 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.login;
+import java.io.Serializable;
+
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
@@ -37,9 +39,9 @@
private static final Logger log =
LoggerFactory.getLogger(MockLoginPage.class);
- private Form form;
+ private Form<Void> form;
- private TextField textField;
+ private TextField<Serializable> textField;
/**
*
@@ -48,17 +50,17 @@
{
super();
add(new Label("label", "welcome please login"));
- add(form = new Form("form")
+ add(form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit()
{
-
login(get("username").getDefaultModelObjectAsString().toString());
+
login(get("username").getDefaultModelObjectAsString());
}
});
- form.add(textField = new TextField("username", new Model()));
+ form.add(textField = new TextField<Serializable>("username",
new Model<Serializable>()));
}
/**
@@ -80,7 +82,7 @@
*
* @return form
*/
- public final Form getForm()
+ public final Form<Void> getForm()
{
return form;
}
@@ -89,7 +91,7 @@
*
* @return textfield
*/
- public final TextField getTextField()
+ public final TextField<Serializable> getTextField()
{
return textField;
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
Sat Sep 6 15:48:30 2008
@@ -50,7 +50,7 @@
*
* @author Juergen Donnerstag
*/
- public final class TestForm extends Form
+ public final class TestForm extends Form<Void>
{
private static final long serialVersionUID = 1L;
@@ -64,13 +64,14 @@
{
super(id);
- add(new TextField("input", new Model("test")));
+ add(new TextField<String>("input", new
Model<String>("test")));
}
/**
* Dummy
*/
- public final void onSubmit()
+ @Override
+ public final void onSubmit()
{
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/InvalidImagePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/InvalidImagePage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/InvalidImagePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/InvalidImagePage.java
Sat Sep 6 15:48:30 2008
@@ -28,6 +28,6 @@
public InvalidImagePage()
{
- add(new Image("invalidImage", new Model("toto.gif")));
+ add(new Image("invalidImage", new Model<String>("toto.gif")));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
Sat Sep 6 15:48:30 2008
@@ -28,11 +28,12 @@
*/
public ExternalLinkPage_2()
{
- add(new ExternalLink("myLink", new Model(null))
+ add(new ExternalLink("myLink", new Model<String>(null))
{
private static final long serialVersionUID = 1L;
- public boolean isVisible()
+ @Override
+ public boolean isVisible()
{
return getDefaultModelObject() != null;
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
Sat Sep 6 15:48:30 2008
@@ -19,8 +19,7 @@
import java.util.ArrayList;
import junit.framework.TestCase;
-
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -37,19 +36,20 @@
* of elements to go into the list
* @return list view
*/
- private ListView createListView(final int modelListSize)
+ private ListView<Integer> createListView(final int modelListSize)
{
- ArrayList modelList = new ArrayList();
+ ArrayList<Integer> modelList = new ArrayList<Integer>();
for (int i = 0; i < modelListSize; i++)
{
- modelList.add(new Integer(i));
+ modelList.add(i);
}
- return new ListView("listView", new Model(modelList))
+ return new ListView<Integer>("listView", new
ListModel<Integer>(modelList))
{
private static final long serialVersionUID = 1L;
- protected void populateItem(final ListItem listItem)
+ @Override
+ protected void populateItem(final ListItem<Integer> listItem)
{
// do nothing
}
@@ -63,7 +63,7 @@
{
WicketTester tester = new WicketTester();
- ListView lv = createListView(4);
+ ListView<Integer> lv = createListView(4);
assertEquals(4, lv.getList().size());
assertEquals(4, lv.getViewSize());
assertEquals(0, lv.getStartIndex());
@@ -102,18 +102,19 @@
WicketTester tester = new WicketTester();
// Empty tables
- ListView lv = createListView(0);
+ ListView<?> lv = createListView(0);
assertEquals(0, lv.getStartIndex());
assertEquals(0, lv.getViewSize());
// null tables are a special case used for table navigation
// bar, where there is no underlying model necessary, as
// listItem.getIndex() is equal to the required
listItem.getModelObject()
- lv = new ListView("listView", new Model(null))
+ lv = new ListView<Void>("listView", new ListModel<Void>())
{
private static final long serialVersionUID = 1L;
- protected void populateItem(final ListItem listItem)
+ @Override
+ protected void populateItem(final ListItem<Void> listItem)
{
// do nothing
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
Sat Sep 6 15:48:30 2008
@@ -17,9 +17,10 @@
package org.apache.wicket.markup.html.list;
import java.util.ArrayList;
+import java.util.List;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
/**
@@ -47,19 +48,20 @@
* size of a page
* @return table
*/
- private PageableListView createTable(final int modelListSize, final int
pageSize)
+ private PageableListView<Integer> createTable(final int modelListSize,
final int pageSize)
{
- ArrayList modelList = new ArrayList();
+ List<Integer> modelList = new ArrayList<Integer>();
for (int i = 0; i < modelListSize; i++)
{
- modelList.add(new Integer(i));
+ modelList.add(i);
}
- return new PageableListView("table", new Model(modelList),
pageSize)
+ return new PageableListView<Integer>("table", new
ListModel<Integer>(modelList), pageSize)
{
private static final long serialVersionUID = 1L;
- protected void populateItem(final ListItem listItem)
+ @Override
+ protected void populateItem(final ListItem<Integer> listItem)
{
// do nothing
}
@@ -71,7 +73,7 @@
*/
public void testTable()
{
- PageableListView table = createTable(20, 4);
+ PageableListView<?> table = createTable(20, 4);
assertEquals(4, table.getRowsPerPage());
assertEquals(0, table.getCurrentPage());
assertEquals(5, table.getPageCount());
@@ -103,7 +105,7 @@
*/
public void testEmptyTable()
{
- PageableListView table = createTable(0, 4);
+ PageableListView<?> table = createTable(0, 4);
assertEquals(4, table.getRowsPerPage());
assertEquals(0, table.getCurrentPage());
assertEquals(0, table.getPageCount());
@@ -112,11 +114,12 @@
// null tables are a special case used for table navigation
// bar, where there is no underlying model necessary, as
// listItem.getIndex() is equal to the required
listItem.getModelObject()
- table = new PageableListView("table", new Model(null), 10)
+ table = new PageableListView<Void>("table", new
ListModel<Void>(), 10)
{
private static final long serialVersionUID = 1L;
- protected void populateItem(final ListItem listItem)
+ @Override
+ protected void populateItem(final ListItem<Void> listItem)
{
// do nothing
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifier.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifier.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifier.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifier.java
Sat Sep 6 15:48:30 2008
@@ -36,6 +36,6 @@
public PanelWithAttributeModifier(final String id)
{
super(id);
- add(new AttributeModifier("class", true, new Model("test")));
+ add(new AttributeModifier("class", true, new
Model<String>("test")));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
Sat Sep 6 15:48:30 2008
@@ -40,13 +40,14 @@
*/
public HeaderSectionMyLabel(final String id, final String label)
{
- super(id, new Model(label));
+ super(id, new Model<String>(label));
}
/**
* @see
org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
+ @Override
protected void onComponentTagBody(final MarkupStream markupStream,
final ComponentTag openTag)
{
replaceComponentTagBody(markupStream, openTag,
getDefaultModelObjectAsString());
@@ -58,6 +59,7 @@
*
* @see
org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
*/
+ @Override
public void renderHead(HtmlHeaderContainer container)
{
this.renderHeadFromAssociatedMarkupFile(container);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
Sat Sep 6 15:48:30 2008
@@ -38,12 +38,13 @@
*/
public HeaderSectionMyLabel2(final String id, final String label)
{
- super(id, new Model(label));
+ super(id, new Model<String>(label));
}
/**
* @param container
*/
+ @Override
public void renderHead(HtmlHeaderContainer container)
{
this.getResponse().write("text added by contributor");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_2.java
Sat Sep 6 15:48:30 2008
@@ -36,7 +36,7 @@
*/
public SimplePage_2()
{
- add(new Label("amount", new
Model("$5.00")).setRenderBodyOnly(true));
+ add(new Label("amount", new
Model<String>("$5.00")).setRenderBodyOnly(true));
add(new BookmarkablePageLink("link", SimplePage_1.class));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePage_3.java
Sat Sep 6 15:48:30 2008
@@ -37,7 +37,7 @@
{
ValueMap modelData = new ValueMap();
modelData.put("testData", "123456");
- setDefaultModel(new Model(modelData));
+ setDefaultModel(new Model<ValueMap>(modelData));
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
Sat Sep 6 15:48:30 2008
@@ -23,8 +23,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.MockPage;
import org.apache.wicket.protocol.http.WebRequestCycle;
@@ -44,7 +42,7 @@
private WeatherStation ws;
- private Model wsModel;
+ private IModel<WeatherStation> wsModel;
/**
* Create the test case.
@@ -57,6 +55,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
tester = new WicketTester();
@@ -64,9 +63,10 @@
new
BundleStringResourceLoader("org.apache.wicket.model.StringResourceModelTest"));
page = new MockPage();
ws = new WeatherStation();
- wsModel = new Model(ws);
+ wsModel = new Model<WeatherStation>(ws);
}
+ @Override
protected void tearDown() throws Exception
{
tester.destroy();
@@ -141,17 +141,17 @@
public void testSubstitutedPropertyAndParameterResource()
{
StringResourceModel model = new
StringResourceModel("weather.mixed", page, wsModel,
- new Object[] { new PropertyModel(wsModel,
"currentTemperature"),
- new PropertyModel(wsModel, "units") });
+ new Object[] { new PropertyModel<Double>(wsModel,
"currentTemperature"),
+ new PropertyModel<String>(wsModel,
"units") });
MessageFormat format = new MessageFormat(
"Weather station \"Europe''s main weather station\"
reports that the temperature is {0} {1}");
ws.setCurrentTemperature(25.7);
- String expected = format.format(new Object[] { new
Double(25.7), "\u00B0C" });
+ String expected = format.format(new Object[] { 25.7, "\u00B0C"
});
Assert.assertEquals("Text should be as expected", expected,
model.getString());
ws.setCurrentTemperature(11.5);
- expected = format.format(new Object[] { new Double(11.5),
"\u00B0C" });
+ expected = format.format(new Object[] { 11.5, "\u00B0C" });
Assert.assertEquals("Text should be as expected", expected,
model.getString());
}
@@ -168,14 +168,14 @@
page.getLocale());
StringResourceModel model = new
StringResourceModel("weather.detail", page, wsModel,
new Object[] { cal.getTime(), "${currentStatus}",
- new PropertyModel(wsModel,
"currentTemperature"),
- new PropertyModel(wsModel, "units") });
- String expected = format.format(new Object[] { cal.getTime(),
"sunny", new Double(25.7),
+ new PropertyModel<Double>(wsModel,
"currentTemperature"),
+ new PropertyModel<String>(wsModel,
"units") });
+ String expected = format.format(new Object[] { cal.getTime(),
"sunny", 25.7,
"\u00B0C" });
Assert.assertEquals("Text should be as expected", expected,
model.getString());
ws.setCurrentStatus("raining");
ws.setCurrentTemperature(11.568);
- expected = format.format(new Object[] { cal.getTime(),
"raining", new Double(11.568),
+ expected = format.format(new Object[] { cal.getTime(),
"raining", 11.568,
"\u00B0C" });
Assert.assertEquals("Text should be as expected", expected,
model.getString());
}
@@ -185,7 +185,7 @@
{
tester.getWicketSession().setLocale(Locale.ENGLISH);
StringResourceModel model = new
StringResourceModel("with.quote", page, null, new Object[] {
- new Integer(10), new Integer(20) });
+ 10, 20});
assertEquals("2010.00", model.getString());
}
@@ -236,8 +236,7 @@
{
StringResourceModel model = new
StringResourceModel("simple.text", page, wsModel);
tester.setupRequestAndResponse();
- RequestCycle cycle = new
WebRequestCycle(tester.getApplication(),
- tester.getWicketRequest(), tester.getWicketResponse());
+ new WebRequestCycle(tester.getApplication(),
tester.getWicketRequest(), tester.getWicketResponse());
model.getObject();
Assert.assertNotNull(model.getLocalizer());
model.detach();
@@ -249,11 +248,12 @@
*/
public void testDetachAttachDetachableModel() throws Exception
{
- IModel wsDetachModel = new LoadableDetachableModel()
+ IModel<WeatherStation> wsDetachModel = new
LoadableDetachableModel<WeatherStation>()
{
private static final long serialVersionUID = 1L;
- protected Object load()
+ @Override
+ protected WeatherStation load()
{
return new WeatherStation();
}
@@ -262,8 +262,7 @@
};
StringResourceModel model = new
StringResourceModel("simple.text", page, wsDetachModel);
tester.setupRequestAndResponse();
- RequestCycle cycle = new
WebRequestCycle(tester.getApplication(),
- tester.getWicketRequest(), tester.getWicketResponse());
+ new WebRequestCycle(tester.getApplication(),
tester.getWicketRequest(), tester.getWicketResponse());
model.getObject();
Assert.assertNotNull(model.getLocalizer());
model.detach();
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java?rev=692759&r1=692758&r2=692759&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
Sat Sep 6 15:48:30 2008
@@ -47,27 +47,29 @@
add(new BookmarkablePageLink("indexLink", Index.class));
// Action link counts link clicks
- final Link actionLink = new Link("actionLink")
+ final Link<Void> actionLink = new Link<Void>("actionLink")
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick()
{
linkClickCount++;
}
};
add(actionLink);
- actionLink.add(new Label("linkClickCount", new
PropertyModel(this, "linkClickCount")));
+ actionLink.add(new Label("linkClickCount", new
PropertyModel<Integer>(this, "linkClickCount")));
- final TextField field = new TextField("textfield", new Model());
+ final TextField<String> field = new
TextField<String>("textfield", new Model<String>());
- StatelessForm statelessForm = new StatelessForm("statelessform")
+ StatelessForm<Void> statelessForm = new
StatelessForm<Void>("statelessform")
{
private static final long serialVersionUID = 1L;
/**
* @see
org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
protected void onSubmit()
{
info("Submitted text: " +
field.getDefaultModelObject() + ", link click count: " +
