svn commit: r833658 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list: AbstractItem.java ListView.java Loop.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Nov  7 09:35:25 2009
New Revision: 833658

URL: http://svn.apache.org/viewvc?rev=833658&view=rev
Log:
theoretically you could now use any component and not just ListItem, LoopItem 
as an item for ListView or Loop. 

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/AbstractItem.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/AbstractItem.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/AbstractItem.java?rev=833658&r1=833657&r2=833658&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/AbstractItem.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/AbstractItem.java
 Sat Nov  7 09:35:25 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.wicket.markup.html.list;
 
-import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
 
@@ -76,14 +75,4 @@
        {
                this(Integer.toString(id));
        }
-
-       /**
-        * @see org.apache.wicket.Component#getMarkup()
-        */
-       @Override
-       public final IMarkupFragment getMarkup()
-       {
-               // The LoopItems markup is equal to the Loops markup
-               return getParent().getMarkup();
-       }
 }
\ No newline at end of file

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=833658&r1=833657&r2=833658&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
 Sat Nov  7 09:35:25 2009
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.apache.wicket.Component;
+import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.repeater.AbstractRepeater;
 import org.apache.wicket.model.IModel;
@@ -676,4 +677,14 @@
        {
                setDefaultModelObject(object);
        }
+
+       /**
+        * @see 
org.apache.wicket.markup.repeater.AbstractRepeater#getMarkup(org.apache.wicket.Component)
+        */
+       @Override
+       public IMarkupFragment getMarkup(Component child)
+       {
+               // The childs markup is always equal to the parents markup.
+               return getMarkup();
+       }
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=833658&r1=833657&r2=833658&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java 
Sat Nov  7 09:35:25 2009
@@ -19,6 +19,7 @@
 import java.util.Iterator;
 
 import org.apache.wicket.Component;
+import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.repeater.AbstractRepeater;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -164,4 +165,14 @@
        {
                item.render();
        }
+
+       /**
+        * @see 
org.apache.wicket.markup.repeater.AbstractRepeater#getMarkup(org.apache.wicket.Component)
+        */
+       @Override
+       public IMarkupFragment getMarkup(Component child)
+       {
+               // The childs markup is always equal to the parents markup.
+               return getMarkup();
+       }
 }