Author: amarkhel Date: 2010-11-19 08:09:29 -0500 (Fri, 19 Nov 2010) New Revision: 20119 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: RF-9630 Calendar component: disabled state support. Processing the disabled calendar icon was added. Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-19 12:40:47 UTC (rev 20118) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-19 13:09:29 UTC (rev 20119) @@ -298,7 +298,7 @@ } public String getButtonIcon(FacesContext facesContext, UIComponent component) { - boolean disable = (Boolean)component.getAttributes().get("disabled"); + boolean disable = (Boolean)component.getAttributes().get(OPTION_DISABLED); String buttonIcon = (String)component.getAttributes().get("buttonIcon"); if (disable) { buttonIcon = (String)component.getAttributes().get("buttonIconDisabled"); @@ -307,10 +307,9 @@ if(buttonIcon != null && buttonIcon.trim().length() != 0) { buttonIcon = RenderKitUtils.getResourceURL(buttonIcon, facesContext); } else { - buttonIcon = disable ? CALENDAR_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME; + buttonIcon = disable ? CALENDAR_DISABLE_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME; buttonIcon = RenderKitUtils.getResourcePath(facesContext, "org.richfaces.images",buttonIcon); } - return buttonIcon; }