Author: yradtsevich Date: 2009-01-28 11:54:26 -0500 (Wed, 28 Jan 2009) New Revision: 13308 Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml Log: RESOLVED - issue JBIDE-3616: The resizer is not showed when an input component is selected by mouse. https://jira.jboss.org/jira/browse/JBIDE-3616 AFFECTED issues: 1. JBIDE-3511: Text body of h:outputText and h:outputFormat is rendered in incorrect sequence. https://jira.jboss.org/jira/browse/JBIDE-3511 2. JBIDE-3512: Text bodies of tags h:commandButton, h:inputSecret, h:inputText and h:inputTextarea are not rendered by VPE. https://jira.jboss.org/jira/browse/JBIDE-3512 - All changes related to the issues JBIDE-3511 and JBIDE-3512 have been rolled back Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,80 +0,0 @@ -package org.jboss.tools.jsf.vpe.jsf.template; - -import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil; -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.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -public class JsfCommandButtonTemplate extends AbstractOutputJsfTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - - Element sourceElement = (Element) sourceNode; - - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); - - VpeCreationData creationData = new VpeCreationData(contentSpan); - - boolean disabled = ComponentUtil.string2boolean(ComponentUtil - .getAttribute(sourceElement, HTML.ATTR_DISABLED)); - String type = sourceElement.getAttribute(HTML.ATTR_TYPE); - String image = sourceElement.getAttribute(HTML.VALUE_TYPE_IMAGE); - String value = sourceElement.getAttribute(HTML.ATTR_VALUE); - String style = sourceElement.getAttribute(HTML.ATTR_STYLE); - String clazz = sourceElement.getAttribute(HTML.ATTR_CLASS); - String dir = sourceElement.getAttribute(HTML.ATTR_DIR); - - if (ComponentUtil.isNotBlank(image)) { - type = HTML.VALUE_TYPE_IMAGE; - String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(image, pageContext, true); - input.setAttribute(HTML.ATTR_SRC, imgFullPath); - } - - if (ComponentUtil.isBlank(type)) { - type = HTML.VALUE_TYPE_BUTTON; - } - input.setAttribute(HTML.ATTR_TYPE, type); - - if (ComponentUtil.isNotBlank(value)) { - input.setAttribute(HTML.ATTR_VALUE, value); - } - if (ComponentUtil.isNotBlank(style)) { - input.setAttribute(HTML.ATTR_VALUE, style); - } - if (ComponentUtil.isNotBlank(clazz)) { - input.setAttribute(HTML.ATTR_VALUE, clazz); - } - if (ComponentUtil.isNotBlank(dir)) { - input.setAttribute(HTML.ATTR_VALUE, dir); - } - - if (disabled) { - input.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED); - } - - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - firstSpan.appendChild(input); - return creationData; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,17 +0,0 @@ -package org.jboss.tools.jsf.vpe.jsf.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.mozilla.interfaces.nsIDOMDocument; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -public class JsfInputSecretTemplate extends JsfInputTextTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - VpeCreationData creationData = createInputElement(visualDocument, (Element) sourceNode, true); - return creationData; - } - -} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -16,10 +16,8 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.AttributeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; -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.nsIDOMHTMLTextAreaElement; @@ -27,7 +25,6 @@ import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class JsfInputTextAreaTemplate extends AbstractEditableJsfTemplate { @@ -35,22 +32,16 @@ nsIDOMDocument visualDocument) { Element sourceElement = (Element) sourceNode; - /* - * https://jira.jboss.org/jira/browse/JBIDE-3512 - * Container for correct children encoding was added. - * Author: dmaliarevich - */ - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement textArea = visualDocument.createElement(HTML.TAG_TEXTAREA); + + nsIDOMElement textArea = visualDocument + .createElement(HTML.TAG_TEXTAREA); // Commented as fix for JBIDE-3012. // ((nsIDOMHTMLTextAreaElement) textArea // .queryInterface(nsIDOMHTMLTextAreaElement.NS_IDOMHTMLTEXTAREAELEMENT_IID)) // .setReadOnly(true); - VpeCreationData creationData = new VpeCreationData(contentSpan); + VpeCreationData creationData = new VpeCreationData(textArea); copyGeneralJsfAttributes(sourceElement, textArea); ComponentUtil.copyDisabled(sourceElement, textArea); @@ -77,17 +68,7 @@ } textArea.appendChild(text); creationData.setElementData(elementData); - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - lastSpan.appendChild(textArea); + return creationData; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,49 +11,30 @@ package org.jboss.tools.jsf.vpe.jsf.template; -import java.util.ArrayList; -import java.util.List; - import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil; import org.jboss.tools.jsf.vpe.jsf.template.util.JSF; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.AttributeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; -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.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class JsfInputTextTemplate extends AbstractEditableJsfTemplate { public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - VpeCreationData creationData = createInputElement(visualDocument, (Element) sourceNode, false); - return creationData; - } - protected VpeCreationData createInputElement(nsIDOMDocument visualDocument, - Element sourceElement, - boolean typePassword) { - - /* - * https://jira.jboss.org/jira/browse/JBIDE-3512 - * Container for correct children encoding was added. - * Author: dmaliarevich - */ - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); + Element sourceElement = (Element) sourceNode; + nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); - VpeCreationData creationData = new VpeCreationData(contentSpan); - + VpeCreationData creationData = new VpeCreationData(input); + copyGeneralJsfAttributes(sourceElement, input); ComponentUtil.copyDisabled(sourceElement, input); @@ -61,34 +42,24 @@ copyAttribute(input, sourceElement, JSF.ATTR_SIZE, HTML.ATTR_SIZE); copyAttribute(input, sourceElement, JSF.ATTR_DIR, HTML.ATTR_DIR); - if (typePassword) { - input.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_PASSWORD); - } - VpeElementData elementData = new VpeElementData(); if (sourceElement.hasAttribute(JSF.ATTR_VALUE)) { - Attr attr = sourceElement.getAttributeNode(JSF.ATTR_VALUE); - elementData.addNodeData(new AttributeData(attr, input, true)); + + Attr attr = sourceElement.getAttributeNode(JSF.ATTR_VALUE); + elementData + .addNodeData(new AttributeData(attr, input, true)); + } else { - elementData.addNodeData(new AttributeData(JSF.ATTR_VALUE, input, - true)); + + elementData.addNodeData(new AttributeData(JSF.ATTR_VALUE, + input, true)); + } creationData.setElementData(elementData); - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - lastSpan.appendChild(input); return creationData; } - + @Override public Attr getOutputAttributeNode(Element element) { // TODO Auto-generated method stub @@ -102,5 +73,4 @@ return true; } - } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -21,7 +21,6 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; 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.w3c.dom.Attr; @@ -73,24 +72,16 @@ Element element = (Element) sourceNode; - // create container - nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument); + // create span element + nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN); + // creation data - VpeCreationData creationData = new VpeCreationData(mainContainer); - - VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument); - - // create container for values of attributes, for tag body - // and append them them to main container - nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - mainContainer.appendChild(attributeValueContainer); + VpeCreationData creationData = new VpeCreationData(span); - - // copy attributes - copyOutputJsfAttributes(attributeValueContainer, element); + copyOutputJsfAttributes(span, element); - processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer, + processOutputAttribute(pageContext, visualDocument, element, span, creationData); return creationData; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,16 +11,13 @@ package org.jboss.tools.jsf.vpe.jsf.template; 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.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.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @author Sergey Dzmitrovich @@ -41,30 +38,28 @@ Element element = (Element) sourceNode; - nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - VpeCreationData creationData = new VpeCreationData(mainContainer); + // create span element + nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN); - VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument); - - // create container for values of attributes, for tag body - // and append them them to main container - nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - mainContainer.appendChild(attributeValueContainer); - // creation data + VpeCreationData creationData = new VpeCreationData(span); // copy attributes - copyOutputJsfAttributes(attributeValueContainer, element); - processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer, + copyOutputJsfAttributes(span, element); + + processOutputAttribute(pageContext, visualDocument, element, span, creationData); return creationData; + } @Override public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) { + return true; } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -31,7 +31,7 @@ </vpe:tag> <vpe:tag name="h:inputText" case-sensitive="yes"> - <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextTemplate"> + <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextTemplate"> <!-- <input type="text" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}" size="{@size}" dir="{@dir}" /> --> @@ -57,7 +57,7 @@ </vpe:tag> <vpe:tag name="h:inputTextarea" case-sensitive="yes"> - <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate"> + <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate"> <!-- <textarea class="{@styleClass}" style="{@style}" rows="{@rows}" cols="{@cols}" title="{tagstring()}" dir="{@dir}"> <vpe:value expr="{jsfvalue(@value)}" /> @@ -75,10 +75,10 @@ </vpe:tag> <vpe:tag name="h:inputSecret" case-sensitive="yes"> - <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputSecretTemplate"> - <!-- <input type="password" value="{jsfvalue(@value)}" + <vpe:template children="no" modify="no"> + <input type="password" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}" - size="{@size}" dir="{@dir}" /> --> + size="{@size}" dir="{@dir}" /> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> @@ -180,23 +180,10 @@ <!-- Проблема с адресацией от приложения (30 of 4) --> <vpe:tag name="h:commandButton" case-sensitive="yes"> - <vpe:template children="yes" modify="no" - class="org.jboss.tools.jsf.vpe.jsf.template.JsfCommandButtonTemplate"> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - <!-- This is a very big if-statement. Its goal is to add support of 'disabled property' DO NOT FORGET TO EDIT 'ELSE' PART IN FUTURE MODIFICATIONS --> -<!-- <vpe:if test="(@disabled='true')"> + <vpe:if test="(@disabled='true')"> <vpe:if test="not(attrpresent('image'))"> <vpe:if test="(@type='')"> <vpe:template children="no" modify="no"> @@ -246,9 +233,9 @@ </vpe:textFormatting> </vpe:template> </vpe:if> - </vpe:if> --> + </vpe:if> <!--else--> - <!-- <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="not(attrpresent('image'))"> <vpe:if test="(@type='')"> <vpe:template children="no" modify="no">z <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" @@ -293,7 +280,7 @@ <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> - </vpe:if> --> + </vpe:if> <!--end-of-else--> </vpe:tag> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,11 @@ <tests> <test id="commandLink1"> - <A STYLE="-moz-user-modify: read-write;"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"></SPAN> - <SPAN CLASS="vpe-text">Say Hello</SPAN> - </SPAN> + <A DIR="" STYLE="-moz-user-modify: read-write;"> + <SPAN>Say Hello</SPAN> </A> </test> <test id="commandLink2"> - <A STYLE="-moz-user-modify: read-write;"> + <A DIR="" STYLE="-moz-user-modify: read-write;"> <SPAN>Link</SPAN> </A> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,13 +1,7 @@ <tests> <test id="portlet"> - <SPAN STYLE="-moz-user-modify: read-only;"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - .... - </SPAN> - </SPAN> + <SPAN STYLE="-moz-user-modify: read-only;"> + <SPAN> ....</SPAN> </SPAN> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,6 @@ <tests> <test id="status1"> - <SPAN> + <SPAN CLASS="" STYLE=""> <SPAN> Complete </SPAN> @@ -12,12 +12,8 @@ STOP TEXT </SPAN> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FACET STOP OUTPUT TEXT - </SPAN> + <SPAN> + FACET STOP OUTPUT TEXT </SPAN> </DIV> </SPAN> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -5,11 +5,9 @@ </head> <body> <f:view> - <b> - <h:outputFormat value="{0}"> - <f:param value="paramValue" /> - </h:outputFormat> - </b> + <b><h:outputFormat value="{0}" + ><f:param value="paramValue" + /></h:outputFormat></b> </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,62 +1,53 @@ <tests> <test id="body_test"> - <DIV ID="body_test" STYLE="-moz-user-modify: read-write;" > - <TABLE STYLE="background-color: red;" CLASS="dr-table rich-table"> - <COLGROUP SPAN="1"> - </COLGROUP> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - #{test.color} - </SPAN> - </TD> - </TR> - </TABLE> - <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;"> - <TABLE CLASS="dr-table rich-sdt"> - <COLGROUP SPAN="1"> - </COLGROUP> - <TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;"> - </TBODY> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<DIV ID="body_test" STYLE="-moz-user-modify: read-write;"> +<TABLE STYLE="background-color: red;" CLASS="dr-table rich-table"> +<COLGROUP SPAN="1"> +</COLGROUP> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell"> +<SPAN CLASS="vpe-text"> +#{test.color} +</SPAN> +</TD> +</TR> +</TABLE> +<DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;"> +<TABLE CLASS="dr-table rich-sdt"> +<COLGROUP SPAN="1"> +</COLGROUP> +<TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;"> +</TBODY> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </TABLE> - </DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text" STYLE="background-color: pink;"> - ssssssssss - </SPAN> - </SPAN> - </DIV> +</TD> +</TR> +</TABLE> +</DIV> +<SPAN STYLE="background-color: pink;"> +ssssssssss +</SPAN> +</DIV> </test> </tests> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,32 +1,29 @@ <tests> <test id="test_el"> - - <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> - <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;"> - Error Messages - </SPAN> - <DIV CLASS="dr-pnl rich-panel" STYLE=""> - <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - 123456789 Test El expression Test El expression Test El expression - </SPAN> - <DIV - STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;"> - <BR VPE:PSEUDO-ELEMENT="yes" - STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" /> - </DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Hello - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - Name: Test El expression - </SPAN> - </DIV> +<FORM + STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> + <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;"> + Error Messages +</SPAN> + <DIV CLASS="dr-pnl rich-panel" STYLE=""> + <DIV CLASS="dr-pnl-b rich-panel-body"> + <SPAN> + 123456789 Test El expression Test El expression Test El expression +</SPAN> + <DIV + STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;"> + <BR VPE:PSEUDO-ELEMENT="yes" + STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"> + </BR> </DIV> - </FORM> - </test> + <SPAN> + Hello +</SPAN> + <SPAN> + Name: Test El expression +</SPAN> + </DIV> + </DIV> +</FORM> +</test> </tests> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,108 +1,82 @@ <tests> <test id="jbide3376"> + <DIV ID="jbide3376"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<TABLE STYLE="-moz-user-modify: read-only;"> +<TR> +<TD> +<DIV> +<TABLE> +<CAPTION> +</CAPTION> +<THEAD> +<TR> +<TH> +<DIV> +<SPAN> +Header +</SPAN> +</DIV> +</TH> +</TR> +</THEAD> +<TFOOT> +<TR> +<TD> +<DIV> +<SPAN> +Header +</SPAN> +</DIV> +</TD> +</TR> +</TFOOT> +<TBODY> +<TR> +<TD STYLE="border: 0px hidden ; padding: 0px;"> +<TABLE WIDTH="100%" BORDER="0"> +<TBODY> +<TR> +<TD> +<SPAN> +#{book.name} +</SPAN> +</TD> +<TD> +<SPAN> +#{book.name} +</SPAN> +</TD> +</TR> +</TBODY> +<COLGROUP> +<COL STYLE="-moz-user-modify: read-write;"/> - <DIV ID="jbide3376" > - <TABLE - STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> - <TR> - <TD> - <DIV> - <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> - <TABLE STYLE="-moz-user-modify: read-only;"> - <TR> - <TD> - <DIV> - <TABLE> - <CAPTION> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<COL STYLE="-moz-user-modify: read-write;"/> - </CAPTION> - <THEAD> - <TR> - <TH > - <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Header - </SPAN> - </SPAN> - </DIV> - </TH> - </TR> - </THEAD> - <TFOOT> - <TR> - <TD > - <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Header - </SPAN> - </SPAN> - </DIV> - </TD> - </TR> - </TFOOT> - <TBODY> - <TR> - <TD STYLE="border: 0px hidden ; padding: 0px;"> - <TABLE WIDTH="100%" BORDER="0"> - <TBODY> - <TR> - <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.name} - </SPAN> - </SPAN> - </TD> - <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.name} - </SPAN> - </SPAN> - </TD> - </TR> - </TBODY> - <COLGROUP> - <COL STYLE="-moz-user-modify: read-write;" /> +</COLGROUP> +</TABLE> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</TD> +</TR> +</TABLE><A>Go next page:</A><BR STYLE="-moz-user-modify: read-write;"/> - <COL STYLE="-moz-user-modify: read-write;" /> - - </COLGROUP> - </TABLE> - </TD> - </TR> - </TBODY> - </TABLE> - </DIV> - </TD> - </TR> - </TABLE> - <A>Go next page:</A> - <BR STYLE="-moz-user-modify: read-write;" /> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Begin - </SPAN> - </SPAN> - </FORM> - </DIV> - </TD> - </TR> - </TABLE> - </DIV> - </test> +<SPAN> +Begin +</SPAN> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -21,10 +21,6 @@ <h:commandButton value="commandButton5" id="commandButton5" image="" /> - <h:commandButton value="Fight" id="commandButton6"><p>h:commandButton</p></h:commandButton> - - <h:commandButton value="commandButton7" id="commandButton7" type="button" disabled="true"/> - </h:form> </f:view> </body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,74 +1,17 @@ <tests> <test id="commandButton1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="button" value="commandButton"/> </test> <test id="commandButton2"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton1" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="button" value="commandButton1" /> </test> <test id="commandButton3"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton3" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="reset" value="commandButton3" /> </test> <test id="commandButton4"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton4" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="submit" value="commandButton4" /> </test> <test id="commandButton5"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton5" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="image" SRC="/.*ve/unresolved_image.gif/" /> </test> - <test id="commandButton6"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="Fight" /> - <P STYLE="-moz-user-modify: read-write;"> - <SPAN CLASS="vpe-text"> - h:commandButton - </SPAN> - </P> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> - </test> - <test id="commandButton7"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton7" DISABLED="disabled" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,12 @@ <tests> <test id="dataTable"> - - <TABLE STYLE="-moz-user-modify: read-only;" > + <TABLE STYLE="-moz-user-modify: read-only;"> <TR> <TD> <DIV> <TABLE> <CAPTION> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </CAPTION> <TBODY> <TR> @@ -18,24 +16,12 @@ <TR> <TH> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Last Name - </SPAN> - </SPAN> + <SPAN>Last Name</SPAN> </DIV> </TH> <TH> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - First Name - </SPAN> - </SPAN> + <SPAN>First Name</SPAN> </DIV> </TH> </TR> @@ -44,24 +30,12 @@ <TR> <TD> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer - </SPAN> - </SPAN> + <SPAN>footer</SPAN> </DIV> </TD> <TD> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer - </SPAN> - </SPAN> + <SPAN>footer</SPAN> </DIV> </TD> </TR> @@ -69,30 +43,16 @@ <TBODY> <TR> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Dupont - </SPAN> - </SPAN> + <SPAN>Dupont</SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - William - </SPAN> - </SPAN> + <SPAN>William</SPAN> </TD> </TR> </TBODY> <COLGROUP> - <COL STYLE="-moz-user-modify: read-write;" /> - - <COL STYLE="-moz-user-modify: read-write;" /> - + <COL STYLE="-moz-user-modify: read-write;"/> + <COL STYLE="-moz-user-modify: read-write;"/> </COLGROUP> </TABLE> </TD> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,13 +1,7 @@ <tests> <test id="facet"> - <DIV > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Last Name - </SPAN> - </SPAN> + <DIV> + <SPAN> Last Name</SPAN> </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,10 +9,8 @@ <f:view> <h1><h:outputText value="inputSecret" /></h1> - <h:inputSecret value="inputSecret" id="inputSecret1"/> + <h:inputSecret value="inputSecret" id="inputSecret"/> - <h:inputSecret value="asdsfsdfsdfkmsdkfdf" id="inputSecret2">h:inputSecret </h:inputSecret> - </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,24 +1,5 @@ <tests> - <test id="inputSecret1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="password" VALUE="inputSecret" /> - </SPAN> - </SPAN> + <test id="inputSecret"> + <input type="password" /> </test> - <test id="inputSecret2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputSecret - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="password" VALUE="asdsfsdfsdfkmsdkfdf" /> - - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,9 +9,8 @@ <f:view> <h1><h:outputText value="inputText" /></h1> - <h:inputText id="inputText1" value="inputText"/> + <h:inputText id="inputText" value="inputText"/> - <h:inputText id="inputText2" value="Test verbtim for h:inputSecret ">h:inputText</h:inputText> </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,23 +1,5 @@ <tests> - <test id="inputText1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT VALUE="inputText" /> - </SPAN> - </SPAN> + <test id="inputText"> + <input /> </test> - <test id="inputText2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputText - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT VALUE="Test verbtim for h:inputSecret " /> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,10 +9,8 @@ <f:view> <h1><h:outputText value="inputTextArea" /></h1> - <h:inputTextarea value="inputTextArea" id="inputTextArea1" /> + <h:inputTextarea value="inputTextArea" id="inputTextArea" /> - <h:inputTextarea value="Test text for h:inputTextarea " id="inputTextArea2">h:inputTextarea</h:inputTextarea> - </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,27 +1,5 @@ <tests> - <test id="inputTextArea1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <TEXTAREA> - inputTextArea - </TEXTAREA> - </SPAN> - </SPAN> + <test id="inputTextArea"> + <TEXTAREA> inputTextArea </TEXTAREA> </test> - <test id="inputTextArea2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputTextarea - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <TEXTAREA> - Test text for h:inputTextarea - </TEXTAREA> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -8,15 +8,14 @@ <f:view> <h1><h:outputText value="outputFormat" /></h1> -<div> + <h:outputFormat value="outputFormat1" id="outputFormat1" /> <h:outputFormat escape="true" value="outputFormat2" id="outputFormat2" /> <h:outputFormat escape="false" value="outputFormat3" id="outputFormat3" /> <h:outputFormat value="{0}" id="outputFormat4"> <f:param value="outputFormat4" /> </h:outputFormat> - <h:outputFormat value="5" id="outputFormat5">outputFormat</h:outputFormat> -</div> + </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,52 +1,16 @@ <tests> <test id="outputFormat1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat1 - </SPAN> - </SPAN> + <SPAN> outputFormat1 </SPAN> </test> <test id="outputFormat2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat2 - </SPAN> - </SPAN> + <SPAN> outputFormat2 </SPAN> </test> <test id="outputFormat3"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputFormat3 - </SPAN> - </SPAN> + <SPAN> + <SPAN> outputFormat3 </SPAN> </SPAN> </test> <test id="outputFormat4"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat4 - </SPAN> - </SPAN> + <SPAN> outputFormat4 </SPAN> </test> - <test id="outputFormat5"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputFormat - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - 5 - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -12,7 +12,7 @@ <h:outputText value="outputText1" id="outputText1" /> <h:outputText value="outputText2" id="outputText2" escape="true" /> <h:outputText value="outputText3" id="outputText3" escape="false" /> - <h:outputText value="4" id="outputText4">outputText</h:outputText> + </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,44 +1,13 @@ <tests> <test id="outputText1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputText1 - </SPAN> - </SPAN> - <SPAN>outputText1</SPAN> + <SPAN> outputText1</SPAN> </test> <test id="outputText2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputText2 - </SPAN> - </SPAN> + <SPAN> outputText2</SPAN> </test> <test id="outputText3"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputText3 - </SPAN> - </SPAN> + <SPAN> + <SPAN> outputText3</SPAN> </SPAN> </test> - <test id="outputText4"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputText - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,6 @@ <tests> <test id="panelGrid"> - <TABLE STYLE="-moz-user-modify: read-write;" > + <TABLE> <TR> <TD> <DIV> @@ -8,62 +8,26 @@ <TBODY> <TR CLASS="oddRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - column 1 - </SPAN> - </SPAN> + <SPAN> column 1 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - column 2 - </SPAN> - </SPAN> + <SPAN> column 2 </SPAN> </TD> </TR> <TR CLASS="evenRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 1 - </SPAN> - </SPAN> + <SPAN> 1 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 2 - </SPAN> - </SPAN> + <SPAN> 2 </SPAN> </TD> </TR> <TR CLASS="oddRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 3 - </SPAN> - </SPAN> + <SPAN> 3 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> + <SPAN> 4 </SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,38 +1,14 @@ <tests> <test id="panelGroup1"> - <SPAN STYLE="-moz-user-modify: read-write;" > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 1 - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 2 - </SPAN> - </SPAN> + <SPAN> + <SPAN> 1</SPAN> + <SPAN> 2</SPAN> </SPAN> </test> <test id="panelGroup2"> - <DIV STYLE="-moz-user-modify: read-write;" > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 3 - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> + <DIV> + <SPAN> 3</SPAN> + <SPAN> 4</SPAN> </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -59,10 +59,10 @@ TestUtil.findAllElementsByName(rst, elements, HTML.TAG_SPAN); - assertEquals("Number of divs should be equals 3", 3, elements.size()); //$NON-NLS-1$ + assertEquals("Count of divs should be equals 1", 1, elements.size()); //$NON-NLS-1$ final nsIDOMElement spanOne = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - assertEquals("Style attribute should be substituted", VALUE_4, spanOne.getLastChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ + assertEquals("Style attribute should be substituted", VALUE_4, spanOne.getFirstChild().getNodeValue()); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -44,9 +44,9 @@ setException(null); //test for element node - testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp", 11, 34); //$NON-NLS-1$ + testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp",11, 34); //$NON-NLS-1$ //test for sourceNode - testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp", 12, 58); //$NON-NLS-1$ + testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp",12, 58); //$NON-NLS-1$ if(getException()!=null) { throw getException(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -170,7 +170,7 @@ nsIDOMNode node = SelectionUtil.getLastSelectedNode(controller.getPageContext()); - assertEquals("Node names should be equals.", "Hello", node.getLastChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Node names should be equals", "Hello", node.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -282,22 +282,25 @@ // disabled="true", so number of "a" tags must be one assertEquals(1, spanElements.size()); - nsIDOMNode outputFormat = spanElements.get(0); + nsIDOMNode span = spanElements.get(0); - nsIDOMNodeList outputFormatChildren = outputFormat.getChildNodes(); - assertNotNull(outputFormatChildren); - assertEquals(outputFormatChildren.getLength(), 2); - - nsIDOMNode fParamContainer = outputFormatChildren.item(1); - assertNotNull(fParamContainer); - - nsIDOMNodeList fParamContainerChildren = fParamContainer.getChildNodes(); - assertNotNull(fParamContainerChildren); - assertTrue(fParamContainerChildren.getLength() > 0); - - nsIDOMNode text = fParamContainerChildren.item(0); - assertEquals("paramValue", text.getNodeValue()); + nsIDOMNodeList children = span.getChildNodes(); + assertNotNull(children); + boolean isFind = false; + for (int i = 0; i < children.getLength(); i++) { + + nsIDOMNode text = children.item(i); + + if ("paramValue".equals(text.getNodeValue())) { //$NON-NLS-1$ + isFind = true; + break; + } + + assertEquals(true, isFind); + + } + // check exception if (getException() != null) { throw getException(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,47 +1,22 @@ <tests> <test id="column1"> - <TD COLSPAN="3" ID="column1" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FIELDS - </SPAN> - </SPAN> + <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN> FIELDS</SPAN> </TD> </test> <test id="column2"> - <TD BREAKBEFORE="true" ID="column2" - CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1 - </SPAN> - </SPAN> + <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN> field1</SPAN> </TD> </test> <test id="column3"> - <TD ID="column3" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field1} - </SPAN> - </SPAN> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{row.field1}</SPAN> </TD> </test> <test id="column4"> - <TD ID="column4" CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer1 - </SPAN> - </SPAN> + <TD CLASS="dr-table-footercell rich-table-footercell"> + <SPAN> footer1</SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-28 16:54:26 UTC (rev 13308) @@ -5,6 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + <head> </head> <body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,7 @@ <tests> <test id="columns"> - <TD VALUE="#{bookList.books}" VAR="label" ID="columns" - CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.price} - </SPAN> - </SPAN> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{book.price}</SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,212 +1,111 @@ <tests> <test id="dataDefinitionList"> - <DL CLASS="yellow-background"> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> </DL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,22 +11,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -34,22 +26,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -59,22 +43,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -82,22 +58,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -105,9 +73,9 @@ </TBODY> </TABLE> </test> + <test id="dataGrid2"> - <test id="dataGrid2"> <TABLE VALUE="#{bean.dtList}" VAR="data" ID="dataGrid2" CLASS="dr-table rich-table"> <COLGROUP SPAN="1"> @@ -118,13 +86,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> <TR CLASS="dr-table-row rich-table-row"> @@ -132,13 +96,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> <TR CLASS="dr-table-row rich-table-row"> @@ -146,13 +106,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,65 +1,16 @@ <tests> <test id="dataList"> - <UL VAR="data" VALUE="#{bean.dtList}" ROWS="4" ID="dataList" CLASS="dr-list rich-datalist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field2: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field2} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field3: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field3} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - number: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} -</SPAN> - </SPAN> + <SPAN> field1:</SPAN> + <SPAN > #{data.field1}</SPAN> + <SPAN> field2:</SPAN> + <SPAN> #{data.field2}</SPAN> + <SPAN> field3:</SPAN> + <SPAN> #{data.field3}</SPAN> + <SPAN> number:</SPAN> + <SPAN> #{data.number}</SPAN> </LI> </UL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,228 +1,30 @@ <tests> <test id="dataOrderedList"> - - <OL TYPE="A" ID="dataOrderedList" VALUE="" ROWS="5" - CLASS="dr-list rich-orderedlist"> + <OL TYPE="A" VALUE="" ROWS="5" CLASS="dr-list rich-orderedlist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> - <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> - </LI> - <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> - </LI> </OL> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,57 +1,28 @@ <tests> <test id="dataTable"> - <TABLE WIDTH="700" CELLSPACING="0" CELLPADDING="0" BORDER="0" - VAR="row" VALUE="#{bean.dtList}" ROWKEYVAR="rowKey" ID="dataTable" - CLASS="dr-table rich-table"> + VAR="row" VALUE="#{bean.dtList}" ROWKEYVAR="rowKey" CLASS="dr-table rich-table"> <COLGROUP SPAN="1"> </COLGROUP> <THEAD> <TR CLASS="dr-table-header rich-table-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> <TD ROWSPAN="2" CLASS="dr-table-headercell rich-table-headercell"> - <IMG WIDTH="1" HEIGHT="1" - SRC="/.*resources/spacer/spacer.gif/" - CLASS="rich-spacer" /> - + <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/"/> </TD> <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FIELDS -</SPAN> - </SPAN> + <SPAN> FIELDS</SPAN> </TD> </TR> <TR CLASS="dr-table-header-continue rich-table-header-continue"> <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1 -</SPAN> - </SPAN> + <SPAN> field1</SPAN> </TD> <TD CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field2 -</SPAN> - </SPAN> + <SPAN> field2</SPAN> </TD> <TD CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field3 -</SPAN> - </SPAN> + <SPAN> field3</SPAN> </TD> </TR> </THEAD> @@ -59,74 +30,31 @@ <TR CLASS="dr-table-footer rich-table-footer"> <TD CLASS="dr-table-footercell rich-table-footercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer1 -</SPAN> - </SPAN> + <SPAN> footer1</SPAN> </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer2 -</SPAN> - </SPAN> + <SPAN> footer2</SPAN> </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer3 -</SPAN> - </SPAN> + <SPAN> footer3</SPAN> </TD> </TR> </TFOOT> <TBODY> <TR CLASS="dr-subtable-cell rich-subtable-cell"> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{rowKey} -</SPAN> - </SPAN> + <SPAN> #{rowKey}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field1} -</SPAN> - </SPAN> + <SPAN> #{row.field1}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field2} -</SPAN> - </SPAN> + <SPAN> #{row.field2}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field3} -</SPAN> - </SPAN> + <SPAN> #{row.field3}</SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,100 +1,72 @@ <tests> - <test id="dropDownMenu"> - - <UL VPE-DDM-MENU-TITLE-UL=""> - <LI VPE-DDM-MENU-TITLE-LI="" - CLASS="rich-ddmenu-label rich-ddmenu-label-unselect" STYLE=""> - <DIV CLASS="dr-menu-top-div"> - <SPAN CLASS="rich-label-text-decor"> - Menu 1 + <test id="dropDownMenu"> + +<UL VPE-DDM-MENU-TITLE-UL="" > +<LI VPE-DDM-MENU-TITLE-LI="" CLASS="rich-ddmenu-label rich-ddmenu-label-unselect" STYLE="" > +<DIV CLASS="dr-menu-top-div" > +<SPAN CLASS="rich-label-text-decor" > +Menu 1 </SPAN> - </DIV> - <UL VPE-DDM-MENU-CHILDREN-UL="" - CLASS="rich-menu-list-border rich-menu-list-bg" STYLE=""> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> +</DIV> +<UL VPE-DDM-MENU-CHILDREN-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" STYLE="" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 1 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN > +Item 1 +</SPAN> +</SPAN> +</DIV> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > +<SPAN CLASS="rich-menu-item-icon-enabled" > +<IMG SRC="/.*resources/menuGroup/spacer.gif/" /> - </LI> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE=""> - <DIV CLASS="dr-menu-group-top-div"> - <SPAN CLASS="rich-menu-item-icon-enabled"> - <IMG - SRC="/.*resources/menuGroup/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label rich-menu-group-label"> - Group 2 </SPAN> - <SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" - STYLE=""> - <IMG - SRC="/.*resources/menuGroup/arrow.gif/" /> +<SPAN CLASS="rich-menu-item-label rich-menu-group-label" > +Group 2 +</SPAN> +<SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" STYLE="" > +<IMG SRC="/.*resources/menuGroup/arrow.gif/" /> +</SPAN> +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - </DIV> - <UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 2 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 2 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </LI> - </UL> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - - </LI> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 3 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 3 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> +</UL> - </LI> - </UL> - </LI> - </UL> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -4,103 +4,67 @@ BORDER="0" STYLE="table-layout: fixed;"> <COLGROUP> <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - </COLGROUP> <THEAD> <TR CLASS="dr-table-subheader rich-table-subheader"> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Flag -</SPAN> - </SPAN> + <SPAN> Flag</SPAN> </SPAN> </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - State Name -</SPAN> - </SPAN> + <SPAN> State Name</SPAN> </SPAN> <IMG STYLE="vertical-align: middle;" SRC="/.*resources/extendedDataTable/sortable.gif/" /> - </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - State Capital -</SPAN> - </SPAN> + <SPAN> State Capital</SPAN> </SPAN> <IMG STYLE="vertical-align: middle;" SRC="/.*resources/extendedDataTable/sortable.gif/" /> - </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Time Zone -</SPAN> - </SPAN> + <SPAN> Time Zone</SPAN> </SPAN> </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TH> </TR> <TR CLASS="dr-table-subheader rich-table-subheader"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <DIV STYLE="padding: 4px;"> <INPUT TYPE="text" CLASS="extendedTable-input" /> - </DIV> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <DIV STYLE="padding: 4px;"> <INPUT TYPE="text" CLASS="extendedTable-input" /> - </DIV> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </THEAD> @@ -110,30 +74,25 @@ CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </TFOOT> @@ -143,15 +102,10 @@ <TABLE WIDTH="100%" STYLE="table-layout: fixed;"> <COLGROUP> <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL /> - </COLGROUP> <TBODY> <TR CLASS="dr-body-table-tr"> @@ -159,38 +113,19 @@ <IMG SRC="/.*ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;" /> - </TD> <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.state} -</SPAN> - </SPAN> + <SPAN> #{cap.state}</SPAN> </TD> <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.name} -</SPAN> - </SPAN> + <SPAN> #{cap.name}</SPAN> </TD> <TD SORTABLE="false" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.timeZone} -</SPAN> - </SPAN> + <SPAN> #{cap.timeZone}</SPAN> </TD> </TR> </TBODY> @@ -200,7 +135,6 @@ <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> </DIV> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -2,42 +2,26 @@ <test id="listShuttle"> <TABLE CLASS="rich-list-shuttle" STYLE=""> <TR> - <TD COLSPAN="2" CLASS="rich-shuttle-source-caption"> - source label - </TD> - <TD COLSPAN="2" CLASS="rich-shuttle-target-caption"> - target label - </TD> + <TD COLSPAN="2" CLASS="rich-shuttle-source-caption"> source label</TD> + <TD COLSPAN="2" CLASS="rich-shuttle-target-caption"> target label</TD> </TR> <TR> <TD> <DIV CLASS="rich-shuttle-list-content" STYLE="width: 234px; height: 245px;"> <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"> - <TR> + <TR CLASS=""> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name - </SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </DIV> </TH> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name - </SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </DIV> </TH> </TR> @@ -46,13 +30,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil - </SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> </TR> </TABLE> @@ -61,13 +39,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea - </SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -85,9 +57,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-copyAll"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_copy_all.gif/" /> - - Copy all + SRC="/.*resources/shuttle/arrow_copy_all.gif/"/> Copy all </DIV> </DIV> </DIV> @@ -99,9 +69,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-copy"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_copy.gif/" /> - - Copy + SRC="/.*resources/shuttle/arrow_copy.gif/"/> Copy </DIV> </DIV> </DIV> @@ -113,9 +81,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-remove"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_remove.gif/" /> - - Remove + SRC="/.*resources/shuttle/arrow_remove.gif/"/> Remove </DIV> </DIV> </DIV> @@ -127,9 +93,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-removeAll"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_remove_all.gif/" /> - - Remove All + SRC="/.*resources/shuttle/arrow_remove_all.gif/"/> Remove All </DIV> </DIV> </DIV> @@ -139,31 +103,19 @@ <TD> <DIV CLASS="rich-shuttle-list-content" STYLE="width: 278px; height: 245px;"> <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"> - <TR> + <TR CLASS=""> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name - </SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </DIV> </TH> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name - </SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </DIV> </TH> </TR> @@ -172,13 +124,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil - </SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> </TR> </TABLE> @@ -187,13 +133,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea - </SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -211,9 +151,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-top"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_first.gif/" /> - - First + SRC="/.*resources/shuttle/arrow_first.gif/"/> First </DIV> </DIV> </DIV> @@ -225,9 +163,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-up"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_up.gif/" /> - - Up + SRC="/.*resources/shuttle/arrow_up.gif/"/> Up </DIV> </DIV> </DIV> @@ -239,9 +175,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-down"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_down.gif/" /> - - Down + SRC="/.*resources/shuttle/arrow_down.gif/"/> Down </DIV> </DIV> </DIV> @@ -253,9 +187,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-bottom"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_last.gif/" /> - - Last + SRC="/.*resources/shuttle/arrow_last.gif/"/> Last </DIV> </DIV> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,45 +1,35 @@ <tests> - <test id="menuGroup"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE=""> - <DIV CLASS="dr-menu-group-top-div"> - <SPAN CLASS="rich-menu-item-icon-enabled"> - <IMG - SRC="/.*resources/menuGroup/spacer.gif/" /> + <test id="menuGroup"> - </SPAN> - <SPAN CLASS="rich-menu-item-label rich-menu-group-label"> - Group 2 +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > +<SPAN CLASS="rich-menu-item-icon-enabled" > +<IMG SRC="/.*resources/menuGroup/spacer.gif/" /> + </SPAN> - <SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" - STYLE=""> - <IMG - SRC="/.*resources/menuGroup/arrow.gif/" /> +<SPAN CLASS="rich-menu-item-label rich-menu-group-label" > +Group 2 +</SPAN> +<SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" STYLE="" > +<IMG SRC="/.*resources/menuGroup/arrow.gif/" /> +</SPAN> +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - </DIV> - <UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 2 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 2 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> - </LI> - </UL> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - </LI> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,25 +1,19 @@ <tests> - <test id="menuItem"> + <test id="menuItem"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 1 - </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</SPAN> +<SPAN CLASS="rich-menu-item-label" > +<SPAN > +Item 1 +</SPAN> +</SPAN> +</DIV> +</LI> - </LI> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="messages"> - <TABLE CELLSPACING="0" CELLPADDING="0" STYLE="border-style: dotted; color: Turquoise; text-align: center; font-size: small; font-style: italic; background-color: Orchid; font-family: Arial CE,Arial Narrow; text-decoration: line-through; font-weight: bolder;" CLASS="rich-messages infoClass"> @@ -8,90 +7,50 @@ <TD> <SPAN CLASS="rich-messages-marker"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Passed -</SPAN> - </SPAN> + <SPAN> Passed </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label"> - No Error -</SPAN> + <SPAN CLASS="rich-messages-label"> No Error </SPAN> </TD> </TR> <TR> <TD CLASS="errorClass"> <SPAN CLASS="rich-messages-marker markerError"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Error -</SPAN> - </SPAN> + <SPAN> Error </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label errorLabel"> - Error message -</SPAN> + <SPAN CLASS="rich-messages-label errorLabel"> Error message </SPAN> </TD> </TR> <TR> <TD CLASS="fatalClass"> <SPAN CLASS="rich-messages-marker markerFatal"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Fatal -</SPAN> - </SPAN> + <SPAN> Fatal </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label fatalLabel"> - Fatal message -</SPAN> + <SPAN CLASS="rich-messages-label fatalLabel"> Fatal message </SPAN> </TD> </TR> <TR> <TD CLASS="infoClass"> <SPAN CLASS="rich-messages-marker markerInfo"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Info -</SPAN> - </SPAN> + <SPAN> Info </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label infoLabel"> - Info message -</SPAN> + <SPAN CLASS="rich-messages-label infoLabel"> Info message </SPAN> </TD> </TR> <TR> <TD CLASS="warnClass"> <SPAN CLASS="rich-messages-marker markerWarn"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Warning -</SPAN> - </SPAN> + <SPAN> Warning </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label warnLabel"> - Warning message -</SPAN> + <SPAN CLASS="rich-messages-label warnLabel"> Warning message </SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="orderingList"> - <TABLE WIDTH="300" HEIGHT="200" CLASS="rich-ordering-list-body"> <TR> <TD> @@ -20,45 +19,21 @@ <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" CLASS="rich-ordering-list-table-header-cell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name -</SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </TD> <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" CLASS="rich-ordering-list-table-header-cell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name -</SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </TD> </TR> </THEAD> <TR CLASS="rich-ordering-list-row"> <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil -</SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea -</SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -67,16 +42,14 @@ <TD> <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - + <BR _MOZ_DIRTY="" TYPE="_moz"/> </TD> </TR> <TR> <TD> <DIV STYLE="overflow: scroll; width: 100%; height: 17px;"> </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - + <BR _MOZ_DIRTY="" TYPE="_moz"/> </TD> </TR> </TABLE> @@ -90,8 +63,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/top.gif/"/> - First + SRC="/.*resources/orderingList/top.gif/"/>First </DIV> </A> </DIV> @@ -102,8 +74,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/up.gif/"/> - Up + SRC="/.*resources/orderingList/up.gif/"/>Up </DIV> </A> </DIV> @@ -114,8 +85,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/down.gif/"/> - Down + SRC="/.*resources/orderingList/down.gif/"/>Down </DIV> </A> </DIV> @@ -126,8 +96,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/bottom.gif/"/> - Last + SRC="/.*resources/orderingList/bottom.gif/"/>Last </DIV> </A> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="scrollableDataTable"> - <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 500px; height: 100px;"> <TABLE CLASS="dr-table rich-sdt"> <COLGROUP SPAN="6"> @@ -9,63 +8,39 @@ <TR CLASS="dr-table-subheader dr-sdt-hr"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Make -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Make + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Model -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Model + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Price -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Price + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Mileage -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Mileage + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - VIN -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + VIN + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Stock -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Stock + </SPAN> </TD> </TR> </THEAD> @@ -77,282 +52,162 @@ </TBODY> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -2,13 +2,7 @@ <test id="toggleControl"> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - CLOSED - </SPAN> - </SPAN> + <SPAN> CLOSED </SPAN> </SPAN> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -3,13 +3,7 @@ <DIV> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - CLOSED - </SPAN> - </SPAN> + <SPAN> CLOSED </SPAN> </SPAN> </DIV> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -62,24 +62,11 @@ <TBODY> <TR VALIGN="middle"> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT CLASS="barsearch" /> - - </SPAN> - </SPAN> + <INPUT CLASS="barsearch" /> </TD> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="Search" /> - - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search" + STYLE="-moz-user-modify: read-only;" /> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -8,26 +8,16 @@ <TR> <TD STYLE="/background-image: url\(.*resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD STYLE="/background-image: url\(.*resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.name} -</SPAN> - </SPAN> + <SPAN> #{item.name}</SPAN> </TD> </TR> </TBODY> @@ -41,26 +31,16 @@ <TR> <TD STYLE="/background-image: url\(.*resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD STYLE="/background-image: url\(.*resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.title} -</SPAN> - </SPAN> + <SPAN> #{item.title}</SPAN> </TD> </TR> </TBODY> @@ -77,22 +57,13 @@ <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" RICHFACESTREENODEPARAM="iconLeaf" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.title} -</SPAN> - </SPAN> + <SPAN> #{item.title}</SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,36 +1,28 @@ <tests> <test id="treeNode"> - <DIV> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url\(.*resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - - </TD> - <TD - STYLE="/background-image: url\(.*resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - - </TD> - <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.name} - </SPAN> - </SPAN> - </TD> - </TR> - </TBODY> - </TABLE> - </DIV> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url\(.*resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + </TD> + <TD + STYLE="/background-image: url\(.*resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> #{item.name}</SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file