[richfaces-svn-commits] JBoss Rich Faces SVN: r941 - in trunk/richfaces/panelmenu/src/main: java/org/richfaces/component/panelmenu and 3 other directories.

Author: sergeyhalipov Date: 2007-05-29 13:54:00 -0400 (Tue, 29 May 2007) New Revision: 941 Modified: trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenu.java trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx Log: Added disabled attribute to entire panelMenu component. Modified: trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-29 17:54:00 UTC (rev 941) @@ -271,6 +271,14 @@ <description></description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> + <property> + <name>disabled</name> + <classname>boolean</classname> + <description> + If “true” sets state of the item to disabled state. “false” is default. + </description> + <defaultvalue>false</defaultvalue> + </property> </component> <component> Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenu.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenu.java 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenu.java 2007-05-29 17:54:00 UTC (rev 941) @@ -86,5 +86,7 @@ public abstract void setOngroupcollapse(String ongroupcollapse); public abstract String getOngroupexpand(); public abstract void setOngroupexpand(String ongroupexpand); + public abstract boolean isDisabled(); + public abstract void setDisabled(boolean disabled); } Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-29 17:54:00 UTC (rev 941) @@ -129,7 +129,7 @@ StringBuffer classBuffer = new StringBuffer(""); UIPanelMenuGroup group = (UIPanelMenuGroup)component; UIPanelMenu parentMenu = findMenu(group); - if (!group.isDisabled()) { + if (!parentMenu.isDisabled() && !group.isDisabled()) { if (calculateLevel(group) == 0) classBuffer.append(parentMenu.getTopGroupClass() + " "); else 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-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java 2007-05-29 17:54:00 UTC (rev 941) @@ -133,7 +133,7 @@ StringBuffer classBuffer = new StringBuffer(""); UIPanelMenuItem item = (UIPanelMenuItem)component; UIPanelMenu parentMenu = findMenu(item); - if (!item.isDisabled()) { + if (!parentMenu.isDisabled() && !item.isDisabled()) { if (calculateLevel(item) == 0) classBuffer.append(parentMenu.getTopItemClass() + " "); else Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-29 17:54:00 UTC (rev 941) @@ -78,7 +78,11 @@ for (Iterator iter = flatList.iterator(); iter.hasNext();) { UIComponent child = (UIComponent) iter.next(); if ((child instanceof UIPanelMenuItem)||(child instanceof UIPanelMenuGroup)) { - boolean childDisabled = child instanceof UIPanelMenuGroup ? ((UIPanelMenuGroup)child).isDisabled() : ((UIPanelMenuItem)child).isDisabled(); + boolean childDisabled; + if (!((UIPanelMenu)component).isDisabled()) + childDisabled = child instanceof UIPanelMenuGroup ? ((UIPanelMenuGroup)child).isDisabled() : ((UIPanelMenuItem)child).isDisabled(); + else + childDisabled = true; boolean childRendered = child instanceof UIPanelMenuGroup ? ((UIPanelMenuGroup)child).isRendered() : ((UIPanelMenuItem)child).isRendered(); boolean parentRendered = true; if (! (child.getParent() instanceof UIPanelMenu)) Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-05-29 17:54:00 UTC (rev 941) @@ -69,7 +69,7 @@ </u:selector> <f:verbatim> - .rich-pmenu-disabled-element { + .dr-pmenu-disabled-element { cursor: default; color: #c0c0c0; } Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-05-29 17:54:00 UTC (rev 941) @@ -17,8 +17,8 @@ <jsp:scriptlet> <![CDATA[ String itemClass = ""; - if (component.isDisabled()) { - itemClass = " rich-pmenu-disabled-element"; + if (component.isDisabled() || findMenu(component).isDisabled()) { + itemClass = " dr-pmenu-disabled-element rich-pmenu-disabled-element "; } variables.setVariable("itemClass", itemClass); ]]> Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-29 17:29:21 UTC (rev 940) +++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-29 17:54:00 UTC (rev 941) @@ -16,9 +16,9 @@ <td> <jsp:scriptlet> <![CDATA[ - String itemClass = " rich-pmenu-disabled-element"; + String itemClass = " dr-pmenu-disabled-element rich-pmenu-disabled-element "; String onClick; - if (component.isDisabled()) { + if (component.isDisabled() || findMenu(component).isDisabled()) { variables.setVariable("itemClass", itemClass); } else { onClick = component.getAttributes().get("onclick") + ";" + getOnClick(context, component);