svn commit: r473689 - in /incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list: ListView.java Loop.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sat Nov 11 02:41:44 2006
New Revision: 473689

URL: http://svn.apache.org/viewvc?view=rev&rev=473689
Log:
ListView/Item and Loop/LoopItem are now based on MarkupFragments as a small step forward towards
MarkupFragment based rendering

Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/ListView.java
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/Loop.java

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/ListView.java?view=diff&rev=473689&r1=473688&r2=473689
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/ListView.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/ListView.java Sat Nov 11 02:41:44 2006
@@ -38,10 +38,10 @@
  * Example:
  * 
  * <pre>
- *                   &lt;tbody&gt;
- *                     &lt;tr wicket:id=&quot;rows&quot; class=&quot;even&quot;&gt;
- *                         &lt;td&gt;&lt;span wicket:id=&quot;id&quot;&gt;Test ID&lt;/span&gt;&lt;/td&gt;
- *                     ...    
+ * &lt;tbody&gt;
+ *   &lt;tr wicket:id=&quot;rows&quot; class=&quot;even&quot;&gt;
+ *   &lt;td&gt;&lt;span wicket:id=&quot;id&quot;&gt;Test ID&lt;/span&gt;&lt;/td&gt;
+ * ...    
  * </pre>
  * 
  * <p>
@@ -106,7 +106,7 @@
 	/**
 	 * @see wicket.Component#Component(MarkupContainer,String)
 	 */
-	public ListView(MarkupContainer parent, final String id)
+	public ListView(final MarkupContainer parent, final String id)
 	{
 		super(parent, id);
 	}
@@ -114,7 +114,7 @@
 	/**
 	 * @see wicket.Component#Component(MarkupContainer,String, IModel)
 	 */
-	public ListView(MarkupContainer parent, final String id, final IModel<List<T>> model)
+	public ListView(final MarkupContainer parent, final String id, final IModel<List<T>> model)
 	{
 		super(parent, id, model);
 
@@ -138,7 +138,7 @@
 	 *            List to cast to Serializable
 	 * @see wicket.Component#Component(MarkupContainer,String, IModel)
 	 */
-	public ListView(MarkupContainer parent, final String id, final List<T> list)
+	public ListView(final MarkupContainer parent, final String id, final List<T> list)
 	{
 		this(parent, id, new Model<List<T>>(list));
 	}
@@ -598,9 +598,6 @@
 	@Override
 	protected void onRender(final MarkupStream markupStream)
 	{
-		// Save position in markup stream
-		final int markupStart = markupStream.getCurrentIndex();
-
 		// Get number of items to be displayed
 		final int size = getViewSize();
 		if (size > 0)
@@ -614,17 +611,12 @@
 				// Get list item for index
 				ListItem item = (ListItem)get(Integer.toString(index));
 
-				// Rewind to start of markup for kids
-				markupStream.setCurrentIndex(markupStart);
-
 				// Render
 				renderItem(item);
 			}
 		}
-		else
-		{
-			markupStream.skipComponent();
-		}
+		
+		markupStream.skipComponent();
 	}
 
 	/**
@@ -657,6 +649,6 @@
 	 */
 	protected void renderItem(final ListItem item)
 	{
-		item.render(getMarkupStream());
+		item.render(new MarkupStream(getMarkupFragment()));
 	}
 }

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/Loop.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/Loop.java?view=diff&rev=473689&r1=473688&r2=473689
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/Loop.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/list/Loop.java Sat Nov 11 02:41:44 2006
@@ -206,7 +206,6 @@
 	 */
 	protected void renderItem(final LoopItem item)
 	{
-		item.render(getMarkupStream());
+		item.render(new MarkupStream(getMarkupFragment()));
 	}
-
 }