Author: maksimkaszynski Date: 2007-08-24 08:38:52 -0400 (Fri, 24 Aug 2007) New Revision: 2469 Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.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-690 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-08-24 12:07:27 UTC (rev 2468) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-08-24 12:38:52 UTC (rev 2469) @@ -86,9 +86,9 @@ writer.startElement("col", column); getUtils().writeAttribute(writer, "width", column.getAttributes().get("width")); getUtils().writeAttribute(writer, "style", column.getAttributes().get("style")); - int cell_index = state.getCellIndex(); - Object columnClass = state.getColumnClass(cell_index); - if(columnClass!=null) getUtils().writeAttribute(writer, "class", columnClass); + //int cell_index = state.getCellIndex(); + //Object columnClass = state.getColumnClass(cell_index); + //if(columnClass!=null) getUtils().writeAttribute(writer, "class", columnClass); writer.endElement("col"); } @@ -119,10 +119,14 @@ state.setSepOffset(new Integer(sepOffset)); } + + variables.setVariable("client_id", client_id); variables.setVariable("cell_index", new Integer(cell_index)); variables.setVariable("sepOffset", new Integer(sepOffset)); - + variables.setVariable("headerColumnClass", state.getColumnClass()); + //variables.setVariable("headerCellClass", state.get); + headerCellTemplate.encodeBegin(context, column); headerRenderer.visit(context, column, writer, state); headerCellTemplate.encodeEnd(context, column); @@ -209,6 +213,7 @@ ComponentVariables variables = ComponentsVariableResolver.getVariables(footerCellTemplate, column); variables.setVariable("client_id", client_id); variables.setVariable("cell_index", new Integer(cell_index)); + variables.setVariable("footerColumnClass", state.getColumnClass()); UIComponent component = column.getFacet(FOOTER_PART); @@ -237,7 +242,7 @@ variables.setVariable("cell_id",cell_id); variables.setVariable("client_id", client_id); variables.setVariable("cell_index", new Integer(cell_index)); - variables.setVariable("columnClass", state.getColumnClass(cell_index)); + variables.setVariable("columnClass", state.getColumnClass()); cellTemplate.encodeBegin(context, column); if(!state.isFake()) { Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-08-24 12:07:27 UTC (rev 2468) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-08-24 12:38:52 UTC (rev 2469) @@ -392,6 +392,15 @@ this.fake = fake; } + public String getColumnHeaderClass() { + return ""; + } + + + public String getColumnClass() { + return getColumnClass(getCellIndex()); + } + public String getColumnClass(int index) { if(columnClasses != null) { return columnClasses[index % columnClassesSize]; 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-08-24 12:07:27 UTC (rev 2468) +++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2007-08-24 12:38:52 UTC (rev 2469) @@ -11,7 +11,7 @@ component="javax.faces.component.UIComponent" - <td class="dr-sdt-bc rich-sdt-column-cell #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}"> + <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{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-08-24 12:07:27 UTC (rev 2468) +++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2007-08-24 12:38:52 UTC (rev 2469) @@ -11,7 +11,7 @@ component="javax.faces.component.UIComponent" - <th class="dr-sdt-fc rich-sdt-footer-cell #{component.attributes['footerClass']}"> + <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass} #{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-08-24 12:07:27 UTC (rev 2468) +++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-08-24 12:38:52 UTC (rev 2469) @@ -12,7 +12,7 @@ component="javax.faces.component.UIComponent" - <th class="dr-sdt-hc rich-sdt-header-cell" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}"> + <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass}" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}"> <vcp:body/>