You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/04/23 09:55:56 UTC
svn commit: r1096119 [2/3] - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/markup/html/form/
main/java/org/apache/wicket/mark...
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.java Sat Apr 23 07:55:49 2011
@@ -26,16 +26,13 @@ import java.util.ArrayList;
*/
public class CheckGroupTestPage1 extends AbstractCheckGroupTestPage
{
+ private static final long serialVersionUID = 1L;
+
/**
* constructor
*/
public CheckGroupTestPage1()
{
- super(new ArrayList());
-
+ super(new ArrayList<String>());
}
-
- private static final long serialVersionUID = 1L;
-
-
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java Sat Apr 23 07:55:49 2011
@@ -31,10 +31,17 @@ import org.apache.wicket.request.mapper.
*/
public class FormHasErrorPage extends WebPage
{
+ /**
+ */
public static final class InvalidPanel extends Panel
{
private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ *
+ * @param id
+ */
public InvalidPanel(String id)
{
super(id);
@@ -61,9 +68,9 @@ public class FormHasErrorPage extends We
final SubmitLink submitForm = new SubmitLink("submitForm");
final InvalidPanel invalidPanel = new InvalidPanel("invalidPanel");
- final CheckBox formComponent = new CheckBox("formComponent", new Model());
+ final CheckBox formComponent = new CheckBox("formComponent", new Model<Boolean>());
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java Sat Apr 23 07:55:49 2011
@@ -31,8 +31,8 @@ public class FormMethodTestPage extends
*/
public FormMethodTestPage()
{
- add(new Form("formpost"));
- add(new Form("formget")
+ add(new Form<Void>("formpost"));
+ add(new Form<Void>("formget")
{
/** Serialization */
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java Sat Apr 23 07:55:49 2011
@@ -28,7 +28,7 @@ import org.apache.wicket.util.visit.IVis
*/
public class FormTest extends WicketTestCase
{
- private IVisitor visitor;
+ private IVisitor<?, ?> visitor;
/**
* Construct.
@@ -47,7 +47,7 @@ public class FormTest extends WicketTest
visitor = new Form.ValidationVisitor()
{
@Override
- public void validate(FormComponent formComponent)
+ public void validate(FormComponent<?> formComponent)
{
}
};
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java Sat Apr 23 07:55:49 2011
@@ -72,6 +72,9 @@ public class FormWithMultipleButtonsTest
assertEquals(1, testPage.submitSequence.indexOf(testPage.form));
}
+ /**
+ *
+ */
public void testButtonInvokedFirst()
{
TestPage testPage = new TestPage();
@@ -90,17 +93,23 @@ public class FormWithMultipleButtonsTest
tester.destroy();
}
+ /**
+ */
private static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
+ private static final long serialVersionUID = 1L;
+
List<Component> submitSequence = new ArrayList<Component>();
- Form form;
+ Form<Void> form;
Button button;
AjaxFallbackButton ajaxFallbackButton;
public TestPage()
{
- add(form = new Form("form")
+ add(form = new Form<Void>("form")
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit()
{
@@ -109,6 +118,8 @@ public class FormWithMultipleButtonsTest
});
form.add(button = new Button("b1")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit()
{
@@ -117,6 +128,8 @@ public class FormWithMultipleButtonsTest
});
form.add(ajaxFallbackButton = new AjaxFallbackButton("b2", form)
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java Sat Apr 23 07:55:49 2011
@@ -27,14 +27,20 @@ public class LocalizedMessagePage extend
/** */
private static final long serialVersionUID = 1L;
- public Form form;
- public TextField integerField;
+ /** */
+ public Form<Void> form;
+ /** */
+ public TextField<Integer> integerField;
+ /** */
public FeedbackPanel feedback;
+ /**
+ * Construct.
+ */
public LocalizedMessagePage()
{
- add(form = new Form("form"));
- form.add(integerField = new TextField("integer", Integer.class));
+ add(form = new Form<Void>("form"));
+ form.add(integerField = new TextField<Integer>("integer", Integer.class));
form.add(feedback = new FeedbackPanel("feedback"));
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3.java Sat Apr 23 07:55:49 2011
@@ -33,10 +33,10 @@ public class RadioGroupTestPage3 extends
*/
public RadioGroupTestPage3()
{
- Form form = new Form("form");
- RadioGroup radio = new RadioGroup("radio");
- radio.add(new Radio("check1"));
- radio.add(new Radio("check2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<?> radio = new RadioGroup<Object>("radio");
+ radio.add(new Radio<Object>("check1"));
+ radio.add(new Radio<Object>("check2"));
form.add(radio);
add(form);
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java Sat Apr 23 07:55:49 2011
@@ -61,7 +61,7 @@ public class ValidatorPropertiesTest ext
// test English/ default
TestPage page = new TestPage();
- Form form = (Form)page.get("form1");
+ Form<?> form = (Form<?>)page.get("form1");
assertNotNull(form);
page.getText1().setInput("");
@@ -160,7 +160,7 @@ public class ValidatorPropertiesTest ext
tester.getSession().setLocale(new Locale("nl"));
page = new TestPage();
- form = (Form)page.get("form1");
+ form = (Form<?>)page.get("form1");
assertNotNull(form);
page.getText1().setInput("");
@@ -251,8 +251,10 @@ public class ValidatorPropertiesTest ext
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
- String str = tester.getApplication().getResourceSettings().getLocalizer().getString("XXX",
- null);
+ String str = tester.getApplication()
+ .getResourceSettings()
+ .getLocalizer()
+ .getString("XXX", null);
assertEquals("[Warning: Property for 'XXX' not found]", str);
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java Sat Apr 23 07:55:49 2011
@@ -39,32 +39,44 @@ public class CommonModelPage extends Web
CommonBorder border = new CommonBorder("border");
add(border);
- Form form1 = new Form("form1");
+ Form<Void> form1 = new Form<Void>("form1");
border.add(form1);
- form1.add(new TextField("quantity1", new PropertyModel(this, "quantity1")));
+ form1.add(new TextField<Integer>("quantity1", new PropertyModel<Integer>(this, "quantity1")));
- Form form2 = new Form("form2");
+ Form<Void> form2 = new Form<Void>("form2");
border.add(form2);
- form2.add(new TextField("quantity2", new PropertyModel(this, "quantity2")));
+ form2.add(new TextField<Integer>("quantity2", new PropertyModel<Integer>(this, "quantity2")));
}
+ /**
+ * @return quantity1
+ */
public int getQuantity1()
{
return quantity1;
}
+ /**
+ * @param quantity1
+ */
public void setQuantity1(int quantity1)
{
this.quantity1 = quantity1;
}
+ /**
+ * @return quantity2
+ */
public int getQuantity2()
{
return quantity2;
}
+ /**
+ * @param quantity2
+ */
public void setQuantity2(int quantity2)
{
this.quantity2 = quantity2;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java Sat Apr 23 07:55:49 2011
@@ -22,6 +22,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.PropertyModel;
+/**
+ */
public class HomePage extends WebPage
{
boolean submitted = false;
@@ -32,10 +34,13 @@ public class HomePage extends WebPage
*/
private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ */
public HomePage()
{
super();
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
/**
*
@@ -48,7 +53,7 @@ public class HomePage extends WebPage
submitted = true;
}
};
- form.add(new TextField("text", new PropertyModel(HomePage.this, "text")));
+ form.add(new TextField<String>("text", new PropertyModel<String>(HomePage.this, "text")));
form.add(new SubmitLink("link")
{
@@ -68,21 +73,33 @@ public class HomePage extends WebPage
add(form);
}
+ /**
+ * @return submitted
+ */
public boolean isSubmitted()
{
return submitted;
}
+ /**
+ * @return text
+ */
public String getText()
{
return text;
}
+ /**
+ * @param text
+ */
public void setText(String text)
{
this.text = text;
}
+ /**
+ * @return submittedViaLink
+ */
public boolean isSubmittedViaLink()
{
return submittedViaLink;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java Sat Apr 23 07:55:49 2011
@@ -38,7 +38,7 @@ public class MockPageWithFormAndUploadFi
*/
public MockPageWithFormAndUploadField()
{
- form = new Form("form")
+ form = new Form<Void>("form")
{
/**
*
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java Sat Apr 23 07:55:49 2011
@@ -31,6 +31,8 @@ import org.apache.wicket.util.resource.I
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
+/**
+ */
public class FormValidatorBehaviorTest extends WicketTestCase
{
/**
@@ -123,11 +125,19 @@ public class FormValidatorBehaviorTest e
}
+ /**
+ */
public static class MaxLenValidator extends Behavior implements IFormValidator
{
+ private static final long serialVersionUID = 1L;
private final int len = 8;
private final TextField<String> field;
+ /**
+ * Construct.
+ *
+ * @param field
+ */
public MaxLenValidator(TextField<String> field)
{
this.field = field;
@@ -154,12 +164,19 @@ public class FormValidatorBehaviorTest e
}
}
+ /**
+ */
public static class MinLenValidator implements IFormValidator
{
-
+ private static final long serialVersionUID = 1L;
private int len = 5;
private final TextField<String> field;
+ /**
+ * Construct.
+ *
+ * @param field
+ */
public MinLenValidator(TextField<String> field)
{
this.field = field;
@@ -180,14 +197,22 @@ public class FormValidatorBehaviorTest e
}
}
+ /**
+ */
public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
+ private static final long serialVersionUID = 1L;
+ /** */
public TextField<String> name;
- public Form form;
+ /** */
+ public Form<Void> form;
+ /**
+ * Construct.
+ */
public TestPage()
{
- form = new Form("form");
+ form = new Form<Void>("form");
add(form);
name = new TextField<String>("name", Model.of(""));
form.add(name);
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java Sat Apr 23 07:55:49 2011
@@ -35,15 +35,23 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
/** */
- public String textfieldForm1, textfieldForm2;
+ public String textfieldForm1;
/** */
- public String textfield1, textfield2;
+ public String textfieldForm2;
+
+ /** */
+ public String textfield1;
+
+ /** */
+ public String textfield2;
/** */
public int formSubmitted = 0;
+ /** */
public static int AJAX = 2;
+ /** */
public static int NORMAL = 4;
boolean hitOnSubmit = false;
@@ -121,7 +129,7 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
formSubmitted = formSubmitted | AJAX;
target.add(form);
@@ -146,6 +154,9 @@ public class HomePage extends WebPage
add(form3);
}
+ /**
+ * @return formSubmitted
+ */
public int getFormSubmitted()
{
return formSubmitted;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java Sat Apr 23 07:55:49 2011
@@ -21,9 +21,15 @@ import org.apache.wicket.feedback.IFeedb
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
+/**
+ */
public class BasePage extends WebPage
{
+ private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ */
public BasePage()
{
}
@@ -36,6 +42,8 @@ public class BasePage extends WebPage
{
add(new FeedbackPanel("pagefbp", new IFeedbackMessageFilter()
{
+ private static final long serialVersionUID = 1L;
+
public boolean accept(FeedbackMessage message)
{
return !message.isRendered();
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxyImagesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxyImagesPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxyImagesPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxyImagesPage.java Sat Apr 23 07:55:49 2011
@@ -21,10 +21,18 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.resource.PackageResourceReference;
+/**
+ */
public final class AjaxyImagesPage extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
+ /** */
public final Image image;
+ /**
+ * Construct.
+ */
public AjaxyImagesPage()
{
image = new Image("image", new PackageResourceReference(AjaxyImagesPage.class, "Beer.gif"));
@@ -34,6 +42,8 @@ public final class AjaxyImagesPage exten
AjaxLink<Void> link = new AjaxLink<Void>("link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_1.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_1.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_1.java Sat Apr 23 07:55:49 2011
@@ -45,11 +45,13 @@ public class AjaxEnclosurePage_1 extends
toggleLabel1Link = new AjaxLink<Void>("toggleLabel1Link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
label1.setVisible(!label1.isVisible());
- target.addComponent(label1);
+ target.add(label1);
}
};
@@ -57,11 +59,13 @@ public class AjaxEnclosurePage_1 extends
toggleLabel2Link = new AjaxLink<Void>("toggleLabel2Link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
label2.setVisible(!label2.isVisible());
- target.addComponent(label2);
+ target.add(label2);
}
};
@@ -75,26 +79,41 @@ public class AjaxEnclosurePage_1 extends
}
+ /**
+ * @return serialVersionUID
+ */
public static long getSerialversionuid()
{
return serialVersionUID;
}
+ /**
+ * @return label1
+ */
public Label getLabel1()
{
return label1;
}
+ /**
+ * @return label2
+ */
public Label getLabel2()
{
return label2;
}
- public AjaxLink getToggleLabel1Link()
+ /**
+ * @return toggleLabel1Link
+ */
+ public AjaxLink<Void> getToggleLabel1Link()
{
return toggleLabel1Link;
}
+ /**
+ * @return toggleLabel2Link
+ */
public AjaxLink<Void> getToggleLabel2Link()
{
return toggleLabel2Link;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_2.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_2.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_2.java Sat Apr 23 07:55:49 2011
@@ -61,11 +61,13 @@ public class AjaxEnclosurePage_2 extends
{
toggleLabel1Link = new AjaxLink<Void>("toggleLabel1Link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
label1.setVisible(!label1.isVisible());
- target.addComponent(label1);
+ target.add(label1);
}
};
@@ -73,42 +75,62 @@ public class AjaxEnclosurePage_2 extends
toggleLabel2Link = new AjaxLink<Void>("toggleLabel2Link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
label2.setVisible(!label2.isVisible());
- target.addComponent(label2);
+ target.add(label2);
}
};
add(toggleLabel2Link);
}
+ /**
+ * @return serialVersionUID
+ */
public static long getSerialversionuid()
{
return serialVersionUID;
}
+ /**
+ * @return label1
+ */
public Label getLabel1()
{
return label1;
}
+ /**
+ * @return label2
+ */
public Label getLabel2()
{
return label2;
}
+ /**
+ * @return toggleLabel1Link
+ */
public AjaxLink<Void> getToggleLabel1Link()
{
return toggleLabel1Link;
}
+ /**
+ * @return toggleLabel2Link
+ */
public AjaxLink<Void> getToggleLabel2Link()
{
return toggleLabel2Link;
}
+ /**
+ * @return enclosure2Marker
+ */
public Label getEnclosure2Marker()
{
return enclosure2Marker;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_3.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_3.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_3.java Sat Apr 23 07:55:49 2011
@@ -48,26 +48,37 @@ public class AjaxEnclosurePage_3 extends
{
toggleLabel1Link = new AjaxLink<Void>("toggleLabel1Link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target)
{
label1.setVisible(!label1.isVisible());
- target.addComponent(label1);
+ target.add(label1);
}
};
add(toggleLabel1Link);
}
+ /**
+ * @return serialVersionUID
+ */
public static long getSerialversionuid()
{
return serialVersionUID;
}
+ /**
+ * @return label1
+ */
public Label getLabel1()
{
return label1;
}
+ /**
+ * @return toggleLabel1Link
+ */
public AjaxLink<Void> getToggleLabel1Link()
{
return toggleLabel1Link;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java Sat Apr 23 07:55:49 2011
@@ -38,7 +38,7 @@ public class EnclosurePage_3 extends Web
Border border = new MyBorder("border");
add(border);
- border.addToBorderBody(new Link("newLink")
+ border.addToBorderBody(new Link<Void>("newLink")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_6.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_6.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_6.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_6.java Sat Apr 23 07:55:49 2011
@@ -34,7 +34,7 @@ public class EnclosurePage_6 extends Web
*/
public EnclosurePage_6()
{
- add(new Link("link")
+ add(new Link<Void>("link")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_7.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_7.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_7.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_7.java Sat Apr 23 07:55:49 2011
@@ -20,10 +20,17 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
+/**
+ */
public class EnclosurePage_7 extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
public EnclosurePage_7()
{
- this.add(new RadioGroup("group").add(new Radio<Void>("radio")));
+ this.add(new RadioGroup<Void>("group").add(new Radio<Void>("radio")));
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_8.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_8.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_8.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_8.java Sat Apr 23 07:55:49 2011
@@ -34,6 +34,11 @@ import org.apache.wicket.markup.html.Web
*/
public class EnclosurePage_8 extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
public EnclosurePage_8()
{
add(new WebMarkupContainer("container"));
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureAjaxPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureAjaxPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureAjaxPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureAjaxPage.java Sat Apr 23 07:55:49 2011
@@ -55,7 +55,7 @@ public class InlineEnclosureAjaxPage ext
*/
private void ajaxRepaintOnlyToggleableComponentsContainer(AjaxRequestTarget target)
{
- target.addComponent(toggleable);
+ target.add(toggleable);
}
/**
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_1.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_1.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_1.java Sat Apr 23 07:55:49 2011
@@ -63,10 +63,11 @@ public class InlineEnclosurePage_1 exten
add(label10);
}
+ /**
+ * @return serialVersionUID
+ */
public static long getSerialversionuid()
{
return serialVersionUID;
}
-
-
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_2.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_2.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePage_2.java Sat Apr 23 07:55:49 2011
@@ -73,9 +73,11 @@ public class InlineEnclosurePage_2 exten
add(label15);
}
+ /**
+ * @return serialVersionUID
+ */
public static long getSerialversionuid()
{
return serialVersionUID;
}
-
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithAdditionalAjaxTargetPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithAdditionalAjaxTargetPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithAdditionalAjaxTargetPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithAdditionalAjaxTargetPage.java Sat Apr 23 07:55:49 2011
@@ -30,6 +30,8 @@ import org.apache.wicket.markup.html.bas
*/
public class InlineEnclosureWithAdditionalAjaxTargetPage extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
private final Label label1 = new Label("label1", "Test Label 1");
private final Label label2 = new Label("label2", "Test Label 2");
private final AjaxLink<Void> toggleLink;
@@ -47,12 +49,12 @@ public class InlineEnclosureWithAddition
public void onClick(AjaxRequestTarget target)
{
label1.setVisible(!label1.isVisible());
- target.addComponent(label1);
+ target.add(label1);
label2.setVisible(!label2.isVisible());
- target.addComponent(label2);
+ target.add(label2);
}
-
};
+
add(toggleLink);
label1.setOutputMarkupId(true);
label2.setOutputMarkupId(true);
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java Sat Apr 23 07:55:49 2011
@@ -72,8 +72,8 @@ public class TraditionalEnclosureAjaxPag
*/
private void ajaxRepaintOnlyToggleableComponentsContainer(AjaxRequestTarget target)
{
- target.addComponent(traditionalAjaxVisibilityToggleRequiresPlaceholder); // This is what we
-// repaint and toggleable is inside it
+ target.add(traditionalAjaxVisibilityToggleRequiresPlaceholder); // This is what we
+ // repaint and toggleable is inside it
}
/**
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java Sat Apr 23 07:55:49 2011
@@ -33,12 +33,18 @@ public class AbstractLinkTest
private WicketTester wicketTester;
+ /**
+ *
+ */
@Before
public void before()
{
wicketTester = new WicketTester();
}
+ /**
+ *
+ */
@After
public void after()
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java Sat Apr 23 07:55:49 2011
@@ -27,17 +27,22 @@ import org.apache.wicket.model.PropertyM
*/
public class FormPage extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
private final Integer somevalue = 1;
private boolean formSubmitted;
private boolean submitLinkSubmitted;
- private final Form form;
+ private final Form<Void> form;
+ /**
+ * Construct.
+ */
public FormPage()
{
- form = new Form("form")
+ form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
@@ -49,7 +54,7 @@ public class FormPage extends WebPage
};
add(form);
- form.add(new TextField("field", new PropertyModel(this, "somevalue")));
+ form.add(new TextField<Integer>("field", new PropertyModel<Integer>(this, "somevalue")));
add(new SubmitLink("link", form)
{
@@ -63,11 +68,17 @@ public class FormPage extends WebPage
});
}
+ /**
+ * @return formSubmitted
+ */
public boolean isFormSubmitted()
{
return formSubmitted;
}
+ /**
+ * @return submitLinkSubmitted
+ */
public boolean isSubmitLinkSubmitted()
{
return submitLinkSubmitted;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java Sat Apr 23 07:55:49 2011
@@ -27,17 +27,22 @@ import org.apache.wicket.model.PropertyM
*/
public class FormPage2 extends WebPage
{
+ private static final long serialVersionUID = 1L;
+
private final Integer somevalue = 1;
private boolean formSubmitted;
private boolean submitLinkSubmitted;
- private final Form form;
+ private final Form<Void> form;
+ /**
+ * Construct.
+ */
public FormPage2()
{
- form = new Form("form")
+ form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
@@ -49,7 +54,7 @@ public class FormPage2 extends WebPage
};
add(form);
- form.add(new TextField("field", new PropertyModel(this, "somevalue")));
+ form.add(new TextField<Integer>("field", new PropertyModel<Integer>(this, "somevalue")));
form.add(new SubmitLink("link", form)
{
@@ -63,11 +68,17 @@ public class FormPage2 extends WebPage
});
}
+ /**
+ * @return formSubmitted
+ */
public boolean isFormSubmitted()
{
return formSubmitted;
}
+ /**
+ * @return submitLinkSubmitted
+ */
public boolean isSubmitLinkSubmitted()
{
return submitLinkSubmitted;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java Sat Apr 23 07:55:49 2011
@@ -37,7 +37,7 @@ public class IncrementalTableNavigationP
public IncrementalTableNavigationPage()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
@@ -47,23 +47,24 @@ public class IncrementalTableNavigationP
list.add("seven");
list.add("eight");
- PageableListView table = new PageableListView("table", list, 2)
+ PageableListView<String> table = new PageableListView<String>("table", list, 2)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
};
add(table);
- PagingNavigationIncrementLink prev = new PagingNavigationIncrementLink("prev", table, -1);
+ PagingNavigationIncrementLink<Void> prev = new PagingNavigationIncrementLink<Void>("prev",
+ table, -1);
add(prev);
- PagingNavigationIncrementLink nextNext = new PagingNavigationIncrementLink("nextNext",
- table, +2);
+ PagingNavigationIncrementLink<Void> nextNext = new PagingNavigationIncrementLink<Void>(
+ "nextNext", table, +2);
add(nextNext);
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java Sat Apr 23 07:55:49 2011
@@ -48,10 +48,10 @@ public class IncrementalTableNavigationT
"IncrementalTableNavigationPage_ExpectedResult_1.html");
Page page = tester.getLastRenderedPage();
- Link link = (Link)page.get("nextNext");
+ Link<?> link = (Link<?>)page.get("nextNext");
executeListener(link, "IncrementalTableNavigationPage_ExpectedResult_1-1.html");
- link = (Link)page.get("prev");
+ link = (Link<?>)page.get("prev");
executeListener(link, "IncrementalTableNavigationPage_ExpectedResult_1-2.html");
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java Sat Apr 23 07:55:49 2011
@@ -37,7 +37,7 @@ public class PagedTableNavigatorPage ext
public PagedTableNavigatorPage()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
@@ -47,14 +47,14 @@ public class PagedTableNavigatorPage ext
list.add("seven");
list.add("eight");
- PageableListView table = new PageableListView("table", list, 2)
+ PageableListView<String> table = new PageableListView<String>("table", list, 2)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java Sat Apr 23 07:55:49 2011
@@ -43,19 +43,19 @@ public class PagedTableNavigatorTest ext
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_1.html", true);
- Link link = (Link)page.get("navigator:first");
+ Link<?> link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
tester.clickLink(link.getPageRelativePath());
@@ -63,115 +63,116 @@ public class PagedTableNavigatorTest ext
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_2.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_3.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_4.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_5.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:navigation:2:pageLink");
+ link = (Link<?>)page.get("navigator:navigation:2:pageLink");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_6.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_7.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
// add entries to the model list.
- List modelData = (List)page.get("table").getDefaultModelObject();
+ @SuppressWarnings("unchecked")
+ List<String> modelData = (List<String>)page.get("table").getDefaultModelObject();
modelData.add("add-1");
modelData.add("add-2");
modelData.add("add-3");
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java Sat Apr 23 07:55:49 2011
@@ -41,7 +41,7 @@ public class PagedTableNavigatorWithLabe
public PagedTableNavigatorWithLabelProviderPage()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
@@ -58,14 +58,15 @@ public class PagedTableNavigatorWithLabe
list.add("fourteen");
final int pageSize = 2;
- final PageableListView listview = new PageableListView("table", list, pageSize)
+ final PageableListView<String> listview = new PageableListView<String>("table", list,
+ pageSize)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java Sat Apr 23 07:55:49 2011
@@ -39,124 +39,124 @@ public class PagedTableNavigatorWithLabe
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_1.html", true);
- Link link = (Link)page.get("navigator:first");
+ Link<?> link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_2.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_3.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_4.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_5.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:navigation:3:pageLink");
+ link = (Link<?>)page.get("navigator:navigation:3:pageLink");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_6.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithLabelProviderExpectedResult_7.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java Sat Apr 23 07:55:49 2011
@@ -40,7 +40,7 @@ public class PagedTableNavigatorWithMarg
public PagedTableNavigatorWithMarginPage()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
@@ -56,14 +56,14 @@ public class PagedTableNavigatorWithMarg
list.add("thirteen");
list.add("fourteen");
- PageableListView table = new PageableListView("table", list, 2)
+ PageableListView<String> table = new PageableListView<String>("table", list, 2)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java Sat Apr 23 07:55:49 2011
@@ -58,124 +58,124 @@ public class PagedTableNavigatorWithMarg
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_1.html", true);
- Link link = (Link)page.get("navigator:first");
+ Link<?> link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_2.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_3.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_4.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_5.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertFalse(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:navigation:3:pageLink");
+ link = (Link<?>)page.get("navigator:navigation:3:pageLink");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_6.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
tester.clickLink(link.getPageRelativePath());
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorWithMarginExpectedResult_7.html", true);
- link = (Link)page.get("navigator:first");
+ link = (Link<?>)page.get("navigator:first");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:prev");
+ link = (Link<?>)page.get("navigator:prev");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:next");
+ link = (Link<?>)page.get("navigator:next");
assertTrue(link.isEnabled());
- link = (Link)page.get("navigator:last");
+ link = (Link<?>)page.get("navigator:last");
assertTrue(link.isEnabled());
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java Sat Apr 23 07:55:49 2011
@@ -37,18 +37,18 @@ public class PagedTablePage extends WebP
public PagedTablePage()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
- PageableListView table = new PageableListView("table", list, 2)
+ PageableListView<String> table = new PageableListView<String>("table", list, 2)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java Sat Apr 23 07:55:49 2011
@@ -36,18 +36,18 @@ public class SimpleTablePage_1 extends W
public SimpleTablePage_1()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
- add(new ListView("table", list)
+ add(new ListView<String>("table", list)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
});
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java Sat Apr 23 07:55:49 2011
@@ -36,18 +36,18 @@ public class SimpleTablePage_2 extends W
public SimpleTablePage_2()
{
super();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
- add(new ListView("table", list)
+ add(new ListView<String>("table", list)
{
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem listItem)
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
});
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java Sat Apr 23 07:55:49 2011
@@ -35,12 +35,12 @@ public class SimpleTableTest extends Wic
executeTest(SimpleTablePage_1.class, "SimpleTablePageExpectedResult_1.html");
String document = tester.getLastResponseAsString();
// Does re-render do as well ??
- ListView view = (ListView)tester.getLastRenderedPage().get("table");
+ ListView<?> view = (ListView<?>)tester.getLastRenderedPage().get("table");
assertNotNull(view);
assertTrue(document.contains("<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>"));
// Does re-render do as well ??
- ListItem item = (ListItem)tester.getLastRenderedPage().get("table:0");
+ ListItem<?> item = (ListItem<?>)tester.getLastRenderedPage().get("table:0");
assertTrue(document.contains("<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li>"));
// Does re-render do as well ??
@@ -59,12 +59,12 @@ public class SimpleTableTest extends Wic
executeTest(SimpleTablePage_2.class, "SimpleTablePageExpectedResult_2.html");
String document = tester.getLastResponseAsString();
// Does re-render do as well ??
- ListView view = (ListView)tester.getLastRenderedPage().get("table");
+ ListView<?> view = (ListView<?>)tester.getLastRenderedPage().get("table");
assertNotNull(view);
assertTrue(document.contains("<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>"));
// Does re-render do as well ??
- view = (ListView)tester.getLastRenderedPage().get("table");
+ view = (ListView<?>)tester.getLastRenderedPage().get("table");
assertNotNull(view);
assertTrue(document.contains("<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>"));
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPage.java Sat Apr 23 07:55:49 2011
@@ -33,8 +33,8 @@ public class InputTagNotVisibleWebPage e
*/
public InputTagNotVisibleWebPage()
{
- Form form = new Form("form");
- form.add(new TextField("input").setVisible(false));
+ Form<Void> form = new Form<Void>("form");
+ form.add(new TextField<Object>("input").setVisible(false));
add(form);
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPage.java Sat Apr 23 07:55:49 2011
@@ -33,8 +33,8 @@ public class InputTagVisibleWebPage exte
*/
public InputTagVisibleWebPage()
{
- Form form = new Form("form");
- form.add(new TextField("input").setVisible(true));
+ Form<Void> form = new Form<Void>("form");
+ form.add(new TextField<Object>("input").setVisible(true));
add(form);
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/SignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/SignInPanel.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/SignInPanel.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/SignInPanel.java Sat Apr 23 07:55:49 2011
@@ -44,10 +44,12 @@ public class SignInPanel extends Panel
public SignInPanel(String id)
{
super(id);
- Form form = new Form("signInForm", new CompoundPropertyModel(new ValueMap()));
- form.add(new TextField("username"));
+ Form<ValueMap> form = new Form<ValueMap>("signInForm", new CompoundPropertyModel<ValueMap>(
+ new ValueMap()));
+ form.add(new TextField<String>("username"));
form.add(new PasswordTextField("password"));
- form.add(new DropDownChoice("domain", Arrays.asList("Wicket", "Tapestry", "JSF", ".Net")));
+ form.add(new DropDownChoice<String>("domain", Arrays.asList("Wicket", "Tapestry", "JSF",
+ ".Net")));
form.add(new CheckBox("rememberMe"));
form.add(new WebMarkupContainer("loginZonderTokenContainer").add(new CheckBox(
"loginZonderToken")));
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java Sat Apr 23 07:55:49 2011
@@ -32,12 +32,18 @@ import junit.framework.TestCase;
public class AbstractPropertyModelObjectClassTest extends TestCase
{
+ /**
+ *
+ */
public void testCompoundPropertyModel()
{
assertPropertyModelTargetTypeIsInteger(new CompoundPropertyModel<CustomType>(
new CustomType()));
}
+ /**
+ *
+ */
public void testCompoundPropertyModelBind()
{
CompoundPropertyModel<CustomBean> compoundPropertyModel = new CompoundPropertyModel<CustomBean>(
@@ -46,6 +52,9 @@ public class AbstractPropertyModelObject
assertPropertyModelTargetTypeIsInteger(modelForCustomTypeObject);
}
+ /**
+ *
+ */
public void testModel()
{
assertPropertyModelTargetTypeIsInteger(new Model<CustomType>(new CustomType()));
@@ -83,6 +92,7 @@ public class AbstractPropertyModelObject
private static class CustomType implements Serializable
{
+ private static final long serialVersionUID = 1L;
private Integer someProperty;
public void setSomeProperty(Integer someProperty)
@@ -98,6 +108,7 @@ public class AbstractPropertyModelObject
private static class CustomBean implements Serializable
{
+ private static final long serialVersionUID = 1L;
private CustomType customType;
public CustomType getCustomType()
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyApplication.java Sat Apr 23 07:55:49 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.properties;
+/**
+ */
public class MyApplication extends MyTesterApplication
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Sat Apr 23 07:55:49 2011
@@ -18,6 +18,8 @@ package org.apache.wicket.properties;
import org.apache.wicket.mock.MockApplication;
+/**
+ */
public class MyTesterApplication extends MockApplication
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestForm.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestForm.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestForm.java Sat Apr 23 07:55:49 2011
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.for
*
* @author Juergen Donnerstag
*/
-public class TestForm extends Form
+public class TestForm extends Form<Void>
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java Sat Apr 23 07:55:49 2011
@@ -39,13 +39,13 @@ public class TestPage extends WebPage
{
add(new Label("label"));
- Form form1 = new Form("form1");
+ Form<Void> form1 = new Form<Void>("form1");
add(form1);
form1.add(new MyTextField("text1", "input-1"));
form1.add(new MyTextField("text2", "input-2"));
form1.add(new MyTextField("text7", "input-3"));
- Form form2 = new TestForm("form2");
+ Form<Void> form2 = new TestForm("form2");
add(form2);
Panel panel1 = new EmptyPanel("panel1");
@@ -63,7 +63,7 @@ public class TestPage extends WebPage
panel2.add(new MyTextField("text11", "input-11"));
panel2.add(new MyTextField("text12", "input-12"));
- Form form3 = new TestForm("form3")
+ Form<Void> form3 = new TestForm("form3")
{
private static final long serialVersionUID = 1L;
@@ -211,7 +211,7 @@ public class TestPage extends WebPage
/**
*
*/
- public static class MyTextField extends TextField
+ public static class MyTextField extends TextField<String>
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java Sat Apr 23 07:55:49 2011
@@ -84,7 +84,7 @@ public class WebResponseExceptionsTest e
{
tester.startPage(TestErrorPage.class);
tester.setExposeExceptions(false);
- AjaxLink link = (AjaxLink)tester.getComponentFromLastRenderedPage("link");
+ AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link");
tester.executeAjaxEvent(link, "onclick");
assertEquals(500, tester.getLastResponse().getStatus());
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java Sat Apr 23 07:55:49 2011
@@ -50,14 +50,16 @@ public class HomePage extends WebPage
add(new Label("message",
"If you see this message wicket is properly configured and running"));
- Form f1 = new Form("form1");
- Form f2 = new Form("form2");
+ Form<Void> f1 = new Form<Void>("form1");
+ Form<Void> f2 = new Form<Void>("form2");
- TextField t1 = new TextField("text1", new PropertyModel(this, "text1"));
- TextField t2 = new TextField("text2", new PropertyModel(this, "text2"));
+ TextField<String> t1 = new TextField<String>("text1", new PropertyModel<String>(this,
+ "text1"));
+ TextField<String> t2 = new TextField<String>("text2", new PropertyModel<String>(this,
+ "text2"));
- Label l1 = new Label("out1", new PropertyModel(this, "text1"));
- Label l2 = new Label("out2", new PropertyModel(this, "text2"));
+ Label l1 = new Label("out1", new PropertyModel<String>(this, "text1"));
+ Label l2 = new Label("out2", new PropertyModel<String>(this, "text2"));
add(f1.add(t1)).add(l1);
add(f2.add(t2)).add(l2);
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Sat Apr 23 07:55:49 2011
@@ -36,6 +36,11 @@ public class AbortExceptionPage extends
{
private static final long serialVersionUID = -5906071716129043859L;
+ /**
+ * Construct.
+ *
+ * @param parameters
+ */
public AbortExceptionPage(PageParameters parameters)
{
final boolean triggerError = parameters.get("trigger").toBoolean();
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Sat Apr 23 07:55:49 2011
@@ -38,12 +38,11 @@ import org.mockito.Mockito;
*/
public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceMapperTest
{
- private static final IProvider<IResourceCachingStrategy> NO_CACHING =
- new ValueProvider<IResourceCachingStrategy>(NoOpResourceCachingStrategy.INSTANCE);
+ private static final IProvider<IResourceCachingStrategy> NO_CACHING = new ValueProvider<IResourceCachingStrategy>(
+ NoOpResourceCachingStrategy.INSTANCE);
- private static final IProvider<FilenameWithTimestampResourceCachingStrategy> CACHE_FILENAME_WITH_TIMESTAMP =
- new ValueProvider<FilenameWithTimestampResourceCachingStrategy>(
- new FilenameWithTimestampResourceCachingStrategy());
+ private static final IProvider<FilenameWithTimestampResourceCachingStrategy> CACHE_FILENAME_WITH_TIMESTAMP = new ValueProvider<FilenameWithTimestampResourceCachingStrategy>(
+ new FilenameWithTimestampResourceCachingStrategy());
/**
* Construct.
@@ -442,6 +441,9 @@ public class BasicResourceReferenceMappe
assertEquals("wicket/resource/" + CLASS_NAME + "/reference5?en--variation", url.toString());
}
+ /**
+ *
+ */
public void testLastModifiedTimestampIsPartOfUrl()
{
long millis = 12345678L;
@@ -458,6 +460,9 @@ public class BasicResourceReferenceMappe
assertTrue(url.toString().contains(timestampPart));
}
+ /**
+ *
+ */
@SuppressWarnings({ })
public void testLastModifiedTimestampCache()
{
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=1096119&r1=1096118&r2=1096119&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/DummyApplication.java Sat Apr 23 07:55:49 2011
@@ -18,6 +18,8 @@ package org.apache.wicket.resource;
import org.apache.wicket.mock.MockApplication;
+/**
+ */
public class DummyApplication extends MockApplication
{