Author: abelevich Date: 2007-11-08 06:59:37 -0500 (Thu, 08 Nov 2007) New Revision: 3815 Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx Log: RF-1307, RF-1279 Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-08 11:16:33 UTC (rev 3814) +++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-08 11:59:37 UTC (rev 3815) @@ -241,6 +241,15 @@ return false; } + public String getSelectedClass(FacesContext context, UIComponent component){ + StringBuffer selectedClass = null; + if(isSelected(context, component)){ + selectedClass= new StringBuffer(); + selectedClass.append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS); + } + return selectedClass != null ? selectedClass.toString() : ""; + } + public String getLabelClass(FacesContext context, UIComponent component) { UIPanelMenuGroup group = (UIPanelMenuGroup)component; UIPanelMenu parentMenu = findMenu(group); @@ -250,21 +259,31 @@ resClass.append("rich-pmenu-group-self-label rich-pmenu-top-group-self-label"); } else resClass.append("rich-pmenu-group-self-label"); } - if(isSelected(context, component)){ - resClass.append(" ").append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS); - } + return resClass.toString(); } - public String getIconClass(FacesContext context, UIComponent component) { - UIPanelMenuGroup group = (UIPanelMenuGroup)component; - UIPanelMenu parentMenu = findMenu(group); + public String getIconClass(FacesContext context, UIComponent component, String align) { + UIPanelMenuGroup group = (UIPanelMenuGroup)component; + UIPanelMenu parentMenu = findMenu(group); + String iconClass = ""; + if(!group.isDisabled() && !parentMenu.isDisabled()){ + String iconClassAttr = ((UIPanelMenuGroup)component).getIconClass(); if(isTopLevel(component)){ - return "rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"; - } else return "rich-pmenu-group-self-icon"; + if(align.equals(parentMenu.getIconGroupTopPosition())){ + iconClass = "rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"; + } + } + + if(align.equals(parentMenu.getIconGroupPosition())){ + if(iconClassAttr != null){ + iconClass = iconClass.equals("") ? ("rich-pmenu-group-self-icon " + iconClassAttr): (iconClass + " " + iconClassAttr); + } + } } - return ""; + + return iconClass; } public String getDivClass(FacesContext context, UIComponent component) { Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-08 11:16:33 UTC (rev 3814) +++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-08 11:59:37 UTC (rev 3815) @@ -179,15 +179,28 @@ return resClass.toString(); } - public String getIconClass(FacesContext context, UIComponent component) { + public String getIconClass(FacesContext context, UIComponent component, String align) { UIPanelMenuItem item = (UIPanelMenuItem)component; UIPanelMenu parentMenu = findMenu(item); + String iconClass = ""; + if(!item.isDisabled() && !parentMenu.isDisabled()){ + String iconClassAttr = ((UIPanelMenuItem)component).getIconClass(); + if(isTopLevel(component)){ - return "rich-pmenu-item-icon rich-pmenu-top-item-icon"; - } else return "rich-pmenu-item-icon"; + if(align.equals(parentMenu.getIconItemTopPosition())){ + iconClass = "rich-pmenu-item-icon rich-pmenu-top-item-icon"; + } + } + + if(align.equals(parentMenu.getIconItemPosition())){ + if(iconClassAttr != null){ + iconClass = iconClass.equals("") ? ("rich-pmenu-item-icon " + iconClassAttr):(iconClass + " " + iconClassAttr); + } + } } - return ""; + + return iconClass; } public boolean isSelected(FacesContext context, UIComponent component){ Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2007-11-08 11:16:33 UTC (rev 3814) +++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2007-11-08 11:59:37 UTC (rev 3815) @@ -36,7 +36,6 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.Messages; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; @@ -50,6 +49,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() */ + protected Class getComponentClass() { return UIComponent.class; } @@ -70,18 +70,16 @@ UIParameter param = (UIParameter)child; String name = param.getName(); - if (null == name) { - throw new IllegalArgumentException(Messages.getMessage( - Messages.UNNAMED_PARAMETER_ERROR, component.getClientId(context))); + if (name != null) { + Object value = param.getValue(); + buff.append("params["); + buff.append(ScriptUtils.toScript(name)); + buff.append("] = "); + buff.append(ScriptUtils.toScript(value)); + buff.append(";"); + params.add(buff.toString()); } - - Object value = param.getValue(); - buff.append("params["); - buff.append(ScriptUtils.toScript(name)); - buff.append("] = "); - buff.append(ScriptUtils.toScript(value)); - buff.append(";"); - params.add(buff.toString()); + } } Modified: branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-08 11:16:33 UTC (rev 3814) +++ branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-08 11:59:37 UTC (rev 3815) @@ -27,8 +27,8 @@ <f:call name="utils.encodePassThru" /> - <tr> - <td class="dr-pmenu-nowrap"> + <tr class="#{this:getSelectedClass( context, component )}"> + <td class="dr-pmenu-nowrap #{this:getIconClass( context, component,'left')}"> <f:call name="insertSpacerImages" /> <f:call name="insertImage"> <f:parameter value="left" /> @@ -42,7 +42,7 @@ value="" /> <f:call name="insertLabel"/> </td> - <td> + <td class="#{this:getIconClass( context, component,'right')}"> <f:call name="insertImage"> <f:parameter value="right" /> </f:call> Modified: branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-08 11:16:33 UTC (rev 3814) +++ branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-08 11:59:37 UTC (rev 3815) @@ -25,7 +25,7 @@ <tr> <f:call name="utils.encodeId"/> - <td class="dr-pmenu-nowrap"> + <td class="dr-pmenu-nowrap #{this:getIconClass( context, component,'left')}"> <f:call name="insertSpacerImages" /> <f:call name="insertImage"> <f:parameter value="left" /> @@ -38,7 +38,7 @@ <f:call name="renderChildren" /> </vcp:body> </td> - <td> + <td class="#{this:getIconClass( context, component,'right')}"> <f:call name="insertImage"> <f:parameter value="right" /> </f:call>