Author: sdzmitrovich
Date: 2008-11-19 10:54:37 -0500 (Wed, 19 Nov 2008)
New Revision: 11881
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/jira/browse/JBIDE-3221
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 2008-11-19
15:50:08 UTC (rev 11880)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-11-19
15:54:37 UTC (rev 11881)
@@ -265,19 +265,25 @@
/*
* Add indentation for nested groups
*/
- String[] ids = activeChildId.split(GROUP_COUNT_SEPARATOR);
+
List<nsIDOMElement> indentTds = new ArrayList<nsIDOMElement>();
- if (ids.length > 1) {
- for (int i = 1; i <= ids.length - 1; i++) {
- nsIDOMElement spacerTd = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- nsIDOMElement spacerImg = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_IMG);
- spacerTd.appendChild(spacerImg);
- ComponentUtil.setImg(spacerImg, PANEL_MENU_GROUP_ICON_SPACER_PATH);
- setDefaultImgAttributes(spacerImg);
- tableBodyRow.appendChild(spacerTd);
- indentTds.add(spacerTd);
+
+ if (activeChildId != null) {
+ String[] ids = activeChildId.split(GROUP_COUNT_SEPARATOR);
+
+ if (ids.length > 1) {
+ for (int i = 1; i <= ids.length - 1; i++) {
+ nsIDOMElement spacerTd = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement spacerImg = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_IMG);
+ spacerTd.appendChild(spacerImg);
+ ComponentUtil.setImg(spacerImg,
+ PANEL_MENU_GROUP_ICON_SPACER_PATH);
+ setDefaultImgAttributes(spacerImg);
+ tableBodyRow.appendChild(spacerTd);
+ indentTds.add(spacerTd);
+ }
}
}
@@ -503,7 +509,8 @@
boolean findOnlyPanelMenuParent) {
Element parent = (Element) sourceElement.getParentNode();
- while (true) {
+ while ((parent.getParentNode() != null)
+ && (parent.getParentNode().getNodeType() == Node.ELEMENT_NODE)) {
if (findOnlyPanelMenuParent) {
if ((parent!=null) && parent.getNodeName().endsWith(PANEL_MENU_END_TAG)) {
break;