[jbosstools-commits] JBoss Tools SVN: r6378 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2008-02-18 09:08:53 -0500 (Mon, 18 Feb 2008)
New Revision: 6378

Modified:
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1744, border creation updated, footer and header css classes processing updated.

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java	2008-02-18 14:03:01 UTC (rev 6377)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java	2008-02-18 14:08:53 UTC (rev 6378)
@@ -14,6 +14,7 @@
 
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.template.VpeDataTableElements.SourceColumnElements;
+import org.jboss.tools.vpe.editor.template.VpeDataTableElements.SourceDataTableElements;
 import org.jboss.tools.vpe.editor.template.VpeDataTableElements.VisualColumnElements;
 import org.jboss.tools.vpe.editor.template.VpeDataTableElements.VisualDataTableElements;
 import org.jboss.tools.vpe.editor.util.HTML;
@@ -45,6 +46,7 @@
 		}
 
 		SourceColumnElements columnElements = new SourceColumnElements(sourceNode);
+		
 		if (visualParent != null && HTML.TAG_TABLE.equalsIgnoreCase(visualParent.getNodeName()) && columnElements != null) {
 			VisualDataTableElements visualDataTableElements = VpeDataTableElements.getVisualDataTableElements(visualParent);
 			VisualColumnElements visualColumnElements = new VisualColumnElements();
@@ -60,7 +62,16 @@
 					info.addSourceChild(columnElements.getHeader());
 				}
 				creatorInfo.addChildrenInfo(info);
-				setCellClass(cell, getColumnAttrValue(sourceNode, "headerClass"));
+				
+				String styleClass = "";
+				String tableHeaderClass = getNodeAttrValue(sourceNode.getParentNode(), "headerClass");
+				String columnHeaderClass = getNodeAttrValue(sourceNode, "headerClass");
+				if (null != columnHeaderClass && !"".equalsIgnoreCase(columnHeaderClass)) {
+					styleClass = columnHeaderClass;
+				} else if (null != tableHeaderClass && !"".equalsIgnoreCase(tableHeaderClass)) {
+					styleClass = tableHeaderClass;
+				}
+				setCellClass(cell, styleClass);
 				visualColumnElements.setHeaderCell(cell);
 
 				cell = VpeDataTableElements.makeCell(visualDataTableElements.getColumnsFooterRow(), index, HTML.TAG_TD, visualDocument);
@@ -69,7 +80,16 @@
 					info.addSourceChild(columnElements.getFooter());
 				}
 				creatorInfo.addChildrenInfo(info);
-				setCellClass(cell, getColumnAttrValue(sourceNode, "footerClass"));
+				
+				styleClass = "";
+				String tableFooterClass = getNodeAttrValue(sourceNode.getParentNode(), "footerClass");
+				String columnFooterClass = getNodeAttrValue(sourceNode, "footerClass");
+				if (null != columnFooterClass && !"".equalsIgnoreCase(columnFooterClass)) {
+					styleClass = columnFooterClass;
+				} else if (null != tableFooterClass && !"".equalsIgnoreCase(tableFooterClass)) {
+					styleClass = tableFooterClass;
+				}
+				setCellClass(cell, styleClass);
 				visualColumnElements.setFooterCell(cell);
 				
 				cell = VpeDataTableElements.makeCell(visualDataTableElements.getBodyRow(), index, HTML.TAG_TD, visualDocument);
@@ -155,13 +175,14 @@
 		}
 	}
 	
-	private String getColumnAttrValue(Node columnNode, String attrName) {
-		if (columnNode != null) {
-			Node attr = columnNode.getAttributes().getNamedItem(attrName);
+	private String getNodeAttrValue(Node node, String attrName) {
+		if (node != null) {
+			Node attr = node.getAttributes().getNamedItem(attrName);
 			if (attr != null) {
 				return attr.getNodeValue();
 			}
 		}
 		return null;
 	}
+	
 }

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java	2008-02-18 14:03:01 UTC (rev 6377)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java	2008-02-18 14:08:53 UTC (rev 6378)
@@ -182,8 +182,8 @@
 			row = visualDocument.createElement(HTML.TAG_TR);
 			section.appendChild(row);
 			visualTable.appendChild(section);
-			visualElements.setBodyRow(row);
-			visualElements.setBody(section);
+			//visualElements.setBodyRow(row);
+			//visualElements.setBody(section);
 		}
 
 		VpeChildrenInfo info = null;
@@ -207,6 +207,9 @@
 		outterTR.appendChild(outterTD);
 		outterTBODY.appendChild(outterTR);
 		outterTable.appendChild(outterTBODY);
+		
+		visualElements.setBodyRow(outterTR);
+		visualElements.setBody(outterTBODY);
 
 		Object[] elements = new Object[2];
 		elements[0] = visualElements;
@@ -219,8 +222,13 @@
 				VpeCreatorInfo info1 = creator.create(pageContext, (Element) sourceNode, visualDocument, visualTable, visualNodeMap);
 				if (info1 != null && info1.getVisualNode() != null) {
 					nsIDOMAttr attr = (nsIDOMAttr) info1.getVisualNode();
-					// TODO creates border=1 here
-					visualTable.setAttributeNode(attr);
+					// Fixes creation 'border="1"' 
+					// when setting border attribute to the table
+					if (VpeTemplateManager.ATTR_ANY_BORDER.equalsIgnoreCase(attr.getNodeName()) 
+							&& (null == attr.getNodeValue() || "".equalsIgnoreCase(attr.getNodeValue()))) {
+						attr.setNodeValue("0");
+					}
+					outterTable.setAttributeNode(attr);
 				}
 			}
 		}

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java	2008-02-18 14:03:01 UTC (rev 6377)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java	2008-02-18 14:08:53 UTC (rev 6378)
@@ -132,9 +132,9 @@
 			if (captionStyle != null && captionStyle.trim().length() > 0) {
 				resultStyle += captionStyle;
 			}
-			if (!(captionStyle.lastIndexOf("width") > -1)) {
-				resultStyle += "width: 100%; ";
-			}
+//			if (!(captionStyle.lastIndexOf("width") > -1)) {
+//				resultStyle += "width: 100%; ";
+//			}
 			((nsIDOMElement)cell).setAttribute(HTML.ATTR_STYLE, resultStyle);
 		}
 	}