Author: mgrigorov
Date: Tue Jul 26 15:34:55 2011
New Revision: 1151139
URL: http://svn.apache.org/viewvc?rev=1151139&view=rev
Log:
Do not re-resolve the enclosure's parent. It is passed already.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=1151139&r1=1151138&r2=1151139&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
Tue Jul 26 15:34:55 2011
@@ -160,13 +160,18 @@ public class Enclosure extends WebMarkup
}
/**
+ * Resolves the child component which is the controller of this
Enclosure
+ *
* @param markupStream
- * @param container
- * @return The component associated with the
+ * the markup stream of this Enclosure
+ * @param enclosureParent
+ * the non-auto parent component of this Enclosure
+ * @return The component associated with the {@value childId}
*/
- private Component getChildComponent(final MarkupStream markupStream,
MarkupContainer container)
+ private Component getChildComponent(final MarkupStream markupStream,
+ MarkupContainer enclosureParent)
{
- Component controller = getEnclosureParent().get(getChildId());
+ Component controller = enclosureParent.get(getChildId());
if (controller == null)
{
int orgIndex = markupStream.getCurrentIndex();
@@ -182,8 +187,8 @@ public class Enclosure extends WebMarkup
{
if
(childId.equals(tag.getId()))
{
- controller =
ComponentResolvers.resolve(container, markupStream,
- tag,
new ResolverFilter()
+ controller =
ComponentResolvers.resolve(enclosureParent,
+
markupStream, tag, new ResolverFilter()
{
public boolean ignoreResolver(
final IComponentResolver resolver)
