Repository: wicket Updated Branches: refs/heads/wicket-6.x 258f93d59 -> 3ac7cfcc9
WICKET-6165 addind and using MarkupStream#isCurrentIndexInsideTheStream instead of MarkupStream#hasMore Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3ac7cfcc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3ac7cfcc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3ac7cfcc Branch: refs/heads/wicket-6.x Commit: 3ac7cfcc9842c80caf9683a02efafd8a2732ec4b Parents: 258f93d Author: Pedro Henrique Oliveira dos Santos <[email protected]> Authored: Mon Sep 5 02:00:29 2016 -0300 Committer: Pedro Henrique Oliveira dos Santos <[email protected]> Committed: Fri Feb 3 00:45:28 2017 -0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/MarkupContainer.java | 2 +- .../org/apache/wicket/markup/MarkupStream.java | 18 ++++++++++++++---- .../java/org/apache/wicket/markup/TagUtils.java | 2 +- .../html/TransparentWebMarkupContainer.java | 4 ++-- .../wicket/markup/html/border/BorderBehavior.java | 6 +++--- .../wicket/markup/html/internal/Enclosure.java | 2 +- .../markup/resolver/WicketMessageResolver.java | 4 ++-- 7 files changed, 24 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/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 d101fed..4ba140c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -1544,7 +1544,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp */ protected final void renderAll(final MarkupStream markupStream, final ComponentTag openTag) { - while (markupStream.hasMore()) + while (markupStream.isCurrentIndexInsideTheStream()) { // In case of Page we need to render the whole file. For all other components just what // is in between the open and the close tag. http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java index 99a5165..ae6642f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java @@ -134,7 +134,7 @@ public class MarkupStream public boolean equalTo(final MarkupStream that) { // While a has more markup elements - while (hasMore()) + while (isCurrentIndexInsideTheStream()) { // Get an element from each final MarkupElement thisElement = this.get(); @@ -163,7 +163,7 @@ public class MarkupStream } // If we've run out of markup elements in b - if (!that.hasMore()) + if (!that.isCurrentIndexInsideTheStream()) { // then the two streams match perfectly return true; @@ -271,8 +271,18 @@ public class MarkupStream } /** + * @return True if this markup stream is moved to a MarkupElement element + */ + public boolean isCurrentIndexInsideTheStream() + { + return currentIndex < markup.size(); + } + + /** * @return True if this markup stream has more MarkupElement elements + * @deprecated use {@link MarkupStream#isCurrentIndexInsideTheStream()} instead */ + @Deprecated public boolean hasMore() { return currentIndex < markup.size(); @@ -417,7 +427,7 @@ public class MarkupStream */ public boolean skipUntil(final Class<? extends MarkupElement> clazz) { - while (hasMore()) + while (isCurrentIndexInsideTheStream()) { if (clazz.isInstance(current)) { @@ -462,7 +472,7 @@ public class MarkupStream public void skipToMatchingCloseTag(final ComponentTag openTag) { // Loop through the markup in this container - while (hasMore()) + while (isCurrentIndexInsideTheStream()) { // If the current markup tag closes the openTag if (get().closes(openTag)) http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java index 740303e..b52f638 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java @@ -242,7 +242,7 @@ public class TagUtils MarkupStream stream = new MarkupStream(fragment); stream.setCurrentIndex(streamOffset); - while (stream.hasMore()) + while (stream.isCurrentIndexInsideTheStream()) { MarkupElement elem = stream.get(); http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java index 97998eb..834f675 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java @@ -131,8 +131,8 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements private void renderHeadForInnerSiblings(HtmlHeaderContainer container) { MarkupStream stream = new MarkupStream(getMarkup()); - - while (stream.hasMore()) + + while (stream.isCurrentIndexInsideTheStream()) { MarkupElement childOpenTag = stream.nextOpenTag(); http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java index ecb15b8..9459918 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java @@ -61,7 +61,7 @@ public class BorderBehavior extends Behavior stream.setCurrentIndex(0); boolean insideBorderMarkup = false; - while (stream.hasMore()) + while (stream.isCurrentIndexInsideTheStream()) { MarkupElement elem = stream.get(); stream.next(); @@ -104,7 +104,7 @@ public class BorderBehavior extends Behavior } } - if (!stream.hasMore()) + if (!stream.isCurrentIndexInsideTheStream()) { throw new WicketRuntimeException("Markup for component border " + getClass().getName() + " ended prematurely, was expecting </wicket:border>"); @@ -117,7 +117,7 @@ public class BorderBehavior extends Behavior final MarkupStream stream = getMarkupStream(component); final Response response = component.getResponse(); - while (stream.hasMore()) + while (stream.isCurrentIndexInsideTheStream()) { MarkupElement elem = stream.get(); stream.next(); http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java index 61cb29d..6e5eba4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java @@ -195,7 +195,7 @@ public class Enclosure extends WebMarkupContainer implements IComponentResolver int orgIndex = markupStream.getCurrentIndex(); try { - while (markupStream.hasMore()) + while (markupStream.isCurrentIndexInsideTheStream()) { markupStream.next(); if (markupStream.skipUntil(ComponentTag.class)) http://git-wip-us.apache.org/repos/asf/wicket/blob/3ac7cfcc/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java index 267626d..a6f2c97 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java @@ -218,7 +218,7 @@ public class WicketMessageResolver implements IComponentResolver log.warn("No value found for wicket:message tag with key: {}", key); // If open tag was open-close - if (markupStream.hasMore() == false) + if (markupStream.isCurrentIndexInsideTheStream() == false) { String formatedNotFound = String.format(NOT_FOUND, key); getResponse().write(formatedNotFound); @@ -346,7 +346,7 @@ public class WicketMessageResolver implements IComponentResolver // child component and save their tag index if (!tag.isOpenClose()) { - while (markupStream.hasMore() && !markupStream.get().closes(openTag)) + while (markupStream.isCurrentIndexInsideTheStream() && !markupStream.get().closes(openTag)) { MarkupElement element = markupStream.get();
