[richfaces-svn-commits] JBoss Rich Faces SVN: r22426 - in trunk/ui/iteration/ui/src: test/java/org/richfaces/component and 1 other directory.

Author: nbelaevski Date: 2011-04-15 11:57:33 -0400 (Fri, 15 Apr 2011) New Revision: 22426 Added: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChildrenIterator.java Removed: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChilderIterator.java Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java trunk/ui/iteration/ui/src/test/java/org/richfaces/component/UIDataTableTest.java Log: Renamed DataTableDataChilderIterator into DataTableDataChildrenIterator Deleted: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChilderIterator.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChilderIterator.java 2011-04-15 14:07:29 UTC (rev 22425) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChilderIterator.java 2011-04-15 15:57:33 UTC (rev 22426) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; - -import com.google.common.collect.AbstractIterator; -import com.google.common.collect.Iterators; - -/** - * @author Nick Belaevski - * - */ -class DataTableDataChilderIterator extends AbstractIterator<UIComponent> { - - private Iterator<UIComponent> dataTableChildren; - - private Iterator<UIComponent> columnChildren = Iterators.emptyIterator(); - - public DataTableDataChilderIterator(UIComponent dataTable) { - super(); - this.dataTableChildren = dataTable.getChildren().iterator(); - } - - @Override - protected UIComponent computeNext() { - while (columnChildren.hasNext() || dataTableChildren.hasNext()) { - if (columnChildren.hasNext()) { - return columnChildren.next(); - } - - UIComponent child = dataTableChildren.next(); - if (child instanceof UIColumn || child instanceof AbstractColumn) { - columnChildren = child.getChildren().iterator(); - } else { - columnChildren = Iterators.emptyIterator(); - return child; - } - } - - dataTableChildren = Iterators.emptyIterator(); - columnChildren = Iterators.emptyIterator(); - - return endOfData(); - } - -} Copied: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChildrenIterator.java (from rev 22419, trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChilderIterator.java) =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChildrenIterator.java (rev 0) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DataTableDataChildrenIterator.java 2011-04-15 15:57:33 UTC (rev 22426) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.component; + +import java.util.Iterator; + +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; + +import com.google.common.collect.AbstractIterator; +import com.google.common.collect.Iterators; + +/** + * @author Nick Belaevski + * + */ +class DataTableDataChildrenIterator extends AbstractIterator<UIComponent> { + + private Iterator<UIComponent> dataTableChildren; + + private Iterator<UIComponent> columnChildren = Iterators.emptyIterator(); + + public DataTableDataChildrenIterator(UIComponent dataTable) { + super(); + this.dataTableChildren = dataTable.getChildren().iterator(); + } + + @Override + protected UIComponent computeNext() { + while (columnChildren.hasNext() || dataTableChildren.hasNext()) { + if (columnChildren.hasNext()) { + return columnChildren.next(); + } + + UIComponent child = dataTableChildren.next(); + if (child instanceof UIColumn || child instanceof AbstractColumn) { + columnChildren = child.getChildren().iterator(); + } else { + columnChildren = Iterators.emptyIterator(); + return child; + } + } + + dataTableChildren = Iterators.emptyIterator(); + columnChildren = Iterators.emptyIterator(); + + return endOfData(); + } + +} Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-04-15 14:07:29 UTC (rev 22425) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-04-15 15:57:33 UTC (rev 22426) @@ -171,7 +171,7 @@ } protected Iterator<UIComponent> dataChildren() { - return new DataTableDataChilderIterator(this); + return new DataTableDataChildrenIterator(this); } public boolean isColumnFacetPresent(String facetName) { Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/component/UIDataTableTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/component/UIDataTableTest.java 2011-04-15 14:07:29 UTC (rev 22425) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/component/UIDataTableTest.java 2011-04-15 15:57:33 UTC (rev 22426) @@ -144,7 +144,7 @@ */ @Test public void testDataChildren() { - Assert.assertTrue(table.dataChildren() instanceof DataTableDataChilderIterator); + Assert.assertTrue(table.dataChildren() instanceof DataTableDataChildrenIterator); } /**