Author: maksimkaszynski Date: 2007-09-03 07:08:13 -0400 (Mon, 03 Sep 2007) New Revision: 2699 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/util/ColumnUtil.java trunk/ui/scrollableDataTable/pom.xml trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java Log: Decoupled scrollableDataTable from dataTable component Modified: trunk/ui/dataTable/src/main/java/org/richfaces/util/ColumnUtil.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/util/ColumnUtil.java 2007-09-03 10:51:01 UTC (rev 2698) +++ trunk/ui/dataTable/src/main/java/org/richfaces/util/ColumnUtil.java 2007-09-03 11:08:13 UTC (rev 2699) @@ -21,9 +21,10 @@ package org.richfaces.util; +import javax.faces.component.UIComponent; import javax.faces.el.ValueBinding; -import org.richfaces.component.UIColumn; +import org.richfaces.component.Column; /** * @author Maksim Kaszynski @@ -41,10 +42,12 @@ * If attribute is not set, fall aback to component id */ - public static String getColumnSorting(UIColumn column) { + public static String getColumnSorting(Column column) { - ValueBinding binding = column.getValueBinding("sortExpression"); + UIComponent component = (UIComponent) column; + ValueBinding binding = component.getValueBinding("sortExpression"); + if (binding != null) { return binding.getExpressionString(); } @@ -56,7 +59,7 @@ } - return column.getId(); + return component.getId(); } } Modified: trunk/ui/scrollableDataTable/pom.xml =================================================================== --- trunk/ui/scrollableDataTable/pom.xml 2007-09-03 10:51:01 UTC (rev 2698) +++ trunk/ui/scrollableDataTable/pom.xml 2007-09-03 11:08:13 UTC (rev 2699) @@ -79,6 +79,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> <version>3.1.0-SNAPSHOT</version> + <scope>test</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-09-03 10:51:01 UTC (rev 2698) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-09-03 11:08:13 UTC (rev 2699) @@ -10,7 +10,7 @@ import javax.faces.context.FacesContext; -import org.richfaces.component.UIColumn; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableDataTable; import org.richfaces.model.SortField; import org.richfaces.model.SortOrder; @@ -35,8 +35,8 @@ UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent(); int columnIndex = e.getSortColumn(); - UIColumn column = - (UIColumn) grid.getChildren().get(columnIndex); + Column column = + (Column) grid.getChildren().get(columnIndex); String name = ColumnUtil.getColumnSorting(column); Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2007-09-03 10:51:01 UTC (rev 2698) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2007-09-03 11:08:13 UTC (rev 2699) @@ -5,7 +5,7 @@ import javax.faces.context.FacesContext; -import org.richfaces.component.UIColumn; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableDataTable; import org.richfaces.model.SortField; import org.richfaces.model.SortOrder; @@ -28,8 +28,8 @@ public void processSort(SortEvent e) { UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent(); int columnIndex = e.getSortColumn(); - UIColumn column = - (UIColumn) grid.getChildren().get(columnIndex); + Column column = + (Column) grid.getChildren().get(columnIndex); String name = ColumnUtil.getColumnSorting(column); Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-03 10:51:01 UTC (rev 2698) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-03 11:08:13 UTC (rev 2699) @@ -21,7 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.richfaces.component.Column; -import org.richfaces.component.UIColumn; import org.richfaces.component.UIScrollableDataTable; import org.richfaces.event.scroll.ScrollEvent; import org.richfaces.event.sort.SortEvent; @@ -175,8 +174,8 @@ Boolean sorting = null; - UIColumn column = - (UIColumn) grid.getChildren().get(columnIndex); + Column column = + (Column) grid.getChildren().get(columnIndex); String name = ColumnUtil.getColumnSorting(column);