Author: andrei_exadel Date: 2008-02-18 06:25:36 -0500 (Mon, 18 Feb 2008) New Revision: 6129 Modified: trunk/ui/columns/src/main/config/component/columns.xml trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java Log: RF-2263 ,RF-2262 Modified: trunk/ui/columns/src/main/config/component/columns.xml =================================================================== --- trunk/ui/columns/src/main/config/component/columns.xml 2008-02-18 10:26:37 UTC (rev 6128) +++ trunk/ui/columns/src/main/config/component/columns.xml 2008-02-18 11:25:36 UTC (rev 6129) @@ -115,6 +115,28 @@ <classname>java.lang.String</classname> <description>Attribute defines a bean property which is used for sorting of a column</description> </property> + <property> + <name>sortOrder</name> + <classname>org.richfaces.model.Ordering</classname> + <description>SortOrder is an enumeration of the possible sort orderings.</description> + <defaultvalue>Ordering.UNSORTED</defaultvalue> + </property> + <property> + <name>comparator</name> + <classname>java.util.Comparator</classname> + <description></description> + </property> + <property> + <name>selfSorted</name> + <classname>boolean</classname> + <description></description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>dir</name> + <classname>java.lang.String</classname> + <description></description> + </property> </component> Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java =================================================================== --- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-02-18 10:26:37 UTC (rev 6128) +++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-02-18 11:25:36 UTC (rev 6129) @@ -152,7 +152,21 @@ */ private ValueExpression rendered = null; + /** + * Dir attr + */ + private ValueExpression _dir; + + /** + * Sets dir attr + * @param dir + */ + public void setDir(ValueExpression dir) { + _dir = dir; + } + + /** * style CSS style(s) is/are to be applied when this component is rendered */ private ValueExpression _style; @@ -306,6 +320,56 @@ private ValueExpression _sortable; /** + * sortOrder SortOrder is an enumeration of the possible sort orderings. + */ + private ValueExpression _sortOrder; + + /** + * SortOrder is an enumeration of the possible sort orderings. Setter for + * sortOrder + * + * @param sortOrder - + * new value + */ + public void setSortOrder(ValueExpression __sortOrder) { + this._sortOrder = __sortOrder; + } + + /** + * selfSorted + * + */ + private ValueExpression _selfSorted; + + /** + * + * Setter for selfSorted + * + * @param selfSorted - + * new value + */ + public void setSelfSorted(ValueExpression __selfSorted) { + this._selfSorted = __selfSorted; + } + + /** + * comparator + * + */ + private ValueExpression _comparator; + + /** + * + * Setter for comparator + * + * @param comparator - + * new value + */ + public void setComparator(ValueExpression __comparator) { + this._comparator = __comparator; + } + + /** * Boolean attribute. If "true" it's possible to sort the column content * after click on the header. Default value is "true" Setter for sortable * @@ -553,7 +617,10 @@ column.setValueExpression("width", _width); column.setValueExpression("sortable", _sortable); column.setValueExpression("sortExpression", _sortExpression); - column.setValueExpression("rendered", rendered); + column.setValueExpression("sortOrder", _sortOrder); + column.setValueExpression("comparator", _comparator); + column.setValueExpression("selfSorted", _selfSorted); + column.setValueExpression("dir", _dir); } /** @@ -566,7 +633,7 @@ } /** - * Deletes dynamic rich columns created before + * Deletes dynamic rich columns created before */ private void deleteRichColumns() { List<UIComponent> children = dataTable.getChildren();