Author: vmolotkov Date: 2007-11-16 14:43:56 -0500 (Fri, 16 Nov 2007) New Revision: 4052 Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java Log: rendering of facets was corrected Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16 19:19:33 UTC (rev 4051) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16 19:43:56 UTC (rev 4052) @@ -392,25 +392,23 @@ String htmlElem = HTML.a_ELEMENT; UIComponent facet = orderingList.getFacet(helper.getFacetName()); String customEvent = null; - if (useFacet) { - renderChild(context, facet); - } else { - Map attributes = orderingList.getAttributes(); - if (helper.customEvent != null) { - customEvent = (String) attributes.get(helper.customEvent); - } + Map attributes = orderingList.getAttributes(); + if (helper.customEvent != null) { + customEvent = (String) attributes.get(helper.customEvent); + } - String styleFromAttribute = (String) attributes - .get(helper.styleFromAttribute); - String currentStyle = helper.getStyleClassName(); + String styleFromAttribute = (String) attributes + .get(helper.styleFromAttribute); + String currentStyle = helper.getStyleClassName(); - if (styleFromAttribute != null) { - currentStyle = styleFromAttribute.concat(currentStyle); - } + if (styleFromAttribute != null) { + currentStyle = styleFromAttribute.concat(currentStyle); + } - writer.startElement(HTML.DIV_ELEM, orderingList); - writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME: - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden"), null); + writer.startElement(HTML.DIV_ELEM, orderingList); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME: + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden") + currentStyle, null); + if (!useFacet) { writer.startElement(HTML.DIV_ELEM, orderingList); writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button", null); @@ -424,16 +422,16 @@ writer.startElement(HTML.DIV_ELEM, orderingList); writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_content", null); - writer.startElement(htmlElem, orderingList); - // writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + - // helper.getIdSuffix(), null); - if (customEvent != null) { - writer - .writeAttribute(HTML.onclick_ATTRIBUTE, customEvent, - null); - } + } - // writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null); + writer.startElement(htmlElem, orderingList); + if (customEvent != null) { + writer.writeAttribute(HTML.onclick_ATTRIBUTE, customEvent,null); + } + + if (useFacet) { + renderChild(context, facet); + } else { writer.startElement(HTML.IMG_ELEMENT, orderingList); writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null); @@ -462,12 +460,18 @@ writer.writeText(label, null); } - writer.endElement(htmlElem); + } + // writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + + // helper.getIdSuffix(), null); + // writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null); + writer.endElement(htmlElem); + + if (!useFacet) { writer.endElement(HTML.DIV_ELEM); writer.endElement(HTML.DIV_ELEM); - writer.endElement(HTML.DIV_ELEM); } + writer.endElement(HTML.DIV_ELEM); } protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer,