Author: nbelaevski Date: 2010-12-09 09:40:27 -0500 (Thu, 09 Dec 2010) New Revision: 20479 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataIterator.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java Log: https://issues.jboss.org/browse/RF-9778 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataIterator.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataIterator.java 2010-12-09 14:07:18 UTC (rev 20478) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataIterator.java 2010-12-09 14:40:27 UTC (rev 20479) @@ -24,6 +24,7 @@ import java.util.Iterator; +import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; @@ -43,7 +44,7 @@ UIComponent nextColumn = null; while (nextColumn == null && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); - if ((child instanceof AbstractColumn) || (child instanceof Column)) { + if ((child instanceof UIColumn) || (child instanceof Column)) { nextColumn = child; } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java 2010-12-09 14:07:18 UTC (rev 20478) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java 2010-12-09 14:40:27 UTC (rev 20479) @@ -24,6 +24,7 @@ import java.util.Iterator; +import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; @@ -47,7 +48,7 @@ Iterator<UIComponent> childrenIterator = getChildrenIterator(); while (next == null && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); - if ((child instanceof AbstractColumn) && child.isRendered()) { + if ((child instanceof UIColumn) && child.isRendered()) { currentColumnIterator = getChildFacetIterator(child); next = nextItem(); }