Author: pyaschenko Date: 2011-02-18 10:23:46 -0500 (Fri, 18 Feb 2011) New Revision: 21768 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java Log: https://jira.jboss.org/browse/RF-10519 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-02-18 14:27:49 UTC (rev 21767) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-02-18 15:23:46 UTC (rev 21768) @@ -104,7 +104,7 @@ // ------------------------------------------------ Html Attributes enum Properties { - leftIcon, leftDisabledIcon, iconRight, rightDisabledIcon, styleClass, disabledClass, execute, name + leftIcon, leftDisabledIcon, rightIcon, rightDisabledIcon, styleClass, disabledClass, execute, name } @@ -143,12 +143,12 @@ @Attribute(generate = false) public String getRightIcon() { - return (String) getStateHelper().eval(Properties.iconRight, + return (String) getStateHelper().eval(Properties.rightIcon, isTopItem() ? getPanelMenu().getTopItemRightIcon() : getPanelMenu().getItemRightIcon()); } public void setRightIcon(String iconRight) { - getStateHelper().put(Properties.iconRight, iconRight); + getStateHelper().put(Properties.rightIcon, iconRight); } @Attribute Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-18 14:27:49 UTC (rev 21767) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-18 15:23:46 UTC (rev 21768) @@ -141,7 +141,7 @@ private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { String icon = PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? menuItem.getRightDisabledIcon() : menuItem.getRightIcon(); - String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getLeftIconClass()); + String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getRightIconClass()); if (icon == null || icon.trim().length() == 0) { icon = PanelIcons.transparent.toString();