Author: sergeyhalipov Date: 2007-05-25 08:10:33 -0400 (Fri, 25 May 2007) New Revision: 881 Modified: trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java Log: Panel menu: fix default icons for items. Modified: trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-25 11:45:25 UTC (rev 880) +++ trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-25 12:10:33 UTC (rev 881) @@ -69,19 +69,19 @@ <name>iconDisabledItem</name> <classname>java.lang.String</classname> <description>Path to the icon to be displayed for the disabled item state</description> - <defaultvalue><![CDATA[""]]></defaultvalue> + <defaultvalue><![CDATA["grid"]]></defaultvalue> </property> <property> <name>iconTopItem</name> <classname>java.lang.String</classname> <description>Path to the icon to be displayed for the enabled top item state</description> - <defaultvalue><![CDATA[""]]></defaultvalue> + <defaultvalue><![CDATA["grid"]]></defaultvalue> </property> <property> <name>iconTopDisabledItem</name> <classname>java.lang.String</classname> <description>Path to the icon to be displayed for the disabled top item state</description> - <defaultvalue><![CDATA[""]]></defaultvalue> + <defaultvalue><![CDATA["grid"]]></defaultvalue> </property> <property> <name>iconExpandedGroup</name> Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java 2007-05-25 11:45:25 UTC (rev 880) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java 2007-05-25 12:10:33 UTC (rev 881) @@ -103,7 +103,7 @@ String iconType = ""; Object customIcon = ((UIPanelMenuItem)component).getIcon(); - if (customIcon.equals("")){ + if ("".equals(customIcon)){ if (isTopLevel){ source = getIconByType(align.equals("spacer") ? "custom" : iconItemTopLevel, isTopLevel, context, component); } else {