Author: abelevich Date: 2010-11-01 08:42:30 -0400 (Mon, 01 Nov 2010) New Revision: 19820 Modified: trunk/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java Log: RF-9574 Modified: trunk/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java =================================================================== --- trunk/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -39,16 +39,16 @@ public InplaceState getState(); - public String getReadyStateCss(); + public String getReadyStateClass(); - public String getEditStateCss(); + public String getEditStateClass(); - public String getChangedStateCss(); + public String getChangedStateClass(); - public String getDisableStateCss(); + public String getDisableStateClass(); - public String getEditCss(); + public String getEditClass(); - public String getNoneCss(); + public String getNoneClass(); } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -68,22 +68,22 @@ public abstract String getTabIndex(); @Attribute - public abstract String getReadyStateCss(); + public abstract String getReadyStateClass(); @Attribute - public abstract String getEditStateCss(); + public abstract String getEditStateClass(); @Attribute - public abstract String getChangedStateCss(); + public abstract String getChangedStateClass(); @Attribute - public abstract String getDisableStateCss(); - + public abstract String getDisableStateClass(); + @Attribute - public abstract String getEditCss(); + public abstract String getEditClass(); @Attribute - public abstract String getNoneCss(); + public abstract String getNoneClass(); @Attribute(events=@EventName("blur")) public abstract String getOnblur(); Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -64,15 +64,15 @@ @Override @Attribute - public abstract String getItemCss(); + public abstract String getItemClass(); @Override @Attribute - public abstract String getSelectItemCss(); + public abstract String getSelectItemClass(); @Override @Attribute - public abstract String getListCss(); + public abstract String getListClass(); @Attribute(defaultValue="click") Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -66,13 +66,13 @@ public abstract String getDefaultLabel(); @Attribute - public abstract String getItemCss(); + public abstract String getItemClass(); @Attribute - public abstract String getSelectItemCss(); + public abstract String getSelectItemClass(); @Attribute - public abstract String getListCss(); + public abstract String getListClass(); @Attribute(events=@EventName("blur")) public abstract String getOnblur(); Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -219,17 +219,17 @@ options.put(OPTIONS_STATE, inplaceComponent.getState()); } - String css = inplaceComponent.getNoneCss(); + String css = inplaceComponent.getNoneClass(); if(css != null && css.trim().length() > 0) { options.put(OPTIONS_NONE_CSS, getNoneCss(inplaceComponent)); } - css = inplaceComponent.getChangedStateCss(); + css = inplaceComponent.getChangedStateClass(); if(css != null && css.trim().length() > 0) { options.put(OPTIONS_CHANGED_CSS, getChangedStateCss(inplaceComponent)); } - css = inplaceComponent.getEditStateCss(); + css = inplaceComponent.getEditStateClass(); if(css != null && css.trim().length() > 0) { options.put(OPTIONS_EDIT_CSS, getEditStateCss(inplaceComponent)); } @@ -256,32 +256,32 @@ } public String getReadyStateCss(InplaceComponent component) { - String css = component.getReadyStateCss(); + String css = component.getReadyStateClass(); return HtmlUtil.concatClasses("rf-ii-d-s", css); } public String getEditStateCss(InplaceComponent component) { - String css = component.getEditStateCss(); + String css = component.getEditStateClass(); return HtmlUtil.concatClasses("rf-ii-e-s", css); } public String getChangedStateCss(InplaceComponent component) { - String css = component.getChangedStateCss(); + String css = component.getChangedStateClass(); return HtmlUtil.concatClasses("rf-ii-c-s", css); } public String getDisableStateCss(InplaceComponent component) { - String css = component.getDisableStateCss(); + String css = component.getDisableStateClass(); return HtmlUtil.concatClasses("rf-ii-dis-s", css); } public String getEditCss(InplaceComponent component) { - String css = component.getEditCss(); + String css = component.getEditClass(); return HtmlUtil.concatClasses("rf-ii-edit", css); } public String getNoneCss(InplaceComponent component) { - String css = component.getNoneCss(); + String css = component.getNoneClass(); return HtmlUtil.concatClasses("rf-ii-none", css); } } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -119,32 +119,32 @@ } public String getReadyStateCss(InplaceComponent component) { - String css = component.getReadyStateCss(); + String css = component.getReadyStateClass(); return HtmlUtil.concatClasses("rf-is-d-s", css); } public String getEditStateCss(InplaceComponent component) { - String css = component.getEditStateCss(); + String css = component.getEditStateClass(); return HtmlUtil.concatClasses("rf-is-e-s", css); } public String getChangedStateCss(InplaceComponent component) { - String css = component.getChangedStateCss(); + String css = component.getChangedStateClass(); return HtmlUtil.concatClasses("rf-is-c-s", css); } public String getDisableStateCss(InplaceComponent component) { - String css = component.getDisableStateCss(); + String css = component.getDisableStateClass(); return HtmlUtil.concatClasses("rf-is-dis-s", css); } public String getEditCss(InplaceComponent component) { - String css = component.getEditCss(); + String css = component.getEditClass(); return HtmlUtil.concatClasses("rf-is-edit", css); } public String getNoneCss(InplaceComponent component) { - String css = component.getNoneCss(); + String css = component.getNoneClass(); return HtmlUtil.concatClasses("rf-is-none", css); } } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java 2010-11-01 12:22:30 UTC (rev 19819) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java 2010-11-01 12:42:30 UTC (rev 19820) @@ -119,7 +119,7 @@ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, itemClientId, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses(defaultItemCss, select.getItemCss()), null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses(defaultItemCss, select.getItemClass()), null); String label = clientSelectItem.getLabel(); if (label != null && label.trim().length() > 0) { @@ -153,17 +153,17 @@ } public static void addSelectCssToOptions(AbstractSelect abstractSelect, Map<String, Object> options, String [] defaultCss) { - String itemCss = abstractSelect.getItemCss(); + String itemCss = abstractSelect.getItemClass(); if(itemCss != null && itemCss.trim().length() > 0) { options.put(PopupConstants.OPTIONS_ITEM_CLASS, HtmlUtil.concatClasses(defaultCss[0], itemCss)); } - String selectItemCss = abstractSelect.getSelectItemCss(); + String selectItemCss = abstractSelect.getSelectItemClass(); if(selectItemCss != null && selectItemCss.trim().length() > 0) { options.put(PopupConstants.OPTIONS_SELECT_ITEM_CLASS, HtmlUtil.concatClasses(defaultCss[1], selectItemCss)); } - String listCss = abstractSelect.getListCss(); + String listCss = abstractSelect.getListClass(); if(listCss != null && listCss.trim().length() > 0) { options.put(PopupConstants.OPTIONS_LIST_CLASS, HtmlUtil.concatClasses(defaultCss[2], listCss)); }