Author: Alex.Kolonitsky Date: 2009-07-22 10:19:18 -0400 (Wed, 22 Jul 2009) New Revision: 14975 Modified: branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java Log: panelMenu: icons redefinition not works. https://jira.jboss.org/jira/browse/RF-7541 Modified: branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-07-22 09:59:28 UTC (rev 14974) +++ branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-07-22 14:19:18 UTC (rev 14975) @@ -414,7 +414,7 @@ <description>Path to the icon to be displayed for the expanded item state. You can also use predefined icons, setting the attribute to one of these possible values: &quot;triangle&quot;, &quot;triangleUp&quot;, &quot;triangleDown&quot;, &quot;disc&quot;, &quot;chevron&quot;, &quot;chevronUp&quot;, &quot;chevronDown&quot;, &quot;grid&quot;. Default value is &quot;grid&quot;.</description> - <defaultvalue><![CDATA["grid"]]></defaultvalue> + <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>iconCollapsed</name> @@ -422,8 +422,14 @@ <description>Path to the icon to be displayed for the collapsed item state. You can also use predefined icons, setting the attribute to one of these possible values: &quot;triangle&quot;, &quot;triangleUp&quot;, &quot;triangleDown&quot;, &quot;disc&quot;, &quot;chevron&quot;, &quot;chevronUp&quot;, &quot;chevronDown&quot;, &quot;grid&quot;. Default value is &quot;grid&quot;.</description> - <defaultvalue><![CDATA["grid"]]></defaultvalue> + <defaultvalue><![CDATA[""]]></defaultvalue> </property> + <property> + <name>iconDisabled</name> + <classname>java.lang.String</classname> + <description>Path to the icon to be displayed for the disabled item state.</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> <property hidden="true"> <name>accesskey</name> <classname>java.lang.String</classname> @@ -453,12 +459,6 @@ <description>Serves to define the tabbing order</description> </property> <property> - <name>iconDisabled</name> - <classname>java.lang.String</classname> - <description>Path to the icon to be displayed for the disabled item state.</description> - <defaultvalue><![CDATA["grid"]]></defaultvalue> - </property> - <property> <name>disabled</name> <classname>boolean</classname> <description> If true sets state of the item to disabled state. Default value is &quot;false&quot;. </description> @@ -637,9 +637,8 @@ item state. You can also use predefined icons, setting the attribute to one of these possible values: &quot;triangle&quot;, &quot;triangleUp&quot;, &quot;triangleDown&quot;, &quot;disc&quot;, &quot;chevron&quot;, &quot;chevronUp&quot;, &quot;chevronDown&quot;, &quot;grid&quot;. Default value is &quot;grid&quot;. - </description> - <defaultvalue><![CDATA["grid"]]></defaultvalue> + <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>iconDisabled</name> @@ -648,7 +647,7 @@ You can also use predefined icons, setting the attribute to one of these possible values: &quot;triangle&quot;, &quot;triangleUp&quot;, &quot;triangleDown&quot;, &quot;disc&quot;, &quot;chevron&quot;, &quot;chevronUp&quot;, &quot;chevronDown&quot;, &quot;grid&quot;. Default value is &quot;grid&quot;. </description> - <defaultvalue><![CDATA["grid"]]></defaultvalue> + <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>disabled</name> Modified: branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-07-22 09:59:28 UTC (rev 14974) +++ branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-07-22 14:19:18 UTC (rev 14975) @@ -176,9 +176,9 @@ protected boolean isChildrenExpanded(UIComponent component){ if (component.getChildren() != null){ - Iterator itr = component.getChildren().iterator(); + Iterator<UIComponent> itr = component.getChildren().iterator(); while(itr.hasNext()){ - UIComponent child = (UIComponent)itr.next(); + UIComponent child = itr.next(); if(child instanceof UIPanelMenuGroup){ if( ((UIPanelMenuGroup)child).isExpanded() ){ return true; @@ -208,7 +208,7 @@ protected boolean isSubmitted(FacesContext context, UIComponent component){ boolean submitted = false; String clientId = component.getClientId(context); - Map requestParameterMap = context.getExternalContext().getRequestParameterMap(); + Map<String, String> requestParameterMap = context.getExternalContext().getRequestParameterMap(); Object value = requestParameterMap.get("panelMenuAction"+clientId); if (clientId!=null&&value!=null){ Modified: branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-07-22 09:59:28 UTC (rev 14974) +++ branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-07-22 14:19:18 UTC (rev 14975) @@ -37,13 +37,13 @@ public class PanelMenuGroupRenderer extends PanelMenuRendererBase { - protected Class getComponentClass() { + protected Class<UIPanelMenuGroup> getComponentClass() { return UIPanelMenuGroup.class; } protected void doDecode(FacesContext context, UIComponent component) { String clientId = component.getClientId(context); - Map requestMap =context.getExternalContext().getRequestParameterMap(); + Map<String, String> requestMap = context.getExternalContext().getRequestParameterMap(); UIPanelMenuGroup group = ((UIPanelMenuGroup)component); if(requestMap.containsKey("panelMenuState"+clientId)){ @@ -137,7 +137,7 @@ String iconCollapsed = ""; iconExpanded = panelMenuGroup.isDisabled() ? panelMenuGroup.getIconDisabled() : panelMenuGroup.getIconExpanded(); - iconCollapsed = panelMenuGroup.isDisabled() ? panelMenuGroup.getIconDisabled() : panelMenuGroup.getIconCollapsed(); + iconCollapsed = panelMenuGroup.isDisabled() ? panelMenuGroup.getIconDisabled(): panelMenuGroup.getIconCollapsed(); String icon = null; if(isOpened){ Modified: branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2009-07-22 09:59:28 UTC (rev 14974) +++ branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2009-07-22 14:19:18 UTC (rev 14975) @@ -34,7 +34,7 @@ import org.richfaces.renderkit.PanelMenuRendererBase; public class PanelMenuItemRenderer extends PanelMenuRendererBase { - protected Class getComponentClass() { + protected Class<UIPanelMenuItem> getComponentClass() { return UIPanelMenuItem.class; } @@ -43,7 +43,6 @@ } protected void doDecode(FacesContext context, UIComponent component) { if(isSubmitted(context, component)) { - UIPanelMenuItem item = (UIPanelMenuItem)component; new ActionEvent(component).queue(); if ("ajax".equals(getItemMode(component))) { new AjaxEvent(component).queue(); @@ -88,9 +87,9 @@ throws IOException{ UIPanelMenu panelMenu = findMenu(component); - ResponseWriter writer = context.getResponseWriter(); - boolean isTopLevel = false; - String iconType = null; + ResponseWriter writer = context.getResponseWriter(); + boolean isTopLevel = isTopLevel(component); + String iconType = null; UIPanelMenuItem item = (UIPanelMenuItem)component; String defaultItemIcon = null; @@ -124,7 +123,10 @@ if(customItemIcon == null || customItemIcon.equals("")){ iconType = defaultItemIcon; - } else iconType = customItemIcon; + isTopLevel = false; // for RF-7390 + } else { + iconType = customItemIcon; + } boolean drawHidden = false; String source = getIconByType(iconType, isTopLevel, context, component);