Reformat the code to follow Wicket rules. No functional changes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7cd3bd91 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7cd3bd91 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7cd3bd91 Branch: refs/heads/sandbox/component-queueing-2 Commit: 7cd3bd91323c2457ac7a9288788de0fbea6dc5c4 Parents: c3e4620 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Feb 18 14:59:19 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Feb 18 14:59:19 2014 +0200 ---------------------------------------------------------------------- .../wicket/markup/html/border/Border.java | 77 ++++++++++++-------- 1 file changed, 46 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7cd3bd91/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 39e0576..be6dfc1 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 @@ -548,67 +548,82 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes * tag that the border is attached to (usually the first tag) */ - int i=0; - while (i<fragment.size()) { - MarkupElement element=fragment.get(i); - if (element instanceof ComponentTag&&((ComponentTag)element).getId().equals(border.getId()) ){ + int i = 0; + while (i < fragment.size()) + { + MarkupElement element = fragment.get(i); + if (element instanceof ComponentTag + && ((ComponentTag)element).getId().equals(border.getId())) + { break; } i++; } - if (i>=fragment.size()) { - throw new IllegalStateException("Could not find starting border tag for border: "+border.getId()+" in markup: "+fragment); + if (i >= fragment.size()) + { + throw new IllegalStateException("Could not find starting border tag for border: " + + border.getId() + " in markup: " + fragment); } - + /* - * (i) is now at the border tag, find the next component tag which + * (i) is now at the border tag, find the next component tag which */ i++; - while (i<fragment.size()) { + while (i < fragment.size()) + { MarkupElement element = fragment.get(i); - if (element instanceof ComponentTag) { + if (element instanceof ComponentTag) + { break; } i++; } - - ComponentTag tag=(ComponentTag) fragment.get(i); - if (tag.isClose()) { + + ComponentTag tag = (ComponentTag)fragment.get(i); + if (tag.isClose()) + { // this closes the border tag, border only has raw markup return null; - } - + } + return new MarkupFragment(fragment, i); - + } - + @Override - public Component findComponentToDequeue(ComponentTag tag) { - /* the body container is allowed to search for queued components - * all the way to the page even though it is an IQueueRegion so it can + public Component findComponentToDequeue(ComponentTag tag) + { + /* + * the body container is allowed to search for queued components all + * the way to the page even though it is an IQueueRegion so it can * find components queueud below the border */ - - Component component=super.findComponentToDequeue(tag); - if (component!=null) { + + Component component = super.findComponentToDequeue(tag); + if (component != null) + { return component; } - - MarkupContainer cursor=getParent(); - while (cursor!=null) { - component=cursor.findComponentToDequeue(tag); - if (component!=null) { + + MarkupContainer cursor = getParent(); + while (cursor != null) + { + component = cursor.findComponentToDequeue(tag); + if (component != null) + { return component; } - if (cursor instanceof BorderBodyContainer) { - // optimization - find call above wouldve already recursed to page + if (cursor instanceof BorderBodyContainer) + { + // optimization - find call above wouldve already recursed + // to page break; } - cursor=cursor.getParent(); + cursor = cursor.getParent(); } return null; }
