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 2011/06/29 17:10:42 UTC

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

Author: lofwyr
Date: Wed Jun 29 15:10:42 2011
New Revision: 1141127

URL: http://svn.apache.org/viewvc?rev=1141127&view=rev
Log:
TOBAGO-828: Make Sheet work with new LayoutManager
 - hotfix: NPE when using UIColumnSelector

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=1141127&r1=1141126&r2=1141127&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 Wed Jun 29 15:10:42 2011
@@ -122,6 +122,11 @@ public abstract class AbstractUISheetLay
 
         int index = 0;
         for (LayoutComponent component : sheet.getComponents()) {
+          if (component == null) {
+            LOG.error("fixme: UIColumnSelector must be a LayoutComponent!"); // fixme
+            index++;
+            continue;
+          }
           AbstractUIColumn column = (AbstractUIColumn) ((UIComponent) component).getParent();
           Measure width = Measure.valueOf(widthList.get(index));
           width = width.subtractNotNegative(LayoutUtils.getBorderBegin(orientation, column));