You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/19 00:15:04 UTC
svn commit: r998559 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Author: ivaynberg
Date: Sat Sep 18 22:15:04 2010
New Revision: 998559
URL: http://svn.apache.org/viewvc?rev=998559&view=rev
Log:
cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=998559&r1=998558&r2=998559&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java Sat Sep 18 22:15:04 2010
@@ -86,20 +86,16 @@ public abstract class AbstractRepeater e
protected final void onRender()
{
Iterator<? extends Component> it = renderIterator();
- if (it.hasNext())
+ while (it.hasNext())
{
- do
+ Component child = it.next();
+ if (child == null)
{
- Component child = it.next();
- if (child == null)
- {
- throw new IllegalStateException(
- "The render iterator returned null for a child. Container: " +
- this.toString() + "; Iterator=" + it.toString());
- }
- renderChild(child);
+ throw new IllegalStateException(
+ "The render iterator returned null for a child. Container: " + this.toString() +
+ "; Iterator=" + it.toString());
}
- while (it.hasNext());
+ renderChild(child);
}
}
@@ -150,6 +146,7 @@ public abstract class AbstractRepeater e
@Override
public IMarkupFragment getMarkup(final Component child)
{
+ // each direct child gets the markup of this repeater
return getMarkup();
}