Author: artdaw Date: 2011-02-08 14:39:57 -0500 (Tue, 08 Feb 2011) New Revision: 21551 Modified: branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java Log: RF-10440: "inactiveRightIcon" is renamed to "rightInactiveIcon" Modified: branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java =================================================================== --- branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-08 18:58:36 UTC (rev 21550) +++ branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-08 19:39:57 UTC (rev 21551) @@ -129,11 +129,11 @@ } @Attribute(generate = false) - public String getInactiveRightIcon() { + public String getRightInactiveIcon() { return (String) getStateHelper().eval(Properties.rightInactiveIcon, getAccordion().getItemInactiveRightIcon()); } - public void setInactiveRightIcon(String inactiveRightIcon) { + public void setRightInactiveIcon(String inactiveRightIcon) { getStateHelper().put(Properties.rightInactiveIcon, inactiveRightIcon); } Modified: branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-02-08 18:58:36 UTC (rev 21550) +++ branches/4.0.0.M6/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-02-08 19:39:57 UTC (rev 21551) @@ -27,7 +27,7 @@ } protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { - String iconInactive = panel.isDisabled() ? panel.getRightDisabledIcon() : panel.getInactiveRightIcon(); + String iconInactive = panel.isDisabled() ? panel.getRightDisabledIcon() : panel.getRightInactiveIcon(); String iconActive = panel.isDisabled() ? panel.getRightDisabledIcon() : panel.getRightActiveIcon(); //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment?