Author: konstantin.mishin
Date: 2007-09-04 11:27:08 -0400 (Tue, 04 Sep 2007)
New Revision: 2739
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
Log:
RF-780
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-04
15:26:24 UTC (rev 2738)
+++
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-04
15:27:08 UTC (rev 2739)
@@ -126,6 +126,14 @@
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("sepOffset", new Integer(sepOffset));
variables.setVariable("headerColumnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("headerColumnSortClass",
"rich-sdt-header-sort-up");
+ } else {
+ variables.setVariable("headerColumnSortClass",
"rich-sdt-header-sort-down");
+ }
+ }
//variables.setVariable("headerCellClass", state.get);
headerCellTemplate.encodeBegin(context, column);
@@ -170,34 +178,6 @@
}
- private Boolean getColumnSorting(UIScrollableDataTable grid, int columnIndex) {
-
- Boolean sorting = null;
-
- Column column =
- (Column) grid.getChildren().get(columnIndex);
-
- String name = ColumnUtil.getColumnSorting(column);
-
- SortOrder sortOrder = grid.getSortOrder();
-
- if (sortOrder != null) {
- SortField[] sortFields = sortOrder.getFields();
-
- if (sortFields != null) {
- for (int i = 0; i < sortFields.length && sorting == null; i++) {
- SortField sortField = sortFields[i];
-
- if ((name != null && name.equals(sortField.getName()))
- || columnIndex == sortField.getIndex()) {
- sorting = sortField.getAscending();
- }
- }
- }
- }
-
- return sorting;
- }
};
@@ -215,6 +195,14 @@
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("footerColumnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("footerColumnSortClass",
"rich-sdt-footer-sort-up");
+ } else {
+ variables.setVariable("footerColumnSortClass",
"rich-sdt-footer-sort-down");
+ }
+ }
UIComponent component = column.getFacet(FOOTER_PART);
if(component != null){
@@ -243,6 +231,14 @@
variables.setVariable("client_id", client_id);
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("columnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("columnSortClass",
"rich-sdt-column-sort-up");
+ } else {
+ variables.setVariable("columnSortClass",
"rich-sdt-column-sort-down");
+ }
+ }
cellTemplate.encodeBegin(context, column);
if(!state.isFake()) {
@@ -844,4 +840,34 @@
}
}
}
+
+ private Boolean getColumnSorting(UIScrollableDataTable grid, int columnIndex) {
+
+ Boolean sorting = null;
+
+ Column column =
+ (Column) grid.getChildren().get(columnIndex);
+
+ String name = ColumnUtil.getColumnSorting(column);
+
+ SortOrder sortOrder = grid.getSortOrder();
+
+ if (sortOrder != null) {
+ SortField[] sortFields = sortOrder.getFields();
+
+ if (sortFields != null) {
+ for (int i = 0; i < sortFields.length && sorting == null; i++) {
+ SortField sortField = sortFields[i];
+
+ if ((name != null && name.equals(sortField.getName()))
+ || columnIndex == sortField.getIndex()) {
+ sorting = sortField.getAscending();
+ }
+ }
+ }
+ }
+
+ return sorting;
+ }
+
}
Modified:
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
===================================================================
---
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2007-09-04
15:26:24 UTC (rev 2738)
+++
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2007-09-04
15:27:08 UTC (rev 2739)
@@ -11,7 +11,7 @@
component="javax.faces.component.UIComponent"
- <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass}
#{component.attributes['styleClass']}"
id="#{client_id}:c_#{cell_id}">
+ <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{columnSortClass}
#{component.attributes['styleClass']}"
id="#{client_id}:c_#{cell_id}">
<div id="#{client_id}:bc_#{cell_id}" class="dr-sdt-bcbody
#{component.attributes['cellClass']}"
style="#{component.attributes['cellStyle']}">
<vcp:body/>
</div>
Modified:
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
===================================================================
---
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2007-09-04
15:26:24 UTC (rev 2738)
+++
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2007-09-04
15:27:08 UTC (rev 2739)
@@ -11,7 +11,7 @@
component="javax.faces.component.UIComponent"
- <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass}
#{component.attributes['footerClass']}">
+ <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass}
#{footerColumnSortClass} #{component.attributes['footerClass']}">
<span id="#{client_id}:fc_#{cell_index}"
class="dr-sdt-fcbody1">
<span class="dr-sdt-fcbody">
<vcp:body/>
Modified:
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
---
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-04
15:26:24 UTC (rev 2738)
+++
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-04
15:27:08 UTC (rev 2739)
@@ -12,7 +12,7 @@
component="javax.faces.component.UIComponent"
- <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass}"
id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}"
sortable="#{component.attributes['sortable']}">
+ <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass}
#{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}"
columnIndex="#{cell_index}"
sortable="#{component.attributes['sortable']}">
<jsp:scriptlet>