Author: dmaliarevich Date: 2009-01-13 04:42:19 -0500 (Tue, 13 Jan 2009) New Revision: 13008 Added: 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/templates/vpe-templates-jsf.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/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 Log: https://jira.jboss.org/jira/browse/JBIDE-3512, templates updated, junit tests updated. Added: 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 (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java 2009-01-13 09:42:19 UTC (rev 13008) @@ -0,0 +1,80 @@ +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; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: 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 (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java 2009-01-13 09:42:19 UTC (rev 13008) @@ -0,0 +1,17 @@ +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; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native 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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2009-01-13 09:42:19 UTC (rev 13008) @@ -16,8 +16,10 @@ 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; @@ -25,6 +27,7 @@ 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 { @@ -32,16 +35,22 @@ nsIDOMDocument visualDocument) { Element sourceElement = (Element) sourceNode; - - nsIDOMElement textArea = visualDocument - .createElement(HTML.TAG_TEXTAREA); + /* + * 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); // Commented as fix for JBIDE-3012. // ((nsIDOMHTMLTextAreaElement) textArea // .queryInterface(nsIDOMHTMLTextAreaElement.NS_IDOMHTMLTEXTAREAELEMENT_IID)) // .setReadOnly(true); - VpeCreationData creationData = new VpeCreationData(textArea); + VpeCreationData creationData = new VpeCreationData(contentSpan); copyGeneralJsfAttributes(sourceElement, textArea); ComponentUtil.copyDisabled(sourceElement, textArea); @@ -68,7 +77,17 @@ } 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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2009-01-13 09:42:19 UTC (rev 13008) @@ -11,30 +11,49 @@ 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; + } - Element sourceElement = (Element) sourceNode; - + 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); nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); - VpeCreationData creationData = new VpeCreationData(input); - + VpeCreationData creationData = new VpeCreationData(contentSpan); + copyGeneralJsfAttributes(sourceElement, input); ComponentUtil.copyDisabled(sourceElement, input); @@ -42,24 +61,34 @@ 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 @@ -73,4 +102,5 @@ 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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-01-13 09:42:19 UTC (rev 13008) @@ -31,7 +31,7 @@ </vpe:tag> <vpe:tag name="h:inputText" case-sensitive="yes"> - <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextTemplate"> + <vpe:template children="yes" 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="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate"> + <vpe:template children="yes" 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="no" modify="no"> - <input type="password" value="{jsfvalue(@value)}" + <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputSecretTemplate"> + <!-- <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,13 +180,26 @@ <!-- Проблема с адресацией от приложения (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">z + <vpe:template children="no" modify="no"> <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}" @@ -233,9 +246,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))}" @@ -280,7 +293,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.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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp 2009-01-13 09:42:19 UTC (rev 13008) @@ -21,6 +21,10 @@ <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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2009-01-13 09:42:19 UTC (rev 13008) @@ -1,17 +1,74 @@ <tests> <test id="commandButton1"> - <input type="button" value="commandButton"/> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="button" VALUE="commandButton" /> + </SPAN> + <SPAN CLASS="vpe-text"> + </SPAN> + </SPAN> </test> <test id="commandButton2"> - <input type="button" value="commandButton1" /> + + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="button" VALUE="commandButton1" /> + </SPAN> + <SPAN CLASS="vpe-text"> + </SPAN> + </SPAN> </test> <test id="commandButton3"> - <input type="reset" value="commandButton3" /> + + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="button" VALUE="commandButton3" /> + </SPAN> + <SPAN CLASS="vpe-text"> + </SPAN> + </SPAN> </test> <test id="commandButton4"> - <input type="submit" value="commandButton4" /> + + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="button" VALUE="commandButton4" /> + </SPAN> + <SPAN CLASS="vpe-text"> + </SPAN> + </SPAN> </test> <test id="commandButton5"> - <input type="image" SRC="/.*ve/unresolved_image.gif/" /> + + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="button" VALUE="commandButton5" /> + </SPAN> + <SPAN CLASS="vpe-text"> + </SPAN> + </SPAN> </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/inputSecret.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-13 09:42:19 UTC (rev 13008) @@ -9,8 +9,10 @@ <f:view> <h1><h:outputText value="inputSecret" /></h1> - <h:inputSecret value="inputSecret" id="inputSecret"/> + <h:inputSecret value="inputSecret" id="inputSecret1"/> + <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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml 2009-01-13 09:42:19 UTC (rev 13008) @@ -1,5 +1,24 @@ <tests> - <test id="inputSecret"> - <input type="password" /> + <test id="inputSecret1"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + <INPUT TYPE="password" VALUE="inputSecret" /> + </SPAN> + </SPAN> </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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp 2009-01-13 09:42:19 UTC (rev 13008) @@ -9,8 +9,9 @@ <f:view> <h1><h:outputText value="inputText" /></h1> - <h:inputText id="inputText" value="inputText"/> + <h:inputText id="inputText1" 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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml 2009-01-13 09:42:19 UTC (rev 13008) @@ -1,5 +1,23 @@ <tests> - <test id="inputText"> - <input /> + <test id="inputText1"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + <INPUT VALUE="inputText" /> + </SPAN> + </SPAN> </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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2009-01-13 09:42:19 UTC (rev 13008) @@ -9,8 +9,10 @@ <f:view> <h1><h:outputText value="inputTextArea" /></h1> - <h:inputTextarea value="inputTextArea" id="inputTextArea" /> + <h:inputTextarea value="inputTextArea" id="inputTextArea1" /> + <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-13 06:03:34 UTC (rev 13007) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2009-01-13 09:42:19 UTC (rev 13008) @@ -1,5 +1,27 @@ <tests> - <test id="inputTextArea"> - <TEXTAREA> inputTextArea </TEXTAREA> + <test id="inputTextArea1"> + <SPAN CLASS="vpe-text"> + <SPAN CLASS="vpe-text"> + </SPAN> + <SPAN CLASS="vpe-text"> + <TEXTAREA> + inputTextArea + </TEXTAREA> + </SPAN> + </SPAN> </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