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 2014/03/13 15:21:14 UTC
[3/4] git commit: WICKET-5531 Create new placeholder tag to indicate
where header contributions should appear
WICKET-5531 Create new placeholder tag to indicate where header contributions should appear
Copy <wicket:head> contents right after </wicket:header-items> when <wicket:header-items> is used.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/686030c6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/686030c6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/686030c6
Branch: refs/heads/wicket-6.x
Commit: 686030c6763baf24fb8a8f3b24a396369d6f16e1
Parents: c31f30f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 13 16:07:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 13 16:07:20 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/markup/MergedMarkup.java | 7 ++++---
.../src/main/java/org/apache/wicket/markup/WicketTag.java | 2 ++
.../wicket/markup/parser/filter/OpenCloseTagExpander.java | 5 +++++
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/686030c6/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
index d4c14d2..e685827 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
@@ -162,7 +162,7 @@ public class MergedMarkup extends Markup
{
WicketTag wtag = (WicketTag)element;
- // Found org.apache.wicket.child in base markup. In case of 3+
+ // Found wicket:child in the base markup. In case of 3+
// level inheritance make sure the child tag is not from one of
// the deeper levels
if (wtag.isChildTag() && tag.getMarkupClass() == markupClass)
@@ -204,8 +204,7 @@ public class MergedMarkup extends Markup
// Add the <wicket:head> body from the derived markup.
copyWicketHead(markup, extendIndex);
- // Do not add the current tag. It has already been
- // added.
+ // Do not add the current tag. It has already been added.
continue;
}
@@ -231,6 +230,7 @@ public class MergedMarkup extends Markup
// if <head> in base markup
if ((tag.isClose() && TagUtils.isHeadTag(tag)) ||
+ (tag.isClose() && TagUtils.isWicketHeaderItemsTag(tag)) ||
(tag.isOpen() && TagUtils.isBodyTag(tag)))
{
wicketHeadProcessed = true;
@@ -397,6 +397,7 @@ public class MergedMarkup extends Markup
* Append the wicket:head regions from the extended markup to the current markup
*
* @param markup
+ * The markup of the child/inherited container
* @param extendIndex
*/
private void copyWicketHead(final IMarkupFragment markup, int extendIndex)
http://git-wip-us.apache.org/repos/asf/wicket/blob/686030c6/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java
index 120d2af..b144758 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java
@@ -70,7 +70,9 @@ public class WicketTag extends ComponentTag
* Get the tag's name attribute: e.g. <wicket:region name=panel>
*
* @return The tag's name attribute
+ * @deprecated This method is obsolete since a long time
*/
+ @Deprecated
public final String getNameAttribute()
{
return getAttributes().getString("name");
http://git-wip-us.apache.org/repos/asf/wicket/blob/686030c6/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
index 7b0ddfe..f89a11b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
+import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.parser.XmlTag.TagType;
import org.apache.wicket.markup.resolver.HtmlHeaderResolver;
@@ -92,6 +93,10 @@ public class OpenCloseTagExpander extends AbstractMarkupFilter
if (onFound(tag))
{
next = new ComponentTag(tag.getName(), TagType.CLOSE);
+ if (getWicketNamespace().equals(tag.getNamespace()))
+ {
+ next = new WicketTag(next);
+ }
next.setNamespace(tag.getNamespace());
next.setOpenTag(tag);
next.setModified(true);