You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2015/06/27 18:04:18 UTC
wicket git commit: WICKET-5929 javadoc, naming;
WebSockets do not support getLastFocusedElementId
Repository: wicket
Updated Branches:
refs/heads/master 3151442e0 -> 17ae2091e
WICKET-5929 javadoc, naming; WebSockets do not support getLastFocusedElementId
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/17ae2091
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/17ae2091
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/17ae2091
Branch: refs/heads/master
Commit: 17ae2091e2d9df8e0d00ca51042189e20f0761dd
Parents: 3151442
Author: Sven Meier <sv...@apache.org>
Authored: Sat Jun 27 18:03:53 2015 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sat Jun 27 18:03:53 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/ajax/AjaxRequestTarget.java | 7 +++++++
.../core/request/handler/IPartialPageRequestHandler.java | 7 -------
.../java/org/apache/wicket/page/PartialPageUpdate.java | 10 ++++++++++
.../java/org/apache/wicket/page/PageForPartialUpdate.html | 2 +-
.../org/apache/wicket/page/XmlPartialPageUpdateTest.java | 4 ++--
.../wicket/protocol/ws/api/WebSocketRequestHandler.java | 10 ----------
6 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
index 9caad44..1bc4861 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
@@ -152,6 +152,13 @@ public interface AjaxRequestTarget extends IPartialPageRequestHandler, ILoggable
void registerRespondListener(ITargetRespondListener listener);
/**
+ * Returns the HTML id of the last focused element.
+ *
+ * @return markup id of last focused element, <code>null</code> if none
+ */
+ String getLastFocusedElementId();
+
+ /**
* Returns the page. Be aware that the page can be instantiated if this wasn't the case already.
*
* @return page instance
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPartialPageRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPartialPageRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPartialPageRequestHandler.java
index 806028f..da126a2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPartialPageRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPartialPageRequestHandler.java
@@ -103,13 +103,6 @@ public interface IPartialPageRequestHandler extends IPageRequestHandler
void focusComponent(Component component);
/**
- * Returns the HTML id of the last focused element.
- *
- * @return markup id of last focused element, <code>null</code> if none
- */
- String getLastFocusedElementId();
-
- /**
* Returns an unmodifiable collection of all components added to this target
*
* @return unmodifiable collection of all components added to this target
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java b/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java
index eccc78e..1817f9d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java
@@ -172,9 +172,19 @@ public abstract class PartialPageUpdate
writeFooter(response, encoding);
}
+ /**
+ * Hook-method called before components are written.
+ *
+ * @param response
+ */
protected void onBeforeRespond(Response response) {
}
+ /**
+ * Hook-method called after components are written.
+ *
+ * @param response
+ */
protected void onAfterRespond(Response response) {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-core/src/test/java/org/apache/wicket/page/PageForPartialUpdate.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PageForPartialUpdate.html b/wicket-core/src/test/java/org/apache/wicket/page/PageForPartialUpdate.html
index b701e5d..c20cc48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/PageForPartialUpdate.html
+++ b/wicket-core/src/test/java/org/apache/wicket/page/PageForPartialUpdate.html
@@ -14,6 +14,6 @@
-->
<html xmlns:wicket>
<body>
- <span wicket:id="container"> two brackets ]] greater than > CDATA start ]]> </span>
+ <span wicket:id="container"> two brackets: ]] greater than: > CDATA end: ]]> </span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
index b7fca9c..c3bca90 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
@@ -29,7 +29,7 @@ public class XmlPartialPageUpdateTest extends WicketTestCase {
* CData start "]]>" has to be encoded in "]]]]><![CDATA[>".
*/
@Test
- public void encode() {
+ public void encodeCdataEnd() {
PageForPartialUpdate page = new PageForPartialUpdate();
XmlPartialPageUpdate update = new XmlPartialPageUpdate(page);
@@ -40,6 +40,6 @@ public class XmlPartialPageUpdateTest extends WicketTestCase {
update.writeTo(response, "UTF-8");
- assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response><component id=\"container1\" ><![CDATA[<span wicket:id=\"container\" id=\"container1\"> two brackets ]] greater than > CDATA start ]]]]><![CDATA[> </span>]]></component></ajax-response>", response.getTextResponse().toString());
+ assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response><component id=\"container1\" ><![CDATA[<span wicket:id=\"container\" id=\"container1\"> two brackets: ]] greater than: > CDATA end: ]]]]><![CDATA[> </span>]]></component></ajax-response>", response.getTextResponse().toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/17ae2091/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java
index 1deee5b..949bf98 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java
@@ -30,10 +30,8 @@ import org.apache.wicket.page.XmlPartialPageUpdate;
import org.apache.wicket.request.ILogData;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.slf4j.Logger;
@@ -191,14 +189,6 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler
}
@Override
- public String getLastFocusedElementId()
- {
- WebRequest request = (WebRequest) page.getRequest();
- String id = request.getHeader("Wicket-FocusedElementId");
- return Strings.isEmpty(id) ? null : id;
- }
-
- @Override
public Page getPage()
{
return page;