Author: thrantal
Date: Sat Sep 6 15:14:52 2008
New Revision: 692750
URL: http://svn.apache.org/viewvc?rev=692750&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
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
Sat Sep 6 15:14:52 2008
@@ -33,8 +33,8 @@
* can be modified with these AttributeAppenders:
*
* <pre>
- * link.add(new AttributeAppender("class", new
Model("hot"), " "));
- * link.add(new AttributeAppender("onmouseover", new
Model("foo();return false;"), ";"));
+ * link.add(new AttributeAppender("class", new
Model<String>("hot"), " "));
+ * link.add(new AttributeAppender("onmouseover", new
Model<String>("foo();return false;"), ";"));
* </pre>
*
* this will result in the following markup:
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
Sat Sep 6 15:14:52 2008
@@ -80,7 +80,7 @@
}
/**
- * Convenience constructor. Same as Label(String, new Model(String))
+ * Convenience constructor. Same as Label(String, new
Model<String>(String))
*
* @param id
* See Component
@@ -92,7 +92,7 @@
@SuppressWarnings("unchecked")
public Label(final String id, String label)
{
- this(id, new Model(label));
+ this(id, new Model<String>(label));
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
Sat Sep 6 15:14:52 2008
@@ -49,7 +49,7 @@
}
/**
- * Convenience constructor. Same as MultiLineLabel(String, new
Model(String))
+ * Convenience constructor. Same as MultiLineLabel(String, new
Modell<String>(String))
*
* @param id
* See Component
@@ -61,7 +61,7 @@
@SuppressWarnings("unchecked")
public MultiLineLabel(final String id, String label)
{
- this(id, new Model(label));
+ this(id, new Model<String>(label));
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
Sat Sep 6 15:14:52 2008
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -26,7 +25,7 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.string.Strings;
@@ -83,7 +82,7 @@
*/
public CheckGroup(String id, Collection<T> collection)
{
- this(id, new Model((Serializable)collection));
+ this(id, new CollectionModel<T>(collection));
}
/**
@@ -96,7 +95,7 @@
}
/**
- * @see
org.apache.wicket.markup.html.form.FormComponent#convertValue(String[])
+ * @see FormComponent#convertValue(String[])
*/
@Override
protected Collection<T> convertValue(String[] values) throws
ConversionException
@@ -174,7 +173,7 @@
/**
* Check group does not support persistence through cookies
*
- * @see
org.apache.wicket.markup.html.form.FormComponent#supportsPersistence()
+ * @see FormComponent#supportsPersistence()
*/
@Override
protected final boolean supportsPersistence()
@@ -183,8 +182,7 @@
}
/**
- * @see
org.apache.wicket.markup.html.form.FormComponent#onComponentTag(org.apache.wicket.markup.
- * ComponentTag)
+ * @see FormComponent#onComponentTag(ComponentTag)
*/
@Override
protected void onComponentTag(ComponentTag tag)
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java
Sat Sep 6 15:14:52 2008
@@ -39,17 +39,17 @@
public AttributeModifierComponentPage()
{
// Label with attribute modifier
- Label label1 = new Label("label1", new Model("Label 1"));
+ Label label1 = new Label("label1", new Model<String>("Label
1"));
add(label1);
// Label with override attribute modifier
- Label label2 = new Label("label2", new Model("Label 2"));
- label2.add(new AttributeModifier("class", new
Model("overrideLabel")));
- label2.add(new AttributeModifier("unknown", new
Model("invalid")));
+ Label label2 = new Label("label2", new Model<String>("Label
2"));
+ label2.add(new AttributeModifier("class", new
Model<String>("overrideLabel")));
+ label2.add(new AttributeModifier("unknown", new
Model<String>("invalid")));
add(label2);
// Label with attribute inserter
- Label label3 = new Label("label3", new Model("Label 3"));
+ Label label3 = new Label("label3", new Model<String>("Label
3"));
label3.add(new AttributeModifier("class", true, new
LoadableDetachableModel()
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierTest.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierTest.java
Sat Sep 6 15:14:52 2008
@@ -20,7 +20,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.model.Model;
@@ -52,7 +51,7 @@
{
try
{
- new AttributeModifier(null, new Model("model"));
+ new AttributeModifier(null, new Model<String>("model"));
Assert.fail("IllegalArgumentException should be thrown
on null attribute name");
}
catch (IllegalArgumentException e)
@@ -80,8 +79,8 @@
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("foo");
tag.setName("test");
- modifier.replaceAttibuteValue(null, tag);
- Map attributes = tag.getAttributes();
+ modifier.replaceAttributeValue(null, tag);
+ Map<String, Object> attributes = tag.getAttributes();
assertTrue(attributes.isEmpty());
}
@@ -94,7 +93,8 @@
{
private static final long serialVersionUID = 1L;
- protected String newValue(String currentValue, String
replacementValue)
+ @Override
+ protected String newValue(String currentValue, String
replacementValue)
{
return "the replacement";
}
@@ -103,8 +103,8 @@
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- modifier.replaceAttibuteValue(null, tag);
- Map attributes = tag.getAttributes();
+ modifier.replaceAttributeValue(null, tag);
+ Map<String,Object> attributes = tag.getAttributes();
assertTrue(!attributes.isEmpty());
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
@@ -116,14 +116,14 @@
*/
public void testModelReplacement()
{
- AttributeModifier modifier = new AttributeModifier("test",
true, new Model(
+ AttributeModifier modifier = new AttributeModifier("test",
true, new Model<String>(
"Ellioth Smith Rocks"));
XmlTag xmlTag = new XmlTag();
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- modifier.replaceAttibuteValue(null, tag);
- Map attributes = tag.getAttributes();
+ modifier.replaceAttributeValue(null, tag);
+ Map<String,Object> attributes = tag.getAttributes();
assertTrue(!attributes.isEmpty());
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
@@ -135,14 +135,14 @@
*/
public void testNoModelReplacementForNonExistingAttributeValue()
{
- AttributeModifier modifier = new AttributeModifier("test",
false, new Model(
+ AttributeModifier modifier = new AttributeModifier("test",
false, new Model<String>(
"Ellioth Smith Rocks"));
XmlTag xmlTag = new XmlTag();
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- modifier.replaceAttibuteValue(null, tag);
- Map attributes = tag.getAttributes();
+ modifier.replaceAttributeValue(null, tag);
+ Map<String, Object> attributes = tag.getAttributes();
assertTrue("attribute should not be added, as it didn't exist
yet", attributes.isEmpty());
}
@@ -151,14 +151,14 @@
*/
public void testModelReplacementOverwritingExistingAttributeValue()
{
- AttributeModifier modifier = new AttributeModifier("test", new
Model("Ellioth Smith Rocks"));
+ AttributeModifier modifier = new AttributeModifier("test", new
Model<String>("Ellioth Smith Rocks"));
XmlTag xmlTag = new XmlTag();
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- Map attributes = tag.getAttributes();
+ Map<String,Object> attributes = tag.getAttributes();
attributes.put("test", "My mother rocks");
- modifier.replaceAttibuteValue(null, tag);
+ modifier.replaceAttributeValue(null, tag);
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
assertEquals("Ellioth Smith Rocks", replacement);
@@ -169,15 +169,15 @@
*/
public void testNoNewValueWhenNotEnabled()
{
- AttributeModifier modifier = new AttributeModifier("test", new
Model("Ellioth Smith Rocks"));
+ AttributeModifier modifier = new AttributeModifier("test", new
Model<String>("Ellioth Smith Rocks"));
modifier.setEnabled(false);
XmlTag xmlTag = new XmlTag();
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- Map attributes = tag.getAttributes();
+ Map<String,Object> attributes = tag.getAttributes();
attributes.put("test", "My mother rocks");
- modifier.replaceAttibuteValue(null, tag);
+ modifier.replaceAttributeValue(null, tag);
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
assertEquals("My mother rocks", replacement);
@@ -188,11 +188,12 @@
*/
public void testNewValueForModelValue()
{
- AttributeModifier modifier = new AttributeModifier("test",
true, new Model("happy"))
+ AttributeModifier modifier = new AttributeModifier("test",
true, new Model<String>("happy"))
{
private static final long serialVersionUID = 1L;
- protected String newValue(String currentValue, String
replacementValue)
+ @Override
+ protected String newValue(String currentValue, String
replacementValue)
{
return replacementValue + " together";
}
@@ -201,8 +202,8 @@
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- modifier.replaceAttibuteValue(null, tag);
- Map attributes = tag.getAttributes();
+ modifier.replaceAttributeValue(null, tag);
+ Map<String,Object> attributes = tag.getAttributes();
assertTrue(!attributes.isEmpty());
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
@@ -218,7 +219,8 @@
{
private static final long serialVersionUID = 1L;
- protected String newValue(String currentValue, String
replacementValue)
+ @Override
+ protected String newValue(String currentValue, String
replacementValue)
{
return currentValue + " two";
}
@@ -227,9 +229,9 @@
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
tag.setName("id");
- Map attributes = tag.getAttributes();
+ Map<String,Object> attributes = tag.getAttributes();
attributes.put("test", "one");
- modifier.replaceAttibuteValue(null, tag);
+ modifier.replaceAttributeValue(null, tag);
String replacement = (String)attributes.get("test");
assertNotNull(replacement);
assertEquals("one two", replacement);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java Sat
Sep 6 15:14:52 2008
@@ -22,11 +22,11 @@
import java.util.MissingResourceException;
import junit.framework.Assert;
-
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.resource.DummyApplication;
@@ -47,20 +47,20 @@
{
private static final long serialVersionUID = 1L;
- DropDownChoice drop1;
- DropDownChoice drop2;
+ DropDownChoice<String> drop1;
+ DropDownChoice<String> drop2;
/**
* Construct.
*/
public MyMockPage()
{
- final Form form = new Form("form");
+ final Form<Void> form = new Form<Void>("form");
add(form);
String[] choices = { "choice1", "choice2" };
- drop1 = new DropDownChoice("drop1",
Arrays.asList(choices));
- drop2 = new DropDownChoice("drop2",
Arrays.asList(choices));
+ drop1 = new DropDownChoice<String>("drop1",
Arrays.asList(choices));
+ drop2 = new DropDownChoice<String>("drop2",
Arrays.asList(choices));
form.add(drop1);
form.add(drop2);
@@ -163,7 +163,7 @@
{
ValueMap vm = new ValueMap();
vm.put("user", "John Doe");
- Model model = new Model(vm);
+ IModel<ValueMap> model = new Model<ValueMap>(vm);
Assert.assertEquals("Property substitution should occur",
"Welcome, John Doe",
localizer.getString("test.substitute", null, model,
null));
}
@@ -173,7 +173,7 @@
*/
public void testInComponentConstructor()
{
- Component myComponent = new MyLabel("myLabel");
+ new MyLabel("myLabel");
}
/**
@@ -201,16 +201,16 @@
*/
public void testGetStringUseModel()
{
- HashMap model = new HashMap();
+ HashMap<String, String> model = new HashMap<String, String>();
model.put("user", "juergen");
Assert.assertEquals("Expected string should be returned",
"Welcome, juergen",
- localizer.getString("test.substitute", null, new
PropertyModel(model, null),
+ localizer.getString("test.substitute", null, new
PropertyModel<String>(model, null),
"DEFAULT {user}"));
Assert.assertEquals("Expected string should be returned",
"DEFAULT juergen",
localizer.getString("test.substituteDoesNotExist", null,
- new PropertyModel(model, null), "DEFAULT
${user}"));
+ new PropertyModel<String>(model, null),
"DEFAULT ${user}"));
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java
Sat Sep 6 15:14:52 2008
@@ -30,7 +30,7 @@
*/
public class MockPageWithForm extends WebPage
{
- private final class MyForm extends Form
+ private final class MyForm extends Form<Void>
{
private static final long serialVersionUID = 1L;
@@ -39,7 +39,8 @@
super(id);
}
- protected void onSubmit()
+ @Override
+ protected void onSubmit()
{
submitted = true;
}
@@ -56,14 +57,15 @@
*/
public MockPageWithForm()
{
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("Select me");
MyForm form = new MyForm("form");
- DropDownChoice dropDown = new DropDownChoice("dropdown", new
Model(), list)
+ DropDownChoice<String> dropDown = new
DropDownChoice<String>("dropdown", new Model<String>(), list)
{
private static final long serialVersionUID = 1L;
- protected void onSelectionChanged(Object newSelection)
+ @Override
+ protected void onSelectionChanged(String newSelection)
{
selected = true;
}
@@ -71,7 +73,8 @@
/**
* @see
org.apache.wicket.markup.html.form.DropDownChoice#wantOnSelectionChangedNotifications()
*/
- protected boolean wantOnSelectionChangedNotifications()
+ @Override
+ protected boolean wantOnSelectionChangedNotifications()
{
return true;
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
Sat Sep 6 15:14:52 2008
@@ -36,7 +36,7 @@
public MarkupInheritanceBaseBase_11()
{
WebMarkupContainer css = new WebMarkupContainer("css");
- css.add(new AttributeModifier("src", true, new
Model("myStyle.css")));
+ css.add(new AttributeModifier("src", true, new
Model<String>("myStyle.css")));
add(css);
add(new Label("label1", "base label 1"));
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
Sat Sep 6 15:14:52 2008
@@ -36,7 +36,7 @@
public MarkupInheritanceBase_10()
{
WebMarkupContainer css = new WebMarkupContainer("css");
- css.add(new AttributeModifier("src", true, new
Model("myStyle.css")));
+ css.add(new AttributeModifier("src", true, new
Model<String>("myStyle.css")));
add(css);
add(new Label("label1", "base label 1"));
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java
Sat Sep 6 15:14:52 2008
@@ -47,128 +47,129 @@
*/
public MyComponent(final String id)
{
- super(id, new Model(""));
+ super(id, new Model<String>(""));
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param intParam
*/
- public void setIntParam(final int param)
+ public void setIntParam(final int intParam)
{
- this.intParam = param;
+ this.intParam = intParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param integerParam
*/
- public void setIntegerParam(final Integer param)
+ public void setIntegerParam(final Integer integerParam)
{
- this.integerParam = param;
+ this.integerParam = integerParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param long1Param
*/
- public void setLong1Param(final long param)
+ public void setLong1Param(final long long1Param)
{
- this.long1Param = param;
+ this.long1Param = long1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param long2Param
*/
- public void setLong2Param(final Long param)
+ public void setLong2Param(final Long long2Param)
{
- this.long2Param = param;
+ this.long2Param = long2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param float1Param
*/
- public void setFloat1Param(final float param)
+ public void setFloat1Param(final float float1Param)
{
- this.float1Param = param;
+ this.float1Param = float1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param float2Param
*/
- public void setFloat2Param(final Float param)
+ public void setFloat2Param(final Float float2Param)
{
- this.float2Param = param;
+ this.float2Param = float2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param double1Param
*/
- public void setDouble1Param(final double param)
+ public void setDouble1Param(final double double1Param)
{
- this.double1Param = param;
+ this.double1Param = double1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param double2Param
*/
- public void setDouble2Param(final Double param)
+ public void setDouble2Param(final Double double2Param)
{
- this.double2Param = param;
+ this.double2Param = double2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param dateParam
*/
- // public void setDateParam(final Date param)
- public void setDateParam(final String param)
+ // public void setDateParam(final Date dateParam)
+ public void setDateParam(final String dateParam)
{
- this.dateParam = param;
+ this.dateParam = dateParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param hexParam
*/
- public void setHexParam(final String param)
+ public void setHexParam(final String hexParam)
{
- this.hexParam = param;
+ this.hexParam = hexParam;
}
/**
* @see
org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
- protected void onComponentTagBody(MarkupStream markupStream,
ComponentTag openTag)
+ @Override
+ protected void onComponentTagBody(MarkupStream markupStream, ComponentTag
openTag)
{
StringBuffer str = new StringBuffer();
- str.append("intParam: " + intParam + "<br/>");
- str.append("integerParam: " + integerParam.toString() +
"<br/>");
- str.append("long1Param: " + long1Param + "<br/>");
- str.append("long2Param: " + long2Param.toString() + "<br/>");
- str.append("float1Param: " + float1Param + "<br/>");
- str.append("float2Param: " + float2Param.toString() + "<br/>");
- str.append("double1Param: " + double1Param + "<br/>");
- str.append("double2Param: " + double2Param.toString() +
"<br/>");
- str.append("dateParam: " + dateParam + "<br/>");
- str.append("hexParam: " + hexParam + "<br/>");
+ str.append("intParam: ").append(intParam).append("<br/>");
+ str.append("integerParam:
").append(integerParam.toString()).append("<br/>");
+ str.append("long1Param: ").append(long1Param).append("<br/>");
+ str.append("long2Param:
").append(long2Param.toString()).append("<br/>");
+ str.append("float1Param: ").append(float1Param).append("<br/>");
+ str.append("float2Param:
").append(float2Param.toString()).append("<br/>");
+ str.append("double1Param: ").append(double1Param).append("<br/>");
+ str.append("double2Param:
").append(double2Param.toString()).append("<br/>");
+ str.append("dateParam: ").append(dateParam).append("<br/>");
+ str.append("hexParam: ").append(hexParam).append("<br/>");
getResponse().write(str);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyTable.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MyTable.java Sat
Sep 6 15:14:52 2008
@@ -22,7 +22,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
/**
@@ -30,7 +30,7 @@
*
* @author Juergen Donnerstag
*/
-public class MyTable extends ListView
+public class MyTable extends ListView<String>
{
private static final long serialVersionUID = 1L;
@@ -41,12 +41,13 @@
*/
public MyTable(final String id)
{
- super(id, new Model(null));
+ super(id, new ListModel<String>());
}
- protected void populateItem(ListItem listItem)
+ @Override
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
@@ -57,7 +58,7 @@
*/
public void setRowsPerPage(final int rows)
{
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
for (int i = 0; i < rows; i++)
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java
Sat Sep 6 15:14:52 2008
@@ -55,7 +55,7 @@
Border border2 = new SimpleBorder("myBorder2");
border2.setRenderBodyOnly(false);
- border2.add(new AttributeModifier("testAttr", true, new
Model("myValue")));
+ border2.add(new AttributeModifier("testAttr", true, new
Model<String>("myValue")));
add(border2);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
Sat Sep 6 15:14:52 2008
@@ -37,7 +37,7 @@
public SimplePage_14()
{
WebMarkupContainer container = new WebMarkupContainer("html");
- container.add(new AttributeModifier("lang", new Model("de")));
+ container.add(new AttributeModifier("lang", new
Model<String>("de")));
container.add(new Label("label", "label"));
add(container);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
Sat Sep 6 15:14:52 2008
@@ -37,6 +37,6 @@
*/
public MarkupComponentBorderTestPage()
{
- add(new Label("label", new
Model("label")).setComponentBorder(new BeforeAndAfterBorder()));
+ add(new Label("label", new
Model<String>("label")).setComponentBorder(new BeforeAndAfterBorder()));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
Sat Sep 6 15:14:52 2008
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
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;
/**
@@ -45,8 +45,8 @@
public AbstractCheckGroupTestPage(List<String> list)
{
- Form<?> form = new Form("form");
- CheckGroup<String> group = new CheckGroup<String>("group", new
Model((Serializable)list));
+ Form<?> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new
CollectionModel<String>(list));
WebMarkupContainer container = new
WebMarkupContainer("container");
Check<String> check1 = new Check<String>("check1", new
Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new
Model<String>("check2"));
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
Sat Sep 6 15:14:52 2008
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.Arrays;
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;
/**
@@ -33,20 +33,14 @@
{
private static final long serialVersionUID = 1L;
- /**
- * Constructor
- *
- * @param list
- */
public CheckGroupDisabledTestPage()
{
- Form form = new Form("form");
- CheckGroup group = new CheckGroup("group", new
Model((Serializable)Arrays
- .asList(new String[] { "check1", "check2" })));
+ Form<Void> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new
CollectionModel<String>(Arrays.asList("check1", "check2")));
group.setRenderBodyOnly(false);
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);
form.add(group);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=692750&r1=692749&r2=692750&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
Sat Sep 6 15:14:52 2008
@@ -22,12 +22,12 @@
import java.util.List;
import java.util.Set;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.protocol.http.MockPage;
@@ -61,13 +61,13 @@
{
private static final long serialVersionUID = 1L;
- private Set prop1 = new HashSet();
+ private Set<Object> prop1 = new HashSet<Object>();
private String prop2;
/**
* @return prop1
*/
- public Set getProp1()
+ public Set<Object> getProp1()
{
return prop1;
}
@@ -75,7 +75,7 @@
/**
* @param prop1
*/
- public void setProp1(Set prop1)
+ public void setProp1(Set<Object> prop1)
{
this.prop1 = prop1;
}
@@ -116,42 +116,43 @@
modelObject.setProp2(check2);
// test model constructors
- List list = new ArrayList();
- Model model = new Model((Serializable)list);
+ List<Object> list = new ArrayList<Object>();
+ CollectionModel<Object> model = new
CollectionModel<Object>(list);
- final CheckGroup group2 = new CheckGroup("group2", model);
+ final CheckGroup<Object> group2 = new
CheckGroup<Object>("group2", model);
assertTrue(group2.getDefaultModelObject() == list);
- final CheckGroup group3 = new CheckGroup("group3", list);
+ final CheckGroup<Object> group3 = new
CheckGroup<Object>("group3", list);
assertTrue(group3.getDefaultModelObject() == list);
// 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 CheckGroup group = new CheckGroup("prop1");
+ final CheckGroup<Object> group = new
CheckGroup<Object>("prop1");
final WebMarkupContainer container = new
WebMarkupContainer("container");
- final Check choice1 = new Check("check1", new Model(check1));
- final Check choice2 = new Check("prop2");
+ final Check<Serializable> choice1 = new
Check<Serializable>("check1", new Model<Serializable>(check1));
+ final Check<String> choice2 = new Check<String>("prop2");
page.add(form);
form.add(group);
