Author: dvinnichek Date: 2010-08-04 09:11:17 -0400 (Wed, 04 Aug 2010) New Revision: 23918 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp.xml Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/option.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/options.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobutton.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: add tests for spring:nestedPath (https://jira.jboss.org/browse/JBIDE-6711) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2010-08-04 13:11:17 UTC (rev 23918) @@ -43,23 +43,23 @@ * @return */ public static nsIDOMNode getSelectedNode(nsISelection selection) { - - if (selection.getAnchorNode() == selection.getFocusNode()) { - if (selection.getFocusNode() != null) { - if ((selection.getFocusNode().getNodeType() != nsIDOMNode.TEXT_NODE) + nsIDOMNode selectedNode = null; + nsIDOMNode focusNode = selection.getFocusNode(); + if (selection.getAnchorNode() == focusNode) { + if (focusNode != null) { + if ((focusNode.getNodeType() != nsIDOMNode.TEXT_NODE) && (selection.getFocusOffset() != 0)) { - return selection.getFocusNode().getChildNodes().item( + selectedNode = focusNode.getChildNodes().item( selection.getFocusOffset() - 1); } else - return selection.getFocusNode(); + selectedNode = selection.getFocusNode(); } } else { nsIDOMRange range = selection.getRangeAt(0); - nsIDOMNode visualAncestor = range.getCommonAncestorContainer(); - return visualAncestor; + selectedNode = range.getCommonAncestorContainer(); } - return null; + return selectedNode; } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 13:11:17 UTC (rev 23918) @@ -451,7 +451,7 @@ </vpe:tag> <vpe:tag name="spring:nestedPath" case-sensitive="yes"> - <vpe:template children="no" modify="no" /> + <vpe:template children="yes" modify="no" /> </vpe:tag> <vpe:tag name="spring:transform" case-sensitive="yes"> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,6 +1,6 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -0,0 +1,47 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<html> +<head> +<style> +.redText { + -moz-appearance: none; + color: red; + font: bold; +} +</style> +</head> +<body> +<h1>Test of spring:nestedPath</h1> + +<form:form modelAttribute="formBean"> + <div id="userNestedPath"> + <spring:nestedPath path="user"> + <table> + <tr> + <td>First Name:</td> + <td><form:input path="firstName" /></td> + <td> + <form:errors id="firstNameErrors" + path="firstName" + cssClass="redText" /> + </td> + </tr> + <tr> + <td>Last Name:</td> + <td><form:input path="lastName" /></td> + <td> + <form:errors id="lastNameErrors" + path="lastName" + cssClass="redText" /> + </td> + </tr> + <tr> + <td colspan="2" align="right"><input type="submit" value="Test" /></td> + </tr> + </table> + </spring:nestedPath> + </div> +</form:form> +</body> +</html> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp.xml 2010-08-04 13:11:17 UTC (rev 23918) @@ -0,0 +1,45 @@ +<tests> + <test id="userNestedPath"> + <DIV ID="userNestedPath"> + <TABLE> + <TR> + <TD> + <SPAN CLASS="vpe-text"> + First Name: + </SPAN> + </TD> + <TD> + <INPUT TYPE="text" VALUE="firstName" /> + + </TD> + <TD> + <SPAN CLASS="redText" ID="firstNameErrors"> + Errors for firstName field. + </SPAN> + </TD> + </TR> + <TR> + <TD> + <SPAN CLASS="vpe-text"> + Last Name: + </SPAN> + </TD> + <TD> + <INPUT TYPE="text" VALUE="lastName" /> + + </TD> + <TD> + <SPAN CLASS="redText" ID="lastNameErrors"> + Errors for lastName field. + </SPAN> + </TD> + </TR> + <TR> + <TD ALIGN="right" COLSPAN="2"> + <INPUT TYPE="submit" VALUE="Test" /> + </TD> + </TR> + </TABLE> + </DIV> + </test> +</tests> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/nestedPath.jsp.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/option.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/option.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/option.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/options.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/options.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/options.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobutton.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobutton.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobutton.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -1,5 +1,5 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <html> <head> <style> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 13:11:17 UTC (rev 23918) @@ -23,6 +23,9 @@ <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> <property name="validator" ref="beanValidator"/> </bean> + <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 13:11:17 UTC (rev 23918) @@ -20,4 +20,6 @@ <br/> <a href="select.htm">select.htm</a> <br/> +<a href="nestedPath.htm">nestedPath.htm</a> +<br/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 13:08:15 UTC (rev 23917) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 13:11:17 UTC (rev 23918) @@ -64,6 +64,10 @@ public void testBind() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/bind.jsp"); //$NON-NLS-1$ } + + public void testNestedPath() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/nestedPath.jsp"); //$NON-NLS-1$ + } public void testSelect() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/select.jsp"); //$NON-NLS-1$