Author: andrei_exadel
Date: 2008-11-20 10:23:19 -0500 (Thu, 20 Nov 2008)
New Revision: 11273
Modified:
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
Log:
RF-2937
Modified:
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
===================================================================
---
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2008-11-20
15:22:55 UTC (rev 11272)
+++
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2008-11-20
15:23:19 UTC (rev 11273)
@@ -21,7 +21,6 @@
package org.richfaces.renderkit.html;
-import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -33,11 +32,21 @@
protected void initializeStyles(FacesContext context, UIComponent menuItem,
boolean disabled, ComponentVariables variables) {
UIComponent parentMenu = getParentMenu(context, menuItem);
- Object itemClass = parentMenu.getAttributes().get("itemClass");
- Object itemStyle = parentMenu.getAttributes().get("itemStyle");
- Object disabledItemClass =
parentMenu.getAttributes().get("disabledItemClass");
- Object disabledItemStyle =
parentMenu.getAttributes().get("disabledItemStyle");
- Object selectItemClass = parentMenu.getAttributes().get("selectItemClass");
+
+ Object itemClass = "";
+ Object itemStyle = "";
+ Object disabledItemClass = "";
+ Object disabledItemStyle = "";
+ Object selectItemClass = "";
+
+ if (parentMenu != null) {
+ itemClass = parentMenu.getAttributes().get("itemClass");
+ itemStyle = parentMenu.getAttributes().get("itemStyle");
+ disabledItemClass = parentMenu.getAttributes().get("disabledItemClass");
+ disabledItemStyle = parentMenu.getAttributes().get("disabledItemStyle");
+ selectItemClass = parentMenu.getAttributes().get("selectItemClass");
+
+ }
Object selectClass = menuItem.getAttributes().get("selectClass");
Object styleClass = menuItem.getAttributes().get("styleClass");
Object style = menuItem.getAttributes().get("style");
@@ -126,9 +135,14 @@
Object selectStyle = menuItem.getAttributes().get("selectStyle");
UIComponent parentMenu = getParentMenu(context, menuItem);
- Object selectItemStyle = parentMenu.getAttributes().get("selectItemStyle");
- Object itemStyle = parentMenu.getAttributes().get("itemStyle");
+ Object selectItemStyle = null;
+ Object itemStyle = null;
+ if (parentMenu != null) {
+ selectItemStyle = parentMenu.getAttributes().get("selectItemStyle");
+ itemStyle = parentMenu.getAttributes().get("itemStyle");
+ }
+
if (null == selectStyle) {
selectStyle = "";
}
@@ -164,8 +178,9 @@
}
parent = parent.getParent();
}
- throw new FacesException( "Parent menu for menu group (id="
- + menuItem.getClientId(context) + ") has not been found.");
+ return null;
+// throw new FacesException( "Parent menu for menu group (id="
+// + menuItem.getClientId(context) + ") has not been found.");
}
protected Class getComponentClass() {
Show replies by date