[jbosstools-commits] JBoss Tools SVN: r7041 - 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: 2008-03-20 09:51:37 -0400 (Thu, 20 Mar 2008)
New Revision: 7041

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1697, facet "label" added

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java	2008-03-20 12:55:49 UTC (rev 7040)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java	2008-03-20 13:51:37 UTC (rev 7041)
@@ -118,7 +118,8 @@
 			boolean active = (i == activeId);
 			
 			if(child.getNodeName().endsWith(TAB)) {
-				RichFacesTabTemplate.encodeHeader((Element) child,
+				RichFacesTabTemplate.encodeHeader(creationData,
+						(Element) child,
 						visualDocument, inerTr, active, 
 						ComponentUtil.getAttribute(sourceElement, 
 								ACTIVE_TAB_CLASS),

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java	2008-03-20 12:55:49 UTC (rev 7040)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java	2008-03-20 13:51:37 UTC (rev 7041)
@@ -132,8 +132,9 @@
 	 * @param inactiveTabClass
 	 * @param disabledTabClass
 	 */
-	public static void encodeHeader(Element sourceElement, 
-			nsIDOMDocument visualDocument, 
+	public static void encodeHeader(VpeCreationData creationData,
+			Element sourceElement, 
+			nsIDOMDocument visualDocument,
 			nsIDOMElement parentDiv,
 			boolean active,
 			String activeTabClass,
@@ -218,12 +219,19 @@
 		String style = "background-image: url(file:///" + bgImgPath.replace('\\', '/') + ");";
 		td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style);
 		td.setAttribute(VPE_USER_TOGGLE_ID, toggleId);
-		String label = sourceElement.getAttribute(LABEL);
-		if(label==null) {
+		Node labelFacet = ComponentUtil.getFacet(sourceElement, LABEL, true);
+		String labelAttr = sourceElement.getAttribute(LABEL);
+		if (null != labelFacet) {
+			VpeChildrenInfo child = new VpeChildrenInfo(td);
+			child.addSourceChild(labelFacet);
+			creationData.addChildrenInfo(child);
+		} else if (null != labelAttr) {
+			td.appendChild(visualDocument.createTextNode(labelAttr));
+		} else {
 			char space = 160;
-			label = EMPTY + space;
+			labelAttr = EMPTY + space;
+			td.appendChild(visualDocument.createTextNode(labelAttr));
 		}
-		td.appendChild(visualDocument.createTextNode(label));
 		encodeSpacer(mainTr, visualDocument);
 	}