Author: konstantin.mishin Date: 2010-03-11 13:14:34 -0500 (Thu, 11 Mar 2010) New Revision: 16562 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java Log: RF-8118 RF-8119 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-03-11 18:00:35 UTC (rev 16561) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-03-11 18:14:34 UTC (rev 16562) @@ -41,7 +41,7 @@ } public SortOrder getSortOrder() { - return (SortOrder) getStateHelper().get(PropertyKeys.sortOrder); + return (SortOrder) getStateHelper().eval(PropertyKeys.sortOrder); } public void setFilter(Filter<?> filter) { @@ -49,7 +49,7 @@ } public Filter<?> getFilter() { - return (Filter<?>) getStateHelper().get(PropertyKeys.filter); + return (Filter<?>) getStateHelper().eval(PropertyKeys.filter); } public void setFilterValue(Object filterValue) { @@ -57,7 +57,7 @@ } public Object getFilterValue() { - return getStateHelper().get(PropertyKeys.filterValue); + return getStateHelper().eval(PropertyKeys.filterValue); } public void setComparator(Comparator<?> comparator) { @@ -65,7 +65,7 @@ } public Comparator<?> getComparator() { - return (Comparator<?>) getStateHelper().get(PropertyKeys.comparator); + return (Comparator<?>) getStateHelper().eval(PropertyKeys.comparator); } public FilterField getFilterField() { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-11 18:00:35 UTC (rev 16561) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-11 18:14:34 UTC (rev 16562) @@ -132,7 +132,7 @@ } public String getFilterVar() { - return (String) getStateHelper().get(PropertyKeys.filterVar); + return (String) getStateHelper().eval(PropertyKeys.filterVar); } public void setFilterVar(String filterVar) { @@ -140,7 +140,7 @@ } public Collection<?> getSortPriority() { - return (Collection<?>) getStateHelper().get(PropertyKeys.sortPriority); + return (Collection<?>) getStateHelper().eval(PropertyKeys.sortPriority); } public void setSortPriority(Collection<?> sortPriority) { @@ -148,7 +148,7 @@ } public SortMode getSortMode() { - return (SortMode) getStateHelper().get(PropertyKeys.sortMode); + return (SortMode) getStateHelper().eval(PropertyKeys.sortMode); } public void setSortMode(SortMode sortMode) { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-03-11 18:00:35 UTC (rev 16561) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-03-11 18:14:34 UTC (rev 16562) @@ -95,7 +95,7 @@ } else if (component instanceof org.richfaces.component.UIColumn) { // For new row, save length of previsous. Map<String, Object> attributes = component.getAttributes(); - if ((Boolean)attributes.get("breakBefore")) { + if (Boolean.TRUE.equals(attributes.get("breakBefore"))) { if (currentLength > count) { count = currentLength; } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2010-03-11 18:00:35 UTC (rev 16561) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2010-03-11 18:14:34 UTC (rev 16562) @@ -28,7 +28,7 @@ if (component instanceof org.richfaces.component.UIColumn) { Map<String, Object> attributes = component.getAttributes(); - if ((Boolean)attributes.get("breakBefore") && holder.getProcessCell() != 0) { + if (Boolean.TRUE.equals(attributes.get("breakBefore")) && holder.getProcessCell() != 0) { encodeRowEnd(writer, context, component); holder.nextRow(); holder.setRowStart(true);