Author: yzhishko Date: 2009-12-02 11:20:00 -0500 (Wed, 02 Dec 2009) New Revision: 19003 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfHTMLTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/barCode.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java Log: NPE with table fixed. pdf html template was added. BarCode template was fixed. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-12-02 16:15:08 UTC (rev 19002) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-12-02 16:20:00 UTC (rev 19003) @@ -15,7 +15,8 @@ org.eclipse.ui.ide, org.mozilla.xpcom;bundle-version="1.9.1", org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0", - org.eclipse.jface.text;bundle-version="3.5.0" + org.eclipse.jface.text;bundle-version="3.5.0", + org.eclipse.wst.sse.core;bundle-version="1.1.401" Bundle-Vendor: %Bundle-Vendor.0 Bundle-ActivationPolicy: lazy Bundle-ClassPath: lib/antlr.jar, Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfHTMLTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfHTMLTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfHTMLTemplate.java 2009-12-02 16:20:00 UTC (rev 19003) @@ -0,0 +1,122 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.seam.template; + +/** + * @author yzhishko + */ + +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.jboss.tools.jsf.vpe.jsf.template.AbstractOutputJsfTemplate; +import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil; +import org.jboss.tools.jsf.vpe.jsf.template.util.model.VpeElementProxyData; +import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.mapping.AttributeData; +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.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +@SuppressWarnings("restriction") +public class SeamPdfHTMLTemplate extends AbstractOutputJsfTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element element = (Element) sourceNode; + + // create container + final nsIDOMElement container; + container = VisualDomUtil.createBorderlessContainer(visualDocument); + nsIDOMNode divNode = visualDocument.createElement(HTML.TAG_DIV); + divNode.appendChild(container); + VpeCreationData creationData = new VpeCreationData(divNode); + + processOutputAttribute(pageContext, visualDocument, element, container, + creationData); + + return creationData; + } + + @Override + public Node getNodeForUpdate(VpePageContext pageContext, Node sourceNode, + nsIDOMNode visualNode, Object data) { + Node[] footers = SeamUtil.getChildsByName(pageContext, sourceNode, + "p:footer"); //$NON-NLS-1$ + if (footers != null && footers.length != 0) { + Node parentPdfDocumentNode = SeamUtil.getParentByName(pageContext, + sourceNode, "p:document"); //$NON-NLS-1$ + if (parentPdfDocumentNode != null) { + return parentPdfDocumentNode; + } + } + return super + .getNodeForUpdate(pageContext, sourceNode, visualNode, data); + } + + @Override + protected void processOutputAttribute(VpePageContext pageContext, + nsIDOMDocument visualDocument, Element sourceElement, + nsIDOMElement targetVisualElement, VpeCreationData creationData) { + + VpeElementProxyData elementData = new VpeElementProxyData(); + + Attr outputAttr = getOutputAttributeNode(sourceElement); + + if (outputAttr != null) { + + String newValue = prepareAttrValue(pageContext, sourceElement, outputAttr); + + // create info + VpeChildrenInfo targetVisualInfo = new VpeChildrenInfo( + targetVisualElement); + + // get atribute's offset + + //mareshkau because it's node can be a proxy, see JBIDE-3144 + if(!(outputAttr instanceof IDOMAttr)) { + outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName())); + } + + int offset = ((IDOMAttr) outputAttr) + .getValueRegionStartOffset(); + + // reparse attribute's value + NodeList list = NodeProxyUtil.reparseAttributeValue( + elementData, newValue, offset + 1); + + // add children to info + for (int i = 0; i < list.getLength(); i++) { + + Node child = list.item(i); + + // add info to creation data + targetVisualInfo.addSourceChild(child); + } + + elementData.addNodeData(new AttributeData(outputAttr, + targetVisualElement, true)); + + creationData.addChildrenInfo(targetVisualInfo); + + } + + creationData.setElementData(elementData); + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-02 16:15:08 UTC (rev 19002) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-02 16:20:00 UTC (rev 19003) @@ -14,8 +14,11 @@ * @author yzhishko */ +import java.util.List; + import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil; import org.jboss.tools.vpe.editor.context.VpePageContext; +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; @@ -29,7 +32,6 @@ private nsIDOMElement visualElement; private Element sourceElement; - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { sourceElement = (Element) sourceNode; @@ -43,7 +45,21 @@ visualTable.setAttribute(HTML.ATTR_WIDTH, getWidthPerc(sourceElement)); visualTable.setAttribute(HTML.ATTR_ALIGN, getAlignment(sourceElement)); visualTable.setAttribute(HTML.ATTR_CELLSPACING, "0px"); //$NON-NLS-1$ - return new VpeCreationData(visualElement); + VpeCreationData creationData = new VpeCreationData(visualElement); + VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualElement); + Node[] cells = SeamUtil.getChildsByName(pageContext, sourceNode, + "p:cell"); //$NON-NLS-1$ + if (cells != null) { + for (int i = 0; i < cells.length; i++) { + Node parentNode = SeamUtil.getParentByName(pageContext, + cells[i], "p:table"); //$NON-NLS-1$ + if (parentNode != null && parentNode == sourceNode) { + childrenInfo.addSourceChild(cells[i]); + } + } + } + creationData.addChildrenInfo(childrenInfo); + return creationData; } @Override @@ -74,8 +90,16 @@ private void setColumns(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData data) { int numberOfColumns = getNumberOfColumns(sourceNode); - Node[] cells = SeamUtil.getChildsByName(pageContext, sourceNode, - "p:cell"); //$NON-NLS-1$ + List<VpeChildrenInfo> cellsList = data.getChildrenInfoList(); + if (cellsList == null) { + return; + } + VpeChildrenInfo childrenInfo = cellsList.get(0); + List<Node> children = childrenInfo.getSourceChildren(); + if (children == null) { + return; + } + Node[] cells = children.toArray(new Element[0]); int cellsLength = cells.length; if (numberOfColumns > cellsLength) { for (int i = 0; i < cells.length; i++) { @@ -89,53 +113,49 @@ nsIDOMNode visualTable = ((nsIDOMElement) data.getNode() .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) .getElementsByTagName(HTML.TAG_TABLE).item(0); - if (cellsLength != 0) { - nsIDOMNode trVisualNode = visualDocument.createElement(HTML.TAG_TR); - visualTable.appendChild(trVisualNode); - int posCounter = 0; - for (int i = 0; i < cellsLength; i++) { - nsIDOMNode visualCell = pageContext.getDomMapping() - .getVisualNode(cells[i]); - nsIDOMNode parentNode = visualCell.getParentNode(); - if (parentNode != null) { - parentNode.removeChild(visualCell); - trVisualNode.appendChild(visualCell); - int colspanValue = getColspanValue(visualCell); - posCounter++; - if (colspanValue > 1 && posCounter % numberOfColumns != 0) { - int posInRow = posCounter - 1; - int numEndCells = numberOfColumns - posInRow; - if (numEndCells <= colspanValue) { - colspanValue = numEndCells; - trVisualNode = visualDocument - .createElement(HTML.TAG_TR); - visualTable.appendChild(trVisualNode); - posCounter = 0; - continue; - } else { - for (int j = 0; j < numberOfColumns - - (colspanValue); j++) { - i++; - visualCell = pageContext.getDomMapping() - .getVisualNode(cells[i]); - trVisualNode.appendChild(visualCell); - } - i -= numberOfColumns - (colspanValue); - posCounter += colspanValue - 1; + nsIDOMNode trVisualNode = visualDocument.createElement(HTML.TAG_TR); + visualTable.appendChild(trVisualNode); + int posCounter = 0; + for (int i = 0; i < cellsLength; i++) { + nsIDOMNode visualCell = pageContext.getDomMapping().getVisualNode( + cells[i]); + nsIDOMNode parentNode = visualCell.getParentNode(); + if (parentNode != null) { + parentNode.removeChild(visualCell); + trVisualNode.appendChild(visualCell); + int colspanValue = getColspanValue(visualCell); + posCounter++; + if (colspanValue > 1 && posCounter % numberOfColumns != 0) { + int posInRow = posCounter - 1; + int numEndCells = numberOfColumns - posInRow; + if (numEndCells <= colspanValue) { + colspanValue = numEndCells; + trVisualNode = visualDocument + .createElement(HTML.TAG_TR); + visualTable.appendChild(trVisualNode); + posCounter = 0; + continue; + } else { + for (int j = 0; j < numberOfColumns - (colspanValue); j++) { + i++; + visualCell = pageContext.getDomMapping() + .getVisualNode(cells[i]); + trVisualNode.appendChild(visualCell); } + i -= numberOfColumns - (colspanValue); + posCounter += colspanValue - 1; } } - if ((posCounter % numberOfColumns == 0) - && ((i + 1) != cellsLength)) { - trVisualNode = visualDocument.createElement(HTML.TAG_TR); - visualTable.appendChild(trVisualNode); - posCounter = 0; - } } - if (trVisualNode.getChildNodes().getLength() != numberOfColumns) { - trVisualNode.getParentNode().removeChild(trVisualNode); + if ((posCounter % numberOfColumns == 0) && ((i + 1) != cellsLength)) { + trVisualNode = visualDocument.createElement(HTML.TAG_TR); + visualTable.appendChild(trVisualNode); + posCounter = 0; } } + if (trVisualNode.getChildNodes().getLength() != numberOfColumns) { + trVisualNode.getParentNode().removeChild(trVisualNode); + } } private String getWidthPerc(Element sourceElement) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-12-02 16:15:08 UTC (rev 19002) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-12-02 16:20:00 UTC (rev 19003) @@ -601,7 +601,7 @@ <vpe:template children="no" modify="no" /> </vpe:tag> - <vpe:tag name="p:barcode" case-sensitive="yes"> + <vpe:tag name="p:barCode" case-sensitive="yes"> <vpe:template children="no" modify="no" /> </vpe:tag> @@ -613,4 +613,14 @@ <vpe:template children="no" modify="no" /> </vpe:tag> + <vpe:tag name="p:html" case-sensitive="yes"> + <vpe:if test="hasinparents('p:document')"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.seam.template.SeamPdfHTMLTemplate" /> + </vpe:if> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + + </vpe:templates> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/barCode.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/barCode.xhtml 2009-12-02 16:15:08 UTC (rev 19002) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/barCode.xhtml 2009-12-02 16:20:00 UTC (rev 19003) @@ -2,5 +2,5 @@ author="author" type="html" creator="creator" pageSize="LETTER" orientation="portrait" margins="50 60 70 80" xmlns:p="http://jboss.com/products/seam/pdf"> - <p:barcode id="id1">Not rendered</p:barcode> + <p:barCode id="id1">Not rendered</p:barCode> </p:document> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml 2009-12-02 16:20:00 UTC (rev 19003) @@ -0,0 +1,26 @@ +<p:document subject="subject" title="title" author="author" type="pdf" + creator="creator" pageSize="LETTER" orientation="portrait" + margins="50 50 50 50" xmlns:p="http://jboss.com/products/seam/pdf" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> + The document goes here. + <p:html id="htmlID1" value="This is HTML that is just plain text." /> + <p:html id="htmlID2" value="This is HTML with &lt;b&gt;some markup&lt;/b&gt;." /> + + <p:html id="htmlID3"> + This is HTML with text with text in the <b>body</b>. + </p:html> + + + <p:html id="htmlID4"> + <h1>This is more complex HTML</h1> + <ul> + <li>one</li> + <li>two</li> + <li>three</li> + </ul> + </p:html> + +</p:document> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/html.xhtml.xml 2009-12-02 16:20:00 UTC (rev 19003) @@ -0,0 +1,73 @@ +<tests> + <test id="htmlID1"> + <DIV> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + This is HTML that is just plain text. +</SPAN> + </SPAN> + </DIV> + </test> + <test id="htmlID2"> + <DIV> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + This is HTML with +</SPAN> + <B STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + some markup +</SPAN> + </B> + <SPAN CLASS="vpe-text"> + . +</SPAN> + </SPAN> + </DIV> + </test> + <test id="htmlID3"> + <DIV> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + This is HTML with text with text in the +</SPAN> + <B STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + body +</SPAN> + </B> + <SPAN CLASS="vpe-text"> + . +</SPAN> + </DIV> + </test> + <test id="htmlID4"> + <DIV> + <SPAN CLASS="vpe-text"> + </SPAN> + <H1 STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + This is more complex HTML +</SPAN> + </H1> + <UL STYLE="-moz-user-modify: read-write;"> + <LI STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + one +</SPAN> + </LI> + <LI STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + two +</SPAN> + </LI> + <LI STYLE="-moz-user-modify: read-write;"> + <SPAN CLASS="vpe-text"> + three +</SPAN> + </LI> + </UL> + </DIV> + </test> +</tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2009-12-02 16:15:08 UTC (rev 19002) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2009-12-02 16:20:00 UTC (rev 19003) @@ -23,7 +23,7 @@ } public void testConversationId() throws Throwable { - performContentTest("components/conversationId.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + performContentTest("components/conversationId.xhtml"); //$NON-NLS-1$ } public void testConvertDateTime() throws Throwable { @@ -115,7 +115,7 @@ } public void testValidateAll() throws Throwable { - performContentTest("components/validateAll.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + performContentTest("components/validateAll.xhtml"); //$NON-NLS-1$ } public void testValidateFormattedText() throws Throwable { @@ -129,141 +129,145 @@ // mail components public void testMailMessage() throws Throwable { - performContentTest("components/mail/message.xhtml"); + performContentTest("components/mail/message.xhtml"); //$NON-NLS-1$ } public void testMailBody() throws Throwable { - performContentTest("components/mail/body.xhtml"); + performContentTest("components/mail/body.xhtml"); //$NON-NLS-1$ } public void testMailFrom() throws Throwable { - performInvisibleTagTest("components/mail/from.xhtml", "id1"); + performInvisibleTagTest("components/mail/from.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailTo() throws Throwable { - performInvisibleTagTest("components/mail/to.xhtml", "id1"); + performInvisibleTagTest("components/mail/to.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailSubject() throws Throwable { - performInvisibleTagTest("components/mail/subject.xhtml", "id1"); + performInvisibleTagTest("components/mail/subject.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailAttachment() throws Throwable { - performInvisibleTagTest("components/mail/attachment.xhtml", "id1"); + performInvisibleTagTest("components/mail/attachment.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailBcc() throws Throwable { - performInvisibleTagTest("components/mail/bcc.xhtml", "id1"); + performInvisibleTagTest("components/mail/bcc.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailCc() throws Throwable { - performInvisibleTagTest("components/mail/cc.xhtml", "id1"); + performInvisibleTagTest("components/mail/cc.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailHeader() throws Throwable { - performInvisibleTagTest("components/mail/header.xhtml", "id1"); + performInvisibleTagTest("components/mail/header.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testMailReplyTo() throws Throwable { - performInvisibleTagTest("components/mail/replyTo.xhtml", "id1"); + performInvisibleTagTest("components/mail/replyTo.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } // pdf components public void testPdfDocument() throws Throwable { - performContentTest("components/pdf/document.xhtml"); + performContentTest("components/pdf/document.xhtml"); //$NON-NLS-1$ } public void testPdfParagraph() throws Throwable { - performContentTest("components/pdf/paragraph.xhtml"); + performContentTest("components/pdf/paragraph.xhtml"); //$NON-NLS-1$ } public void testPdfText() throws Throwable { - performContentTest("components/pdf/text.xhtml"); + performContentTest("components/pdf/text.xhtml"); //$NON-NLS-1$ } public void testPdfFont() throws Throwable { - performContentTest("components/pdf/font.xhtml"); + performContentTest("components/pdf/font.xhtml"); //$NON-NLS-1$ } public void testPdfNewPage() throws Throwable { - performContentTest("components/pdf/newPage.xhtml"); + performContentTest("components/pdf/newPage.xhtml"); //$NON-NLS-1$ } public void testPdfImage() throws Throwable { - performInvisibleTagTest("components/pdf/image.xhtml", "id1"); + performInvisibleTagTest("components/pdf/image.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfAnchor() throws Throwable { - performContentTest("components/pdf/anchor.xhtml"); + performContentTest("components/pdf/anchor.xhtml"); //$NON-NLS-1$ } public void testPdfHeader() throws Throwable { - performInvisibleTagTest("components/pdf/header.xhtml", "id1"); + performInvisibleTagTest("components/pdf/header.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfFooter() throws Throwable { - performContentTest("components/pdf/footer.xhtml"); + performContentTest("components/pdf/footer.xhtml"); //$NON-NLS-1$ } public void testPdfPageNumber() throws Throwable { - performContentTest("components/pdf/pageNumber.xhtml"); + performContentTest("components/pdf/pageNumber.xhtml"); //$NON-NLS-1$ } public void testPdfChapter() throws Throwable { - performContentTest("components/pdf/chapter.xhtml"); + performContentTest("components/pdf/chapter.xhtml"); //$NON-NLS-1$ } public void testPdfSection() throws Throwable { - performContentTest("components/pdf/section.xhtml"); + performContentTest("components/pdf/section.xhtml"); //$NON-NLS-1$ } public void testPdfList() throws Throwable { - performContentTest("components/pdf/list.xhtml"); + performContentTest("components/pdf/list.xhtml"); //$NON-NLS-1$ } public void testPdfListItem() throws Throwable { - performContentTest("components/pdf/listItem.xhtml"); + performContentTest("components/pdf/listItem.xhtml"); //$NON-NLS-1$ } public void testPdfTable() throws Throwable { - performContentTest("components/pdf/table.xhtml"); + performContentTest("components/pdf/table.xhtml"); //$NON-NLS-1$ } public void testPdfCell() throws Throwable { - performContentTest("components/pdf/cell.xhtml"); + performContentTest("components/pdf/cell.xhtml"); //$NON-NLS-1$ } public void testPdfBarChart() throws Throwable { - performContentTest("components/pdf/barChart.xhtml"); + performContentTest("components/pdf/barChart.xhtml"); //$NON-NLS-1$ } public void testPdfLineChart() throws Throwable { - performContentTest("components/pdf/lineChart.xhtml"); + performContentTest("components/pdf/lineChart.xhtml"); //$NON-NLS-1$ } public void testPdfPieChart() throws Throwable { - performContentTest("components/pdf/pieChart.xhtml"); + performContentTest("components/pdf/pieChart.xhtml"); //$NON-NLS-1$ } public void testPdfSeries() throws Throwable { - performInvisibleTagTest("components/pdf/series.xhtml", "id1"); + performInvisibleTagTest("components/pdf/series.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfData() throws Throwable { - performInvisibleTagTest("components/pdf/data.xhtml", "id1"); + performInvisibleTagTest("components/pdf/data.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfColor() throws Throwable { - performInvisibleTagTest("components/pdf/color.xhtml", "id1"); + performInvisibleTagTest("components/pdf/color.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfStroke() throws Throwable { - performInvisibleTagTest("components/pdf/stroke.xhtml", "id1"); + performInvisibleTagTest("components/pdf/stroke.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testPdfBarCode() throws Throwable { - performInvisibleTagTest("components/pdf/barCode.xhtml", "id1"); + performInvisibleTagTest("components/pdf/barCode.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$ } + + public void testPdfHTML() throws Throwable { + performContentTest("components/pdf/html.xhtml"); //$NON-NLS-1$ + } }