You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/10/09 18:31:24 UTC

svn commit: r1396097 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java

Author: lofwyr
Date: Tue Oct  9 16:31:24 2012
New Revision: 1396097

URL: http://svn.apache.org/viewvc?rev=1396097&view=rev
Log:
TOBAGO-1202: Sheet-Header: Support for grouped column-headers and multiline-headers
 - NPE when there is no columns attribute

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1396097&r1=1396096&r2=1396097&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Tue Oct  9 16:31:24 2012
@@ -381,9 +381,14 @@ public abstract class AbstractUISheetLay
   private void layoutHeader() {
     final AbstractUISheet sheet = (AbstractUISheet) getLayoutContainer();
     final UIComponent header = sheet.getHeader();
+    final LayoutTokens columns = new LayoutTokens();
+    final List<AbstractUIColumn> renderedColumns = sheet.getRenderedColumns();
+    for (AbstractUIColumn ignored : renderedColumns) {
+      columns.addToken(RelativeLayoutToken.DEFAULT_INSTANCE);
+    }
     final LayoutTokens rows = new LayoutTokens();
     rows.addToken(AutoLayoutToken.INSTANCE);
-    final Grid grid = new Grid(sheet.getColumnLayout(), rows);
+    final Grid grid = new Grid(columns, rows);
 
     for(UIComponent child : header.getChildren()) {
       if (child instanceof LayoutComponent) {