Author: vmolotkov Date: 2007-11-22 16:18:41 -0500 (Thu, 22 Nov 2007) New Revision: 4213 Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java Log: refactoring of rendering methods Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-22 21:12:54 UTC (rev 4212) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-22 21:18:41 UTC (rev 4213) @@ -141,14 +141,20 @@ public void encodeCaption(FacesContext context, UIComponent component) throws IOException { + encodeCaption(context, component, OrderingListRendererBase.FACET_CAPTION, "ol_label ol_out_label rich-ordering-list-caption"); + + } + + protected void encodeCaption(FacesContext context, UIComponent component, String facetCaption, String captionStyle) + throws IOException { ResponseWriter writer = context.getResponseWriter(); - UIComponent facetEl = component.getFacet(OrderingListRendererBase.FACET_CAPTION); + UIComponent facetEl = component.getFacet(facetCaption); boolean renderFacet = ((facetEl != null) && facetEl.isRendered()); String captionAttr = (String) component.getAttributes().get(OrderingListRendererBase.ATTRIBUTE_CAPTION_LABEL); if (renderFacet || (captionAttr != null)) { writer.startElement(HTML.DIV_ELEM, component); - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_label ol_out_label rich-ordering-list-caption", null); + writer.writeAttribute(HTML.class_ATTRIBUTE, captionStyle, null); if (renderFacet) { renderChild(context, facetEl); } else { @@ -156,22 +162,27 @@ } writer.endElement(HTML.DIV_ELEM); } - + } public void encodeHeader(FacesContext context, UIOrderingBaseComponent component) throws IOException { + encodeHeader(context, component, "rich-table-header", "ol_col rich-table-header-cell", "headerClass"); + } + + protected void encodeHeader(FacesContext context, UIOrderingBaseComponent component, String rowStyle, + String styleCell, String headerClassAttr) throws IOException { ResponseWriter writer = context.getResponseWriter(); //UIComponent header = orderingList.getHeader(); Iterator headers = component.columns(); if (headers.hasNext()) { writer.startElement("thead", component); - String headerClass = (String) component.getAttributes().get("headerClass"); + String headerClass = (String) component.getAttributes().get(headerClassAttr); writer.startElement("tr", component); - encodeStyleClass(writer, null, "rich-table-header", null, headerClass); - encodeHeaderFacets(context, writer, headers, "ol_col rich-table-header-cell", headerClass, "header", "th", component); + encodeStyleClass(writer, null, rowStyle, null, headerClass); + encodeHeaderFacets(context, writer, headers, styleCell, headerClass, "header", "th", component); writer.endElement("tr"); @@ -267,7 +278,8 @@ protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer, Iterator headers, String skinCellClass, - String headerClass, String facetName, String element, UIOrderingBaseComponent orderingList) + String headerClass, String facetName, String element, UIOrderingBaseComponent orderingList + ) throws IOException { while (headers.hasNext()) { UIComponent column = (UIComponent) headers.next();