[richfaces-svn-commits] JBoss Rich Faces SVN: r2238 - trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html.

[richfaces-svn-commits at lists.jboss.org]

Author: a.izobov
Date: 2007-08-14 03:59:59 -0400 (Tue, 14 Aug 2007)
New Revision: 2238

Modified:
   trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
   trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-498 fixed

Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java	2007-08-14 01:27:59 UTC (rev 2237)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java	2007-08-14 07:59:59 UTC (rev 2238)
@@ -72,14 +72,14 @@
 			ComponentsVariableResolver.getVariables(this, menuGroup);
 
 		String icon = ViewUtil.getResourceURL(menuGroup.getIcon());
-		if (icon == null) {
+		if (icon == null || icon.length() == 0) {
 			icon = getSpacerUri(context, menuGroup);
 		}
 
 		variables.setVariable("icon", icon);
 		
 		String iconDisabled = ViewUtil.getResourceURL(menuGroup.getIconDisabled());
-		if (iconDisabled == null) {
+		if (iconDisabled == null || iconDisabled.length() == 0) {
 			iconDisabled = getSpacerUri(context, menuGroup);
 		}
 
@@ -89,14 +89,14 @@
 		variables.setVariable("actualIcon", actualIcon);
 
 		String iconFolder = ViewUtil.getResourceURL(menuGroup.getIconFolder());
-		if (iconFolder == null) {
+		if (iconFolder == null || iconFolder.length() == 0) {
 			iconFolder = getSpacerUri(context, menuGroup);
 		}
 
 		variables.setVariable("iconFolder", iconFolder);
 
 		String iconFolderDisabled = ViewUtil.getResourceURL(menuGroup.getIconFolderDisabled());
-		if (iconFolderDisabled == null) {
+		if (iconFolderDisabled == null || iconFolderDisabled.length() == 0) {
 			iconFolderDisabled = getSpacerUri(context, menuGroup);
 		}
 

Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java	2007-08-14 01:27:59 UTC (rev 2237)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java	2007-08-14 07:59:59 UTC (rev 2238)
@@ -86,7 +86,7 @@
         String resource = menuItem.isDisabled()
                 ? ViewUtil.getResourceURL(menuItem.getIconDisabled())
                 : ViewUtil.getResourceURL(menuItem.getIcon());
-        if (resource == null) {
+        if (resource == null || (resource.length() == 0)) {
             resource = getResource("images/spacer.gif").getUri(
                     context, menuItem);
         }