[jbosstools-commits] JBoss Tools SVN: r23249 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2010-07-06 07:46:04 -0400 (Tue, 06 Jul 2010)
New Revision: 23249

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
Log:
https://jira.jboss.org/browse/JBIDE-6542 ,  check if the attribute presents in PanelMenu was updated.

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java	2010-07-06 11:32:16 UTC (rev 23248)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java	2010-07-06 11:46:04 UTC (rev 23249)
@@ -485,19 +485,19 @@
 		String pathIconCollapsed = attrs.getPmg_iconCollapsed();
 		String pathIconDisabled = attrs.getPmg_iconDisabled();
 			
-			if (pathIconExpanded == null) {
+			if (ComponentUtil.isBlank(pathIconExpanded)) {
 			    if (childOfPanelMenu) {
 				pathIconExpanded = attrs.getPm_iconExpandedTopGroup();
 			    } 
 			    pathIconExpanded = attrs.getPm_iconExpandedGroup();
 			}
-			if (pathIconCollapsed == null) {
+			if (ComponentUtil.isBlank(pathIconCollapsed)) {
 			    if (childOfPanelMenu) {
 				pathIconCollapsed = attrs.getPm_iconCollapsedTopGroup();
 			    } 
 			    pathIconCollapsed = attrs.getPm_iconCollapsedGroup();
 			}
-			if (pathIconDisabled == null) {
+			if (ComponentUtil.isBlank(pathIconDisabled)) {
 			    if (childOfPanelMenu) {
 				pathIconDisabled = attrs.getPm_iconTopDisabledGroup();
 			    } 
@@ -523,7 +523,7 @@
 				if (ComponentUtil.isNotBlank(pathIconExpanded)) {
 					if (DEFAULT_ICON_MAP.containsKey(pathIconExpanded)) {
 						pathIconExpanded = DEFAULT_ICON_MAP
-						.get(pathIconExpanded);
+							.get(pathIconExpanded);
 						ComponentUtil.setImg(imgIcon, pathIconExpanded);
 					} else {
 						String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(