Author: konstantin.mishin Date: 2008-02-20 11:48:46 -0500 (Wed, 20 Feb 2008) New Revision: 6217 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: RF-1741 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-02-20 16:44:12 UTC (rev 6216) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-02-20 16:48:46 UTC (rev 6217) @@ -82,7 +82,7 @@ return sortField2; } - public void toggleSortOrder(ELContext elContext){ + public void toggleSortOrder(){ if(Ordering.ASCENDING.equals(getSortOrder())) { setSortOrder(Ordering.DESCENDING); } else { Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-20 16:44:12 UTC (rev 6216) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-20 16:48:46 UTC (rev 6217) @@ -498,7 +498,6 @@ protected void doDecode(FacesContext context, UIComponent component) { Map<String, String> map = context.getExternalContext().getRequestParameterMap(); if (SORT_FILTER_PARAMETER.equals(map.get(component.getClientId(context)))) { - ELContext elContext = context.getELContext(); String clientId = map.get(SORT_FILTER_PARAMETER); List<UIComponent> list = component.getChildren(); UIDataTable table = (UIDataTable) component; @@ -519,7 +518,7 @@ if(!sortPriority.contains(id)) { sortPriority.add(id); } - column.toggleSortOrder(elContext); + column.toggleSortOrder(); } else if(isSingleSortMode){ column.setSortOrder(Ordering.UNSORTED); }