Author: abelevich Date: 2009-10-20 08:17:56 -0400 (Tue, 20 Oct 2009) New Revision: 15733 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java Log: Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2009-10-20 12:16:48 UTC (rev 15732) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2009-10-20 12:17:56 UTC (rev 15733) @@ -23,6 +23,7 @@ import java.util.Iterator; +import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; import javax.faces.component.UIPanel; @@ -36,7 +37,7 @@ public static final String COMPONENT_FAMILY = "org.richfaces.Colgroup"; - public Iterator<UIComponent> columns(){ + public Iterator<UIColumn> columns(){ return new ColumnsIterator(this); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2009-10-20 12:16:48 UTC (rev 15732) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2009-10-20 12:17:56 UTC (rev 15733) @@ -2,11 +2,12 @@ import java.util.Iterator; +import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; public class UIDataTable extends UISequence{ - public Iterator<UIComponent> columns() { + public Iterator<UIColumn> columns() { return new ColumnsIterator(this); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-10-20 12:16:48 UTC (rev 15732) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-10-20 12:17:56 UTC (rev 15733) @@ -23,6 +23,7 @@ import java.util.Iterator; +import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; @@ -59,9 +60,9 @@ /* (non-Javadoc) * @see org.richfaces.component.UIDataTable#columns() */ - public Iterator<UIComponent> columns() { - return super.columns(); - } +// public Iterator<UIComponent> columns() { +// return super.columns(); +// } /** * @return the sortExpression