Author: jdonnerstag
Date: Tue Sep 15 20:13:19 2009
New Revision: 815462
URL: http://svn.apache.org/viewvc?rev=815462&view=rev
Log:
migrated code which was using deprecated methods
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/PageIdRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PageLinkPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanel_4.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
Tue Sep 15 20:13:19 2009
@@ -88,7 +88,7 @@
* them in your web application dir. To contribute yourself
(in case you want to pass
* false), your page header should look like:
*
- * <pre>
+ * <pre>
* <script type="text/javascript"
src="yahoo.js"></script>
* <script type="text/javascript"
src="dom.js"></script>
* <script type="text/javascript"
src="event.js"></script>
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PageLinkPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PageLinkPage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PageLinkPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PageLinkPage.java
Tue Sep 15 20:13:19 2009
@@ -16,14 +16,12 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.link.IPageLink;
-import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.link.Link;
/**
- * Page with examples on {...@link
org.apache.wicket.markup.html.link.PageLink}.
+ * Page with examples on {...@link org.apache.wicket.markup.html.link.Link}.
*
* @author Eelco Hillenius
*/
@@ -47,18 +45,14 @@
// anonymous class, which will create the page instance only
when
// needed.
- add(new PageLink("pageLink", new IPageLink()
+ add(new Link<Void>("pageLink")
{
- public Page getPage()
+ @Override
+ public void onClick()
{
- return new
NonBookmarkablePage(PageLinkPage.this);
+ setResponsePage(new
NonBookmarkablePage(PageLinkPage.this));
}
-
- public Class<? extends Page> getPageIdentity()
- {
- return NonBookmarkablePage.class;
- }
- }));
+ });
// Note that this would have had the same effect, except that
the link
// wouldn't check
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
Tue Sep 15 20:13:19 2009
@@ -48,7 +48,8 @@
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.MaskConverter;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.MinimumValidator;
+import org.apache.wicket.validation.validator.RangeValidator;
/**
@@ -94,10 +95,10 @@
add(stringTextField);
RequiredTextField<Integer> integerTextField = new
RequiredTextField<Integer>(
"integerProperty");
- add(integerTextField.add(NumberValidator.POSITIVE));
+ add(integerTextField.add(new
MinimumValidator<Integer>(0)));
add(new RequiredTextField<Double>("doubleProperty"));
- add(new
RequiredTextField<Integer>("integerInRangeProperty").add(NumberValidator.range(
+ add(new
RequiredTextField<Integer>("integerInRangeProperty").add(new
RangeValidator<Integer>(
0, 100)));
add(new CheckBox("booleanProperty"));
add(new Multiply("multiply"));
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
Tue Sep 15 20:13:19 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.linkomatic;
import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import org.apache.wicket.PageMap;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.examples.WicketExamplePage;
@@ -26,10 +25,8 @@
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.link.IPageLink;
import org.apache.wicket.markup.html.link.ImageMap;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.markup.html.link.PopupSettings;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.html.pages.RedirectPage;
@@ -93,32 +90,24 @@
"3++2 & 5 � >< space + �"));
// Link to BookDetails page
- add(new PageLink("bookDetailsLink", new IPageLink()
+ add(new Link<Void>("bookDetailsLink")
{
- public Page getPage()
- {
- return new BookDetails(new Book("The Hobbit"));
- }
-
- public Class<? extends Page> getPageIdentity()
+ @Override
+ public void onClick()
{
- return BookDetails.class;
+ setResponsePage(new BookDetails(new Book("The
Hobbit")));
}
- }));
+ });
// Delayed link to BookDetails page
- add(new PageLink("bookDetailsLink2", new IPageLink()
+ add(new Link<Void>("bookDetailsLink2")
{
- public Page getPage()
- {
- return new BookDetails(new Book("Inside The
Matrix"));
- }
-
- public Class<? extends Page> getPageIdentity()
+ @Override
+ public void onClick()
{
- return BookDetails.class;
+ setResponsePage(new BookDetails(new
Book("Inside The Matrix")));
}
- }));
+ });
// Image map link example
add(new ImageMap("imageMap").addRectangleLink(0, 0, 100, 100,
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
Tue Sep 15 20:13:19 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.MaximumValidator;
/**
* Another page of the stateless example.
@@ -44,7 +44,7 @@
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new
TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(NumberValidator.maximum(20));
+ field.add(new MaximumValidator<Integer>(20));
field.setRequired(true);
StatelessForm<?> statelessForm = new
StatelessForm("statelessform")
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
Tue Sep 15 20:13:19 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.MaximumValidator;
/**
* Another page of the stateless example.
@@ -44,7 +44,7 @@
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new
TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(NumberValidator.maximum(20));
+ field.add(new MaximumValidator<Integer>(20));
field.setRequired(true);
StatelessForm<?> statelessForm = new
StatelessForm("statelessform")
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
Tue Sep 15 20:13:19 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.MaximumValidator;
/**
* Another page of the stateless example.
@@ -44,7 +44,7 @@
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new
TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(NumberValidator.maximum(20));
+ field.add(new MaximumValidator<Integer>(20));
field.setRequired(true);
StatelessForm<?> statelessForm = new
StatelessForm("statelessform")
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
Tue Sep 15 20:13:19 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.MaximumValidator;
/**
* Another page of the stateless example.
@@ -44,7 +44,7 @@
add(new BookmarkablePageLink("indexLink", Index.class));
final TextField<Integer> field = new
TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(NumberValidator.maximum(20));
+ field.add(new MaximumValidator<Integer>(20));
field.setRequired(true);
StatelessForm<?> statelessForm = new
StatelessForm("statelessform")
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
Tue Sep 15 20:13:19 2009
@@ -87,7 +87,7 @@
{
Map<String, List<Person>> map = new HashMap<String,
List<Person>>();
map.put("persons", VelocityTemplateApplication.getPersons());
- templateContext = Model.valueOf(map);
+ templateContext = Model.ofMap(map);
add(new TemplateForm("templateForm"));
add(new VelocityPanel("templatePanel", templateContext)
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
Tue Sep 15 20:13:19 2009
@@ -137,7 +137,7 @@
*/
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<?
extends T> choices)
{
- this(id, model, Model.of(choices));
+ this(id, model, Model.ofList(choices));
}
/**
@@ -155,7 +155,7 @@
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<?
extends T> choices,
IChoiceRenderer<T> renderer)
{
- this(id, model, Model.of(choices), renderer);
+ this(id, model, Model.ofList(choices), renderer);
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Tue Sep 15 20:13:19 2009
@@ -21,7 +21,8 @@
import org.apache.wicket.IInitializer;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.ResourceReference;
-import org.apache.wicket.behavior.HeaderContributor;
+import org.apache.wicket.markup.html.CSSPackageResource;
+import org.apache.wicket.markup.html.JavascriptPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
@@ -79,18 +80,18 @@
* @param id
* @param form
*/
- public UploadProgressBar(String id, final Form< ? > form)
+ public UploadProgressBar(String id, final Form<?> form)
{
super(id);
setOutputMarkupId(true);
form.setOutputMarkupId(true);
setRenderBodyOnly(true);
- add(HeaderContributor.forJavaScript(JS));
+ add(JavascriptPackageResource.getHeaderContribution(JS));
ResourceReference css = getCss();
if (css != null)
{
- add(HeaderContributor.forCss(css));
+ add(CSSPackageResource.getHeaderContribution(css));
}
final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
Tue Sep 15 20:13:19 2009
@@ -66,7 +66,7 @@
public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<?
extends T> choices,
boolean autoSubmit)
{
- this(id, model, form, Model.valueOf(choices), defaultRenderer,
autoSubmit);
+ this(id, model, form, Model.ofList(choices), defaultRenderer,
autoSubmit);
}
/**
@@ -80,10 +80,9 @@
public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<?
extends T> choices,
IChoiceRenderer<T> renderer, boolean autoSubmit)
{
- this(id, model, form, Model.valueOf(choices), renderer,
autoSubmit);
+ this(id, model, form, Model.ofList(choices), renderer,
autoSubmit);
}
-
/**
* @param id
* component id
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java Tue
Sep 15 20:13:19 2009
@@ -36,7 +36,6 @@
import org.apache.wicket.request.target.component.ComponentRequestTarget;
import
org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget;
import org.apache.wicket.request.target.component.IPageRequestTarget;
-import org.apache.wicket.request.target.component.PageIdRequestTarget;
import org.apache.wicket.request.target.component.PageReferenceRequestTarget;
import org.apache.wicket.request.target.component.PageRequestTarget;
import
org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
Tue Sep 15 20:13:19 2009
@@ -49,9 +49,7 @@
* @param path
* The path
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final Class<?> scope,
final String path)
{
return CSSPackageResource.getHeaderContribution(scope, path);
@@ -69,9 +67,7 @@
* @param media
* The media type for this CSS ("print", "screen", etc.)
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final Class<?> scope,
final String path,
final String media)
{
@@ -85,9 +81,7 @@
* @param reference
*
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final ResourceReference
reference)
{
return CSSPackageResource.getHeaderContribution(reference);
@@ -101,9 +95,7 @@
* @param media
* The media type for this CSS ("print", "screen", etc.)
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final ResourceReference
reference,
final String media)
{
@@ -123,9 +115,7 @@
* @param location
* The location of the css file.
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final String location)
{
return CSSPackageResource.getHeaderContribution(location);
@@ -146,9 +136,7 @@
* @param media
* The media type for this CSS ("print", "screen", etc.)
* @return the new header contributor instance
- * @deprecated please use CSSPackageResource.getHeaderContribution()
instead
*/
- @Deprecated
public static final HeaderContributor forCss(final String location,
final String media)
{
return CSSPackageResource.getHeaderContribution(location,
media);
@@ -164,9 +152,7 @@
* @param path
* The path
* @return the new header contributor instance
- * @deprecated please use
JavascriptPackageResource.getHeaderContribution() instead
*/
- @Deprecated
public static final HeaderContributor forJavaScript(final Class<?>
scope, final String path)
{
return JavascriptPackageResource.getHeaderContribution(scope,
path);
@@ -179,9 +165,7 @@
* @param reference
*
* @return the new header contributor instance
- * @deprecated please use
JavascriptPackageResource.getHeaderContribution() instead
*/
- @Deprecated
public static final HeaderContributor forJavaScript(final
ResourceReference reference)
{
return
JavascriptPackageResource.getHeaderContribution(reference);
@@ -200,9 +184,7 @@
* @param location
* The location of the java script file.
* @return the new header contributor instance
- * @deprecated please use
JavascriptPackageResource.getHeaderContribution() instead
*/
- @Deprecated
public static final HeaderContributor forJavaScript(final String
location)
{
return
JavascriptPackageResource.getHeaderContribution(location);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
Tue Sep 15 20:13:19 2009
@@ -32,7 +32,6 @@
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.apache.wicket.util.string.JavascriptStripper;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -305,15 +304,6 @@
{
try
{
- // @TODO remove in 1.5
- if (Application.get()
- .getResourceSettings()
-
.getStripJavascriptCommentsAndWhitespace())
- {
- String s = new String(input,
"UTF-8");
- return
JavascriptStripper.stripCommentsAndWhitespace(s).getBytes("UTF-8");
- }
-
IJavascriptCompressor compressor =
Application.get()
.getResourceSettings()
.getJavascriptCompressor();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Tue Sep 15 20:13:19 2009
@@ -909,12 +909,9 @@
* See the class documentation for further details on the form
processing
* </p>
*
- * @deprecated use {...@link #process(IFormSubmittingComponent)}
- *
* @return False if the form had an error
*/
- @Deprecated
- public boolean process()
+ private boolean process()
{
if (!isEnabledInHierarchy() || !isVisibleInHierarchy())
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
Tue Sep 15 20:13:19 2009
@@ -55,12 +55,16 @@
super(id, model);
}
+ /**
+ * @see
org.apache.wicket.markup.html.form.Form#process(org.apache.wicket.markup.html.form.IFormSubmittingComponent)
+ */
@Override
- public boolean process()
+ public void process(IFormSubmittingComponent submittingComponent)
{
// set redirect to true for a stateless form.
setRedirect(true);
- return super.process();
+
+ super.process(submittingComponent);
}
@Override
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Tue Sep 15 20:13:19 2009
@@ -160,7 +160,7 @@
*/
public ListView(final String id, final List<? extends T> list)
{
- this(id, Model.of(list));
+ this(id, Model.ofList(list));
}
/**
@@ -420,7 +420,7 @@
*/
public ListView<T> setList(List<? extends T> list)
{
- setDefaultModel(Model.of(list));
+ setDefaultModel(Model.ofList(list));
return this;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Tue Sep 15 20:13:19 2009
@@ -18,7 +18,6 @@
import java.io.Serializable;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -56,9 +55,7 @@
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.IPageLink;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.protocol.http.HttpSessionStore;
@@ -511,50 +508,6 @@
}
/**
- * assert <code>PageLink</code> link to page class.
- *
- * @param <C>
- *
- * @param path
- * path to <code>PageLink</code> component
- * @param expectedPageClass
- * expected page class to link
- * @return a <code>Result</code>
- */
- public <C extends Page> Result isPageLink(String path, Class<C>
expectedPageClass)
- {
- PageLink<?> pageLink =
(PageLink<?>)getComponentFromLastRenderedPage(path);
- try
- {
- for (Class<?> type = pageLink.getClass(); type !=
PageLink.class.getSuperclass(); type = type.getSuperclass())
- {
- try
- {
- Field iPageLinkField =
type.getDeclaredField("pageLink");
- iPageLinkField.setAccessible(true);
- IPageLink iPageLink =
(IPageLink)iPageLinkField.get(pageLink);
- return isEqual(expectedPageClass,
iPageLink.getPageIdentity());
- }
-
- catch (NoSuchFieldException e)
- {
- continue;
- }
- }
- throw new WicketRuntimeException(
- "Is this realy a PageLink? Cannot find
'pageLink' field");
- }
- catch (SecurityException e)
- {
- throw convertoUnexpect(e);
- }
- catch (IllegalAccessException e)
- {
- throw convertoUnexpect(e);
- }
- }
-
- /**
* assert component class
*
* @param <C>
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
Tue Sep 15 20:13:19 2009
@@ -505,19 +505,6 @@
}
/**
- * Asserts a <code>PageLink</code> link to a <code>Page</code> class.
- *
- * @param path
- * path to <code>PageLink</code> <code>Component</code>
- * @param expectedPageClass
- * expected <code>Page</code> class to link
- */
- public void assertPageLink(String path, Class<? extends Page>
expectedPageClass)
- {
- assertResult(isPageLink(path, expectedPageClass));
- }
-
- /**
* Asserts a last-rendered <code>Page</code> class.
*
* @param expectedRenderedPageClass
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
Tue Sep 15 20:13:19 2009
@@ -29,18 +29,16 @@
/**
* Construct.
- *
- *
*/
public BoxBorderTestPage_8()
{
Border border1 = new BorderComponent1("border1");
add(border1);
- Fragment panel1 = new Fragment("panel1", "frag1");
+ Fragment panel1 = new Fragment("panel1", "frag1", this);
border1.add(panel1);
- Fragment panel2 = new Fragment("panel2", "frag2");
+ Fragment panel2 = new Fragment("panel2", "frag2", this);
border1.add(panel2);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
Tue Sep 15 20:13:19 2009
@@ -37,7 +37,7 @@
Border myBorder = new BorderComponent1("myBorder");
add(myBorder);
- Fragment panel1 = new Fragment("fragmentsWillBeRenderedHere",
"fragmentSource");
+ Fragment panel1 = new Fragment("fragmentsWillBeRenderedHere",
"fragmentSource", this);
myBorder.add(panel1);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
Tue Sep 15 20:13:19 2009
@@ -100,8 +100,6 @@
form.submit();
assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
.getClass());
-
- application.assertPageLink("link", PageA.class);
}
/**
@@ -195,7 +193,7 @@
@Override
public Session newSession(Request request, Response response)
{
- return new MySession(this, request);
+ return new MySession(request);
}
@Override
@@ -231,9 +229,9 @@
* @param application
* @param request
*/
- protected MySession(WebApplication application, Request request)
+ protected MySession(Request request)
{
- super(application, request);
+ super(request);
}
protected final String getUsername()
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
Tue Sep 15 20:13:19 2009
@@ -20,7 +20,7 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.login.InterceptTest.MySession;
-import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,16 +41,7 @@
{
super();
add(new Label("label", "this page is secured"));
- add(new PageLink<PageA>("link", PageA.class)
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick()
- {
- super.onClick();
- }
- });
+ add(new BookmarkablePageLink<PageA>("link", PageA.class));
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
Tue Sep 15 20:13:19 2009
@@ -45,7 +45,5 @@
TestPage page = (TestPage)tester.getLastRenderedPage();
executedListener(TestPage.class, page.get("link"),
"TestPage_ExpectedResult-2.html");
-
- tester.assertPageLink("link", TestPage.class);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
Tue Sep 15 20:13:19 2009
@@ -16,10 +16,8 @@
*/
package org.apache.wicket.markup.html.header.testing3;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.IPageLink;
-import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
/**
@@ -42,21 +40,17 @@
current = panel1;
add(current);
- add(new PageLink("link", new IPageLink()
+ add(new Link<Void>("link")
{
private static final long serialVersionUID = 1L;
- public Page getPage()
+ @Override
+ public void onClick()
{
replacePanel();
- return TestPage.this;
+ setResponsePage(TestPage.this);
}
-
- public Class getPageIdentity()
- {
- return TestPage.this.getClass();
- }
- }));
+ });
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_1.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_1.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_1.java
Tue Sep 15 20:13:19 2009
@@ -33,10 +33,10 @@
*/
public InlinePanelPage_1()
{
- Fragment panel1 = new Fragment("myPanel1", "frag1");
+ Fragment panel1 = new Fragment("myPanel1", "frag1", this);
add(panel1);
- Fragment panel2 = new Fragment("myPanel2", "frag2");
+ Fragment panel2 = new Fragment("myPanel2", "frag2", this);
add(panel2);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_2.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_2.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_2.java
Tue Sep 15 20:13:19 2009
@@ -34,7 +34,7 @@
*/
public InlinePanelPage_2()
{
- Fragment panel1 = new Fragment("myPanel1", "frag1");
+ Fragment panel1 = new Fragment("myPanel1", "frag1", this);
add(panel1);
panel1.add(new Label("label1", "my label text"));
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
Tue Sep 15 20:13:19 2009
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.panel;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebPage;
@@ -54,7 +55,7 @@
*/
public FragmentWithAssociatedMarkupStream(final String id,
final String markupId)
{
- super(id, markupId);
+ super(id, markupId, (MarkupContainer)null);
}
@Override
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanel_4.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanel_4.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanel_4.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanel_4.java
Tue Sep 15 20:13:19 2009
@@ -34,10 +34,10 @@
{
super(id);
- Fragment panel1 = new Fragment("myPanel1", "frag1");
+ Fragment panel1 = new Fragment("myPanel1", "frag1", this);
add(panel1);
- Fragment panel2 = new Fragment("myPanel2", "frag2");
+ Fragment panel2 = new Fragment("myPanel2", "frag2", this);
add(panel2);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FirstPage.java
Tue Sep 15 20:13:19 2009
@@ -16,33 +16,32 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.IPageLink;
-import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.link.Link;
+/**
+ *
+ */
public class FirstPage extends WebPage
{
private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ */
public FirstPage()
{
- add(new PageLink("link", new IPageLink()
+ add(new Link<Void>("link")
{
-
private static final long serialVersionUID = 1L;
SecondPage page = new SecondPage(FirstPage.this);
- public Page getPage()
- {
- return page;
- }
-
- public Class getPageIdentity()
+ @Override
+ public void onClick()
{
- return SecondPage.class;
+ setResponsePage(page);
}
- }));
+ });
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java?rev=815462&r1=815461&r2=815462&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/SecondPage.java
Tue Sep 15 20:13:19 2009
@@ -16,31 +16,32 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.IPageLink;
-import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.link.Link;
+/**
+ *
+ */
public class SecondPage extends WebPage
{
private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ *
+ * @param page
+ */
public SecondPage(final FirstPage page)
{
- add(new PageLink("link", new IPageLink()
+ add(new Link<Void>("link")
{
-
private static final long serialVersionUID = 1L;
- public Page getPage()
- {
- return page;
- }
-
- public Class getPageIdentity()
+ @Override
+ public void onClick()
{
- return FirstPage.class;
+ setResponsePage(page);
}
- }));
+ });
}
}
