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/02/18 14:24:55 UTC
[3/4] git commit: Code formating and adding TODOs. No functional
changes
Code formating and adding TODOs. 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/4492c124
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4492c124
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4492c124
Branch: refs/heads/sandbox/component-queueing-2
Commit: 4492c12438b0ca8f3b3cb728ede8634d31234bd5
Parents: 7cd3bd9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 18 15:06:38 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 18 15:06:38 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/border/Border.java | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4492c124/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 be6dfc1..2d03277 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
@@ -551,6 +551,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
int i = 0;
while (i < fragment.size())
{
+ // TODO queueing Use fragment.find(border.getId()); instead ?!
MarkupElement element = fragment.get(i);
if (element instanceof ComponentTag
&& ((ComponentTag)element).getId().equals(border.getId()))
@@ -567,7 +568,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
}
- /*
+ /* TODO queueing The comment is not finished
* (i) is now at the border tag, find the next component tag which
*/
@@ -590,8 +591,6 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
}
return new MarkupFragment(fragment, i);
-
-
}
@Override
@@ -600,7 +599,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
/*
* 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
+ * find components queued below the border
*/
Component component = super.findComponentToDequeue(tag);
@@ -619,7 +618,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
}
if (cursor instanceof BorderBodyContainer)
{
- // optimization - find call above wouldve already recursed
+ // optimization - find call above would've already recursed
// to page
break;
}
@@ -631,8 +630,10 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
@Override
- protected boolean canDequeueTag(ComponentTag tag) {
- if ((tag instanceof WicketTag)&&((WicketTag)tag).isBodyTag()) {
+ protected boolean canDequeueTag(ComponentTag tag)
+ {
+ if ((tag instanceof WicketTag)&&((WicketTag)tag).isBodyTag())
+ {
return true;
}
@@ -640,15 +641,18 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
}
@Override
- public Component findComponentToDequeue(ComponentTag tag) {
- if ((tag instanceof WicketTag)&&((WicketTag)tag).isBodyTag()) {
+ public Component findComponentToDequeue(ComponentTag tag)
+ {
+ if ((tag instanceof WicketTag) && ((WicketTag)tag).isBodyTag())
+ {
return getBodyContainer();
}
return super.findComponentToDequeue(tag);
}
@Override
- protected void addDequeuedComponent(Component component, ComponentTag tag) {
+ protected void addDequeuedComponent(Component component, ComponentTag tag)
+ {
// components queued in border get dequeued into the border not into the body container
addToBorder(component);
}