You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2016/08/03 13:13:15 UTC
wicket git commit: WICKET-6221 WicketTester - missing border path
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 2e2ef50f6 -> 4f4ab530e
WICKET-6221 WicketTester - missing border path
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f4ab530
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f4ab530
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f4ab530
Branch: refs/heads/wicket-7.x
Commit: 4f4ab530e96c880c7e5b635f5bb295eedeb7ad47
Parents: 2e2ef50
Author: Andrea Del Bene <ad...@apache.org>
Authored: Wed Aug 3 15:11:58 2016 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Wed Aug 3 15:11:58 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/MarkupContainer.java | 2 +-
.../org/apache/wicket/markup/html/border/Border.java | 12 ++++++------
.../markup/parser/filter/WicketTagIdentifier.java | 2 ++
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f4ab530/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 379474b..c5e49ec 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2165,7 +2165,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
if (childType == ChildToDequeueType.NULL ||
childType == ChildToDequeueType.QUEUE_REGION)
{
- dequeue.skipToCloseTag();
+ dequeue.skipToCloseTag();
}
// pull the close tag off
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f4ab530/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
index ceef551..15c9dbe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.markup.html.border;
+import java.util.Objects;
+
import org.apache.wicket.Component;
import org.apache.wicket.DequeueContext;
import org.apache.wicket.DequeueTagAction;
import org.apache.wicket.IQueueRegion;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.ContainerInfo;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupException;
@@ -675,15 +676,14 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
private boolean canDequeueBody(ComponentTag tag)
{
- ContainerInfo containerInfo = (ContainerInfo)tag.getUserData(
- WicketTagIdentifier.CONTAINER_INFO);
- Class<?> containerClass = containerInfo != null ?
- containerInfo.getContainerClass() : null;
+ String tagCacheKey = (String)tag.getUserData(
+ WicketTagIdentifier.MARKUP_CACHE_KEY);
+ String borderCacheKey = getAssociatedMarkup().getMarkupResourceStream().getCacheKey();
boolean isBodyTag = (tag instanceof WicketTag) && ((WicketTag)tag).isBodyTag();
//the body tag might belong to an outer body component
- boolean isBorderBodyTag = containerClass == null || containerClass.equals(getClass());
+ boolean isBorderBodyTag = Objects.equals(tagCacheKey, borderCacheKey);
return isBodyTag && isBorderBodyTag;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f4ab530/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
index 99b7ee5..18a8b37 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
@@ -59,6 +59,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
public static final String CHILD = "child";
public static final String EXTEND = "extend";
+ public static final String MARKUP_CACHE_KEY = "markupCacheKey";
static {
WELL_KNOWN_TAG_NAMES.add(Border.BORDER);
@@ -123,6 +124,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
// Make it a Wicket component.
tag.setId(namespace + "_" + tag.getName() + getRequestUniqueId());
tag.setUserData(CONTAINER_INFO, getMarkupResourceStream().getContainerInfo());
+ tag.setUserData(MARKUP_CACHE_KEY, getMarkupResourceStream().getCacheKey());
tag.setModified(true);
if (isRaw(tag))