Author: abelevich Date: 2008-01-03 11:09:45 -0500 (Thu, 03 Jan 2008) New Revision: 5128 Modified: trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml trunk/sandbox/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java Log: add additional styles and styleClasses Modified: trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml =================================================================== --- trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml 2008-01-03 16:04:37 UTC (rev 5127) +++ trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml 2008-01-03 16:09:45 UTC (rev 5128) @@ -75,40 +75,25 @@ &html_control_events; <property> - <name>enabledClass</name> + <name>enabledStyleClass</name> <classname>java.lang.String</classname> </property> <property> - <name>disabledClass</name> + <name>enabledStyle</name> <classname>java.lang.String</classname> </property> <property> - <name>forceId</name> + <name>disabledStyleClass</name> <classname>java.lang.String</classname> </property> <property> - <name>forceIndex</name> + <name>disabledStyle</name> <classname>java.lang.String</classname> </property> - - <property> - <name>onSuccess</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>onFailure</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>onStart</name> - <classname>java.lang.String</classname> - </property> - + </properties> </component> Modified: trunk/sandbox/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java =================================================================== --- trunk/sandbox/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java 2008-01-03 16:04:37 UTC (rev 5127) +++ trunk/sandbox/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java 2008-01-03 16:09:45 UTC (rev 5128) @@ -1,16 +1,9 @@ package org.richfaces.component; import javax.faces.component.UISelectMany; -import javax.faces.context.FacesContext; public abstract class UIPickList extends UISelectMany{ - - @Override - public String getClientId(FacesContext context) { - //TODO forceId? - return super.getClientId(context); - } - + public abstract boolean isDisplayValueOnly(); public abstract void setDisplayValueOnly(boolean displayValueOnly); Modified: trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java =================================================================== --- trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-01-03 16:04:37 UTC (rev 5127) +++ trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-01-03 16:09:45 UTC (rev 5128) @@ -130,13 +130,14 @@ String selectedListClientId = picklist.getClientId(context) + SELECTED_SUFFIX; String hiddenFieldCliendId = picklist.getClientId(context) + HIDDEN_SUFFIX; - List selectItemList = SelectUtils.getSelectItems(context,picklist); + List <SelectItem> selectItemList = SelectUtils.getSelectItems(context,picklist); Converter converter = PickListUtils.findUISelectManyConverterFailsafe(context, picklist); Set lookupSet = PickListUtils.getSubmittedOrSelectedValuesAsSet(true, picklist, context, converter); List selectItemsForSelectedValues = selectItemsForSelectedList(context, picklist, selectItemList, converter, lookupSet); List selectItemsForAvailableList = selectItemsForAvailableList(context, picklist, selectItemList, selectItemsForSelectedValues, converter); writer.startElement("table", picklist); + writer.writeAttribute(HTML.id_ATTRIBUTE, picklist.getClientId(context), null); writer.startElement(HTML.TR_ELEMENT, picklist); writer.startElement(HTML.td_ELEM, picklist); @@ -176,16 +177,77 @@ writer.endElement("table"); } - private void encodeSelect(FacesContext context, UIComponent component, String clientId, boolean disabled, + private void encodeSelect(FacesContext context, UIPickList picklist, String clientId, boolean disabled, int size, List selectItemsToDisplay, Converter converter, ResponseWriter writer) throws IOException { - writer.startElement("select", component); + writer.startElement("select", picklist); writer.writeAttribute("id", clientId, "id"); writer.writeAttribute("name", clientId, null); writer.writeAttribute("multiple", "true", null); - writer.writeAttribute("class", "rich-pick-list rich-pick-list-outputlist", null); - String outputStyle = (String)component.getAttributes().get("outputStyle"); - String outputStyleClass = (String)component.getAttributes().get("outputStyleClass"); + getUtils().encodePassThruWithExclusions(context, picklist,"size,id,dir,multiple,name,class,style,styleClass,disabled"); + + + String computeStyleClass = "rich-pick-list rich-pick-list-outputlist"; + + String outputStyle = (String)picklist.getAttributes().get("style"); + String outputStyleClass = (String)picklist.getAttributes().get("styleClass"); + + if (outputStyle != null) { + outputStyle = outputStyle.trim(); + if(!outputStyle.endsWith(";")) { + outputStyle = outputStyle + ";"; + } + } + + if(outputStyleClass != null) { + computeStyleClass = computeStyleClass + " " + outputStyleClass; + } + + if (picklist.isDisplayValueOnly()) { + String displayValueOnlyStyleClass = picklist.getDisplayValueOnlyStyleClass(); + String displayValueOnlyStyle = picklist.getDisplayValueOnlyStyle(); + + if (displayValueOnlyStyleClass != null) { + computeStyleClass = computeStyleClass != null ? computeStyleClass + " " + + displayValueOnlyStyleClass : computeStyleClass; + } + + if (displayValueOnlyStyle != null) { + + displayValueOnlyStyle = displayValueOnlyStyle.trim(); + if(!displayValueOnlyStyle.endsWith(";")) { + displayValueOnlyStyle = displayValueOnlyStyle + ";"; + } + + outputStyle = outputStyle != null ? outputStyle + " " + displayValueOnlyStyle : outputStyle; + } + } + + if (disabled) { + String disabledStyleClass = (String)picklist.getAttributes().get("disabledStyleClass"); + if (disabledStyleClass != null) { + computeStyleClass = computeStyleClass + " " + disabledStyleClass; + } + + String disabledStyle = (String)picklist.getAttributes().get("disabledStyle"); + if (disabledStyle != null) { + outputStyle = outputStyle != null ? outputStyle + " " + disabledStyle : disabledStyle; + } + writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null); + + } else { + String enabledStyleClass = (String)picklist.getAttributes().get("enabledStyleClass"); + if (enabledStyleClass != null) { + computeStyleClass = computeStyleClass + " " + enabledStyleClass; + } + + String enabledStyle = (String)picklist.getAttributes().get("enabledStyle"); + if(enabledStyle != null) { + outputStyle = outputStyle != null ? outputStyle + "; " + enabledStyle : enabledStyle; + } + } + + writer.writeAttribute("class", computeStyleClass, null); writer.writeAttribute(HTML.style_ATTRIBUTE, outputStyle, null); writer.writeAttribute(HTML.STYLE_CLASS_ATTR, outputStyleClass, null); @@ -194,11 +256,8 @@ } else { writer.writeAttribute("size", Integer.toString(size), null); } - if (disabled) { - writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null); - } - - renderSelectOptions(context, component, converter, Collections.EMPTY_SET, selectItemsToDisplay); + + renderSelectOptions(context, picklist, converter, Collections.EMPTY_SET, selectItemsToDisplay); writer.writeText("", null); writer.endElement("select"); }