You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/19 23:07:55 UTC
[1/2] wicket git commit: Java 7 diamonds
Repository: wicket
Updated Branches:
refs/heads/master 3920131bf -> dec1293da
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d09c9934
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d09c9934
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d09c9934
Branch: refs/heads/master
Commit: d09c993408da1111f356c5af0a7bde161ac6aca5
Parents: 3920131
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 19 23:07:16 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 19 23:07:16 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/protocol/http/AjaxEnclosureListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d09c9934/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
index 5e6c0c0..d54a3d4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
@@ -70,7 +70,7 @@ public class AjaxEnclosureListener extends AjaxRequestTarget.AbstractListener
@Override
public void onBeforeRespond(final Map<String, Component> map, final AjaxRequestTarget target)
{
- final List<String> keysToRemove = new ArrayList<String>();
+ final List<String> keysToRemove = new ArrayList<>();
target.getPage().visitChildren(InlineEnclosure.class, new IVisitor<InlineEnclosure, Void>()
{
[2/2] wicket git commit: WICKET-6140 Ajax should prevent updating
components which are not on page
Posted by mg...@apache.org.
WICKET-6140 Ajax should prevent updating components which are not on page
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dec1293d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dec1293d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dec1293d
Branch: refs/heads/master
Commit: dec1293da853357f483eadec4616c9758ea025f9
Parents: d09c993
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 19 23:07:26 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 19 23:07:26 2016 +0200
----------------------------------------------------------------------
.../apache/wicket/ajax/AjaxRequestHandler.java | 19 ++++++++-----------
.../protocol/ws/api/WebSocketRequestHandler.java | 7 +++++++
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dec1293d/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
index 0251113..c24c927 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
@@ -225,7 +225,14 @@ public class AjaxRequestHandler implements AjaxRequestTarget
if (component.getOutputMarkupId() == false && !(component instanceof Page))
{
throw new IllegalArgumentException(
- "cannot update component that does not have setOutputMarkupId property set to true. Component: " +
+ "Cannot update component that does not have setOutputMarkupId property set to true. Component: " +
+ component.toString());
+ }
+ else if (component.getPage() != getPage())
+ {
+ throw new IllegalArgumentException(
+ "Cannot update component because its page is not the same as " +
+ "the one this handler has been created for. Component: " +
component.toString());
}
add(component, component.getMarkupId());
@@ -430,27 +437,18 @@ public class AjaxRequestHandler implements AjaxRequestTarget
return Strings.isEmpty(id) ? null : id;
}
- /**
- * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPageClass()
- */
@Override
public Class<? extends IRequestablePage> getPageClass()
{
return page.getPageClass();
}
- /**
- * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPageId()
- */
@Override
public Integer getPageId()
{
return page.getPageId();
}
- /**
- * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPageParameters()
- */
@Override
public PageParameters getPageParameters()
{
@@ -469,7 +467,6 @@ public class AjaxRequestHandler implements AjaxRequestTarget
return page.getRenderCount();
}
- /** {@inheritDoc} */
@Override
public PageLogData getLogData()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dec1293d/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 1b9e7e1..80ed75c 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
@@ -126,6 +126,13 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler
"cannot update component that does not have setOutputMarkupId property set to true. Component: " +
component.toString());
}
+ else if (component.getPage() != getPage())
+ {
+ throw new IllegalArgumentException(
+ "Cannot update component because its page is not the same as " +
+ "the one this handler has been created for. Component: " +
+ component.toString());
+ }
add(component, component.getMarkupId());
}
}