Author: abelevich Date: 2008-02-19 13:03:16 -0500 (Tue, 19 Feb 2008) New Revision: 6180 Modified: trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java Log: Modified: trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java =================================================================== --- trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-02-19 17:19:03 UTC (rev 6179) +++ trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-02-19 18:03:16 UTC (rev 6180) @@ -36,7 +36,8 @@ */ public class ComboBoxBaseRenderer extends HeaderResourcesRendererBase { - private ArrayList <String> valuesList = null; + private List valuesList = null; + private final String RICH_COMBOBOX_ITEM_CLASSES = "rich-combobox-item rich-combobox-item-normal"; private static Log logger = LogFactory.getLog(ComboBoxBaseRenderer.class); @@ -83,20 +84,20 @@ Object suggestionValues = comboBox.getSuggestionValues(); ResponseWriter writer = context.getResponseWriter(); - valuesList = new ArrayList<String>(); + List values = getValuesList(); if (suggestionValues != null) { if (suggestionValues instanceof Collection) { for (Iterator iterator = ((Collection)suggestionValues).iterator(); iterator.hasNext();) { String value = getConvertedStringValue(context, comboBox, iterator.next()) ; - valuesList.add(value); + values.add(value); encodeSuggestion(writer, comboBox, value, RICH_COMBOBOX_ITEM_CLASSES); } } else if (suggestionValues.getClass().isArray()) { Object [] suggestions = (Object [])suggestionValues; for (int i = 0; i < suggestions.length; i++) { String value = getConvertedStringValue(context, comboBox, suggestions[i]); - valuesList.add(value); + values.add(value); encodeSuggestion(writer, comboBox, value, RICH_COMBOBOX_ITEM_CLASSES ); } } else { @@ -219,4 +220,15 @@ } return ScriptUtils.toScript(result); } + + public List getValuesList() { + if (valuesList == null) { + valuesList = new ArrayList(); + } + return valuesList; + } + + public void setValuesList(List valuesList) { + this.valuesList = valuesList; + } }