WICKET-5435 Ajaxified version of WebSession#getClientInfo should be added Since it uses Ajax it should be *Web*ClientInfo
(cherry picked from commit a2c21b134d0c855a1c1c7cd3d83ff1ad93c068d6) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a2c4cd4e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a2c4cd4e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a2c4cd4e Branch: refs/heads/master Commit: a2c4cd4ee53778f4a61209a8164b525765fa5670 Parents: cb723dd Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Dec 12 16:06:59 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Dec 14 23:05:30 2013 +0200 ---------------------------------------------------------------------- .../apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java | 7 ++++--- .../wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a2c4cd4e/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java index 00cdcca..1ac842c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AjaxBrowserInfoForm.java @@ -22,6 +22,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; import org.apache.wicket.core.request.ClientInfo; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.protocol.http.request.WebClientInfo; /** * An extension of BrowserInfoForm that uses AjaxFormSubmitBehavior @@ -58,7 +59,7 @@ public class AjaxBrowserInfoForm extends BrowserInfoForm protected void onAfterSubmit(AjaxRequestTarget target) { super.onAfterSubmit(target); - ClientInfo info = getSession().getClientInfo(); + WebClientInfo info = getWebSession().getClientInfo(); AjaxBrowserInfoForm.this.onAfterSubmit(target, info); } }); @@ -73,14 +74,14 @@ public class AjaxBrowserInfoForm extends BrowserInfoForm * @param info * The client info */ - protected void onAfterSubmit(AjaxRequestTarget target, ClientInfo info) + protected void onAfterSubmit(AjaxRequestTarget target, WebClientInfo info) { } /** * Does nothing. * - * Use {@linkplain #onAfterSubmit(org.apache.wicket.ajax.AjaxRequestTarget, org.apache.wicket.core.request.ClientInfo)} + * Use {@linkplain #onAfterSubmit(org.apache.wicket.ajax.AjaxRequestTarget, org.apache.wicket.protocol.http.request.WebClientInfo)} */ @Override protected final void afterSubmit() http://git-wip-us.apache.org/repos/asf/wicket/blob/a2c4cd4e/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java index 824caf0..9e6c8e0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java @@ -87,7 +87,7 @@ public class AjaxHelloBrowser extends WicketExamplePage AjaxBrowserInfoForm form = new AjaxBrowserInfoForm("form") { @Override - protected void onAfterSubmit(AjaxRequestTarget target, ClientInfo info) + protected void onAfterSubmit(AjaxRequestTarget target, WebClientInfo info) { super.onAfterSubmit(target, info);
