svn commit: r1128387 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java

[ivaynberg]

Author: ivaynberg
Date: Fri May 27 16:37:32 2011
New Revision: 1128387

URL: http://svn.apache.org/viewvc?rev=1128387&view=rev
Log:
quickie test fix, need to think some more about this :/
Issue: WICKET-3702

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=1128387&r1=1128386&r2=1128387&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
 Fri May 27 16:37:32 2011
@@ -21,6 +21,7 @@ import java.util.List;
 import 
org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
 import 
org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.list.AbstractItem;
 import org.apache.wicket.markup.repeater.RepeatingView;
 
@@ -87,7 +88,14 @@ public class HeadersToolbar extends Abst
 
                        item.add(header);
                        item.setRenderBodyOnly(true);
-                       header.add(column.getHeader("label"));
+                       if (header instanceof Border)
+                       {
+                               
((Border)header).addToBody(column.getHeader("label"));
+                       }
+                       else
+                       {
+                               header.add(column.getHeader("label"));
+                       }
 
                }
        }