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

Author: yradtsevich Date: 2008-11-14 13:23:53 -0500 (Fri, 14 Nov 2008) New Revision: 11795 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java Log: CODING IN PROGRESS - issue JBIDE-2877: <rich:dataTable>, <rich:column> interaction https://jira.jboss.org/jira/browse/JBIDE-2877 Item #4 has been fixed: "Incorrect size of header and footer paths of <rich:dataTable> when using <rich:subTable> (see screenshot-5)". Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-14 17:56:14 UTC (rev 11794) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-14 18:23:53 UTC (rev 11795) @@ -167,8 +167,8 @@ final nsIDOMElement tr = this.visualDocument.createElement(HTML.TAG_TR); table.appendChild(tr); final nsIDOMElement td = this.visualDocument.createElement(HTML.TAG_TD); - // COLSPAN="0" means the cell spans the entire row - td.setAttribute(HTML.ATTR_COLSPAN, "0"); //NON-NLS$1 + + td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL); tr.appendChild(td); final VpeChildrenInfo childInfo = new VpeChildrenInfo(td); childInfo.addSourceChild(node); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-11-14 17:56:14 UTC (rev 11794) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-11-14 18:23:53 UTC (rev 11795) @@ -209,9 +209,9 @@ td.setAttribute(HTML.ATTR_CLASS, styleClass); } - if (columns>0) { - td.setAttribute(HTML.ATTR_COLSPAN, String.valueOf(columns)); - } + // the cell spans the entire row + td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL); + td.setAttribute(HTML.ATTR_SCOPE, "colgroup"); //$NON-NLS-1$ VpeChildrenInfo child = new VpeChildrenInfo(td); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-14 17:56:14 UTC (rev 11794) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-14 18:23:53 UTC (rev 11795) @@ -684,10 +684,8 @@ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass); } - if (columns > 0) { - td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, String - .valueOf(columns)); - } + // the cell spans the entire row + td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL); td.setAttribute(HtmlComponentUtil.HTML_SCOPE_ATTR, HtmlComponentUtil.HTML_TAG_COLGROUP); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-14 17:56:14 UTC (rev 11794) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-14 18:23:53 UTC (rev 11795) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Element; @@ -365,10 +366,9 @@ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass); } - if (columns > 0) { - td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, String - .valueOf(columns)); - } + // the cell spans the entire row + td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL); + td.setAttribute(HtmlComponentUtil.HTML_SCOPE_ATTR, HtmlComponentUtil.HTML_TAG_COLGROUP);