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 2015/07/14 08:07:57 UTC
wicket git commit: Minor, non-functional improvements.
Repository: wicket
Updated Branches:
refs/heads/master 2e5da6d26 -> d9c0b3941
Minor, non-functional improvements.
Javadoc warning
Whitespace issues
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d9c0b394
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d9c0b394
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d9c0b394
Branch: refs/heads/master
Commit: d9c0b3941e4e91dfb0037302ac3e0b30e30589a1
Parents: 2e5da6d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 14 09:06:20 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 14 09:06:20 2015 +0300
----------------------------------------------------------------------
.../html/TransparentWebMarkupContainer.java | 37 ++++++++++----------
1 file changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d9c0b394/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 5add398..270560f 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
@@ -41,6 +41,7 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
* Construct.
*
* @param id
+ * The component id
*/
public TransparentWebMarkupContainer(String id)
{
@@ -67,7 +68,7 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
}
return resolvedComponent;
}
-
+
@Override
public void internalRenderHead(HtmlHeaderContainer container)
{
@@ -77,11 +78,11 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
* if this component is updated via AJAX and is the root
* one, then render head also for embedded components.
*/
- if(isAjaxRequest() && !isParentRendering())
+ if (isAjaxRequest() && !isParentRendering())
{
renderHeadForInnerSiblings(container);
}
-
+
super.internalRenderHead(container);
}
@@ -93,10 +94,10 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
private boolean isParentRendering()
{
MarkupContainer parent = getParent();
-
- return parent != null ? parent.isRendering() : false;
+
+ return parent != null && parent.isRendering();
}
-
+
/**
* Says if the current request is an AJAX one.
*
@@ -105,13 +106,13 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
private boolean isAjaxRequest()
{
Request request = RequestCycle.get().getRequest();
-
- if( request instanceof WebRequest)
- {
+
+ if (request instanceof WebRequest)
+ {
WebRequest webRequest = (WebRequest)request;
return webRequest.isAjax();
}
-
+
return false;
}
@@ -125,11 +126,11 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
private void renderHeadForInnerSiblings(HtmlHeaderContainer container)
{
MarkupStream stream = new MarkupStream(getMarkup());
-
+
while (stream.hasMore())
{
MarkupElement childOpenTag = stream.nextOpenTag();
-
+
if ((childOpenTag instanceof ComponentTag) && !stream.atCloseTag())
{
// Get element as tag
@@ -139,20 +140,20 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
final String id = tag.getId();
Component component = null;
-
+
if (get(id) == null)
{
component = ComponentResolvers.resolveByComponentHierarchy(this, stream, tag);
}
-
+
if (component != null)
{
component.internalRenderHead(container);
- }
-
+ }
+
//consider just direct children
stream.skipToMatchingCloseTag(tag);
- }
+ }
}
}
-}
\ No newline at end of file
+}