Non functional changes Java 7 diamonds Whitespace cleanup Remove local variable - it is children, not siblings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4385fcc8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4385fcc8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4385fcc8 Branch: refs/heads/lambdas Commit: 4385fcc878bfdebc2d80280b14edf81320082b34 Parents: d2db957 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Nov 14 15:08:10 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Nov 14 15:08:10 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 2 +- .../markup/html/TransparentWebMarkupContainer.java | 4 ++-- .../html/panel/AbstractMarkupSourcingStrategy.java | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4385fcc8/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index f244488..10ac026 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -986,7 +986,7 @@ public abstract class Component List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST); if (feedbacks == null) { - feedbacks = new ArrayList<Component>(); + feedbacks = new ArrayList<>(); getRequestCycle().setMetaData(FEEDBACK_LIST, feedbacks); } http://git-wip-us.apache.org/repos/asf/wicket/blob/4385fcc8/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 cc336f3..0bfd294 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 @@ -143,7 +143,7 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements if (get(id) == null) { - component = ComponentResolvers.resolveByComponentHierarchy(this, stream, tag); + component = ComponentResolvers.resolveByComponentHierarchy(this, stream, tag); } if (component != null) @@ -169,6 +169,6 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements parent = parent.getParent(); } - parent.add(component); + parent.add(component); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/4385fcc8/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java index b49f2f4..e576d2b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java @@ -57,7 +57,7 @@ public abstract class AbstractMarkupSourcingStrategy implements IMarkupSourcingS * the parent container. * @param * containerMarkup - * the markup of the container. + * the markup of the parent container. * @param child * The component to find the markup for. * @return the markup fragment for the child, or {@code null}. @@ -66,13 +66,13 @@ public abstract class AbstractMarkupSourcingStrategy implements IMarkupSourcingS IMarkupFragment containerMarkup, Component child) { IMarkupFragment childMarkupFound = null; - Iterator<Component> siblingsIterator = container.iterator(); - - while (siblingsIterator.hasNext() && childMarkupFound == null) + Iterator<Component> childrenIterator = container.iterator(); + + while (childrenIterator.hasNext() && childMarkupFound == null) { - Component sibling = siblingsIterator.next(); - - if(sibling == child || !sibling.isVisible()) + Component sibling = childrenIterator.next(); + + if (sibling == child || !sibling.isVisible()) { continue; }
