WICKET-5732 (code review with MArtin Grigorov) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7acfbff0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7acfbff0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7acfbff0
Branch: refs/heads/master Commit: 7acfbff0ccb0f5b5fe58c56c8ae5b46d4b72fac1 Parents: b5d9ca5 Author: Andrea Del Bene <[email protected]> Authored: Fri Oct 24 15:42:45 2014 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Fri Oct 31 17:40:26 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/IQueueRegion.java | 7 ++++--- .../java/org/apache/wicket/markup/html/MarkupUtil.java | 11 ++++------- .../org/apache/wicket/markup/html/border/Border.java | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7acfbff0/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java b/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java index 6127782..6836f04 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java +++ b/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java @@ -34,9 +34,10 @@ import org.apache.wicket.markup.IMarkupFragment; public interface IQueueRegion { /** - * TODO: this interface might be a perfect candidate for Java 8 interface default methods. - * Now methods implementation is in MarkupContainer while it should simply be in those - * class which implement this interface. + * TODO Wicket 8: this interface might be a perfect candidate for Java 8 interface default methods. + * Now methods implementation is in MarkupContainer while it should simply be in those + * classes which implement this interface. + * * */ /** http://git-wip-us.apache.org/repos/asf/wicket/blob/7acfbff0/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java index 614bbab..587fd13 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java @@ -86,18 +86,15 @@ public class MarkupUtil { MarkupStream stream = new MarkupStream(markup); - while (stream.skipUntil(ComponentTag.class)) + while (stream.skipUntil(WicketTag.class)) { ComponentTag tag = stream.getTag(); if (tag.isOpen() || tag.isOpenClose()) { - if (tag instanceof WicketTag) + WicketTag wtag = (WicketTag)tag; + if (tagName.equalsIgnoreCase(wtag.getName())) { - WicketTag wtag = (WicketTag)tag; - if (tagName.equalsIgnoreCase(wtag.getName())) - { - return stream.getMarkupFragment(); - } + return stream.getMarkupFragment(); } stream.skipToMatchingCloseTag(tag); http://git-wip-us.apache.org/repos/asf/wicket/blob/7acfbff0/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 aba5b7f..6888efb 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 @@ -626,8 +626,8 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes return markup; } - IMarkupFragment panelMarkup = MarkupUtil.findStartTag(markup, BORDER); + IMarkupFragment borderMarkup = MarkupUtil.findStartTag(markup, BORDER); - return panelMarkup != null ? panelMarkup : markup; + return borderMarkup != null ? borderMarkup : markup; } }
