Modified: struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl Sat Aug 19 15:03:04 2006 @@ -16,7 +16,7 @@ <#if parameters.timeIconPath?exists> iconPath="${parameters.timeIconPath}" <#else> - iconPath="<@saf.url includeParams='none' value='/struts/dojo/struts/widgets/timeIcon.gif' encode='false' includeParams="none" />" + iconPath="<@s.url includeParams='none' value='/struts/dojo/struts/widgets/timeIcon.gif' encode='false' includeParams="none" />" </#if> <#if parameters.templatePath?exists> templatePath="${parameters.templatePath}"
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl Sat Aug 19 15:03:04 2006 @@ -1,5 +1,5 @@ <#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/> - <script language="javascript" src="<@saf.url value="/struts/optiontransferselect.js" encode='false' />"></script> + <script language="javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' />"></script> <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> </#if><#t/> <table> Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl Sat Aug 19 15:03:04 2006 @@ -66,7 +66,7 @@ </#if> :<#t/> <#if parameters.tooltip?exists> - <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" /> + <img src='<@s.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" /> </#if> </label><#t/> </#if> @@ -76,7 +76,7 @@ <span class="required">*</span><#t/> </#if> <#if parameters.tooltip?exists> - <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" /> + <img src='<@s.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" /> </#if> </#if> </td> Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl Sat Aug 19 15:03:04 2006 @@ -1,2 +1,2 @@ -<link rel="stylesheet" href="<@saf.url value='/struts/xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/> +<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/> <#include "/${parameters.templateDir}/simple/head.ftl" /> Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl Sat Aug 19 15:03:04 2006 @@ -2,9 +2,9 @@ <#assign tooltipHashCode=parameters.tooltip.hashCode() /> <img id="_tt${tooltipHashCode?string('#')}" <#if parameters.tooltipIcon?exists><#t/> - src='<@saf.url value="${parameters.tooltipIcon}" />' + src='<@s.url value="${parameters.tooltipIcon}" />' <#else><#t/> - src='<@saf.url value="/struts/dojo/struts/tooltip.gif" />' + src='<@s.url value="/struts/dojo/struts/tooltip.gif" />' </#if><#t/> alt="${parameters.tooltip?html}" title="${parameters.tooltip?html}" /> Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java Sat Aug 19 15:03:04 2006 @@ -378,8 +378,8 @@ } public void testGetUriFromActionMapper12() throws Exception { - String old = org.apache.struts2.config.Settings.get(StrutsConstants.STRUTS_COMPATIBILITY_MODE); - org.apache.struts2.config.Settings.set(StrutsConstants.STRUTS_COMPATIBILITY_MODE, "true"); + String old = org.apache.struts2.config.Settings.get(StrutsConstants.STRUTS_COMPATIBILITY_MODE_WEBWORK); + org.apache.struts2.config.Settings.set(StrutsConstants.STRUTS_COMPATIBILITY_MODE_WEBWORK, "true"); try { DefaultActionMapper mapper = new DefaultActionMapper(); ActionMapping actionMapping = new ActionMapping(); @@ -390,7 +390,7 @@ assertEquals("/myActionName.action", uri); } finally { - org.apache.struts2.config.Settings.set(StrutsConstants.STRUTS_COMPATIBILITY_MODE, old); + org.apache.struts2.config.Settings.set(StrutsConstants.STRUTS_COMPATIBILITY_MODE_WEBWORK, old); } } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java Sat Aug 19 15:03:04 2006 @@ -93,7 +93,7 @@ // create the mock http servlet request StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest(); - // NOTE: in WW Tag library, TagUtil gets stack from request, which will be set + // NOTE: in Struts Tag library, TagUtil gets stack from request, which will be set // when request going through the FilterDispatcher --> DispatcherUtil etc. route request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Sat Aug 19 15:03:04 2006 @@ -62,7 +62,7 @@ public void testDefaultMessageOk() throws Exception { // NOTE: // simulate the condition - // <saf:text name="some.invalid.key">My Default Message</saf:text> + // <s:text name="some.invalid.key">My Default Message</s:text> StrutsMockBodyContent mockBodyContent = new StrutsMockBodyContent(new MockJspWriter()); mockBodyContent.setString("Sample Of Default Message"); Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl Sat Aug 19 15:03:04 2006 @@ -4,9 +4,9 @@ </head> <body> -<@ww.form action="guess" method="post"> - <@ww.textfield label="Guess a number" name="guess"/> - <@ww.submit value="Guess"/> -</@ww.form> +<@s.form action="guess" method="post"> + <@s.textfield label="Guess a number" name="guess"/> + <@s.submit value="Guess"/> +</@s.form> </body> </html> Modified: struts/struts2/trunk/docs/tags/GenericUIBean.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/docs/tags/GenericUIBean.html?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/docs/tags/GenericUIBean.html (original) +++ struts/struts2/trunk/docs/tags/GenericUIBean.html Sat Aug 19 15:03:04 2006 @@ -16,7 +16,7 @@ </p> <p> -<!-- START SNIPPET: javadoc --> Renders an custom UI widget using the specified templates. Additional objects can be passed in to the template using the param tags.<p/> <b>Freemarker:</b><p/> Objects provided can be retrieve from within the template via $parameters._paramname_.<p/> <b>Jsp:</b><p/> Objects provided can be retrieve from within the template via <saf:property value="%{parameters._paramname_}" /><p/> In the bottom JSP and Velocity samples, two parameters are being passed in to the component. From within the component, they can be accessed as:- <p/> <b>Freemarker:</b><p/> $parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and $parameters.key2<p/> <b>Jsp:</b><p/> <saf:property value="%{parameters.key1}" /> and <saf:property value="%{'parameters.key2'}" /> or <saf:property value="%{parameters.get('key1')}" /> and <saf:property value="%{parameters.get('key2')}" /><p/> Currently, your custom UI components can be writt en in Velocity, JSP, or Freemarker, and the correct rendering engine will be found based on file extension.<p/> <b>Remember:</b> the value params will always be resolved against the OgnlValueStack so if you mean to pass a string literal to your component, make sure to wrap it in quotes i.e. value="'value1'" otherwise, the the value stack will search for an Object on the stack with a method of getValue1(). (now that i've written this, i'm not entirely sure this is the case. i should verify this manana)<p/> <!-- END SNIPPET: javadoc --> <p/> <b>Examples</b> <pre> <!-- START SNIPPET: example --> JSP <a:component template="/my/custom/component.vm"/> or <a:component template="/my/custom/component.vm"> <a:param name="key1" value="value1"/> <a:param name="key2" value="value2"/> </a:component> Velocity #safcomponent( "template=/my/custom/component.vm" ) or #safcomponent( "template=/my/custom/component.vm" ) #safparam( "name=key1" "value=value1" ) #safpa ram( "name=key2" "value=value2" ) #end Freemarker <@saf.component template="/my/custom/component.ftl" /> or <@saf.component template="/my/custom/component.ftl"> <@saf.param name="key1" value="%{'value1'}" /> <@saf.param name="key2" value="%{'value2'}" /> </@saf.component> <!-- END SNIPPET: example --> </pre> <p/> <b>NOTE:</b> <!-- START SNIPPET: note --> If Jsp is used as the template, the jsp template itself must lie within the webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP template could not be picked up from the classpath. <!-- END SNIPPET: note --> +<!-- START SNIPPET: javadoc --> Renders an custom UI widget using the specified templates. Additional objects can be passed in to the template using the param tags.<p/> <b>Freemarker:</b><p/> Objects provided can be retrieve from within the template via $parameters._paramname_.<p/> <b>Jsp:</b><p/> Objects provided can be retrieve from within the template via <s:property value="%{parameters._paramname_}" /><p/> In the bottom JSP and Velocity samples, two parameters are being passed in to the component. From within the component, they can be accessed as:- <p/> <b>Freemarker:</b><p/> $parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and $parameters.key2<p/> <b>Jsp:</b><p/> <s:property value="%{parameters.key1}" /> and <s:property value="%{'parameters.key2'}" /> or <s:property value="%{parameters.get('key1')}" /> and <s:property value="%{parameters.get('key2')}" /><p/> Currently, your custom UI components can be written in Velo city, JSP, or Freemarker, and the correct rendering engine will be found based on file extension.<p/> <b>Remember:</b> the value params will always be resolved against the OgnlValueStack so if you mean to pass a string literal to your component, make sure to wrap it in quotes i.e. value="'value1'" otherwise, the the value stack will search for an Object on the stack with a method of getValue1(). (now that i've written this, i'm not entirely sure this is the case. i should verify this manana)<p/> <!-- END SNIPPET: javadoc --> <p/> <b>Examples</b> <pre> <!-- START SNIPPET: example --> JSP <a:component template="/my/custom/component.vm"/> or <a:component template="/my/custom/component.vm"> <a:param name="key1" value="value1"/> <a:param name="key2" value="value2"/> </a:component> Velocity #s-component( "template=/my/custom/component.vm" ) or #s-component( "template=/my/custom/component.vm" ) #s-param( "name=key1" "value=value1" ) #s-param( "name=key 2" "value=value2" ) #end Freemarker <@s.component template="/my/custom/component.ftl" /> or <@s.component template="/my/custom/component.ftl"> <@s.param name="key1" value="%{'value1'}" /> <@s.param name="key2" value="%{'value2'}" /> </@s.component> <!-- END SNIPPET: example --> </pre> <p/> <b>NOTE:</b> <!-- START SNIPPET: note --> If Jsp is used as the template, the jsp template itself must lie within the webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP template could not be picked up from the classpath. <!-- END SNIPPET: note --> </p> <h2>Attributes</h2> Modified: struts/struts2/trunk/docs/tags/IteratorComponent.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/docs/tags/IteratorComponent.html?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/docs/tags/IteratorComponent.html (original) +++ struts/struts2/trunk/docs/tags/IteratorComponent.html Sat Aug 19 15:03:04 2006 @@ -16,7 +16,7 @@ </p> <p> -<!-- START SNIPPET: javadoc --> <p>Iterator will iterate over a value. An iterable value can be either of: java.util.Collection, java.util.Iterator, java.util.Enumeration, java.util.Map, array.</p> <p/> <!-- END SNIPPET: javadoc --> <!-- START SNIPPET: params --> <ul> <li>status (String) - if specified, an instanceof IteratorStatus will be pushed into stack upon each iteration</li> <li>value (Object) - the source to iterate over, must be iteratable, else an the object itself will be put into a newly created List (see MakeIterator#convert(Object)</li> <li>id (String) - if specified the current iteration object will be place with this id in Struts stack's context scope</li> </ul> <!-- END SNIPPET: params --> <!-- START SNIPPET: example1description --> <p>The following example retrieves the value of the getDays() method of the current object on the value stack and uses it to iterate over. The <a:property/> tag prints out the current value of the iterator.</p> <!-- END SNI PPET: example1description --> <pre> <!-- START SNIPPET: example1code --> <a:iterator value="days"> <p>day is: <a:property/></p> </a:iterator> <!-- END SNIPPET: example1code --> </pre> <!-- START SNIPPET: example2description --> <p>The following example uses a [EMAIL PROTECTED] Bean} tag and places it into the ActionContext. The iterator tag will retrieve that object from the ActionContext and then calls its getDays() method as above. The status attribute is also used to create a [EMAIL PROTECTED] IteratorStatus} object, which in this example, its odd() method is used to alternate row colours:</p> <!-- END SNIPPET: example2description --> <pre> <!-- START SNIPPET: example2code --> <a:bean name="org.apache.struts2.example.IteratorExample" id="it"> <a:param name="day" value="'foo'"/> <a:param name="day" value="'bar'"/> </a:bean> <p/> <table border="0" cellspacing="0" cellpadding="1"> <tr> <th>Days of the week</th> </tr& gt; <p/> <a:iterator value="#it.days" status="rowstatus"> <tr> <a:if test="#rowstatus.odd == true"> <td style="background: grey"><a:property/></td> </a:if> <a:else> <td><a:property/></td> </a:else> </tr> </a:iterator> </table> <!-- END SNIPPET: example2code --> </pre> <!--START SNIPPET: example3description --> <p> The next example will further demonstrate the use of the status attribute, using a DAO obtained from the action class through OGNL, iterating over groups and their users (in a security context). The last() method indicates if the current object is the last available in the iteration, and if not, we need to seperate the users using a comma: </p> <!-- END SNIPPET: example3description --> <pre> <!-- START SNIPPET: example3code --> <saf:iterator value="groupDao.groups" status="groupStatus"> <tr class="<saf:if test="#groupStatus.odd == true ">odd</saf:if><sa f:else>even</saf:else>"> <td><saf:property value="name" /></td> <td><saf:property value="description" /></td> <td> <saf:iterator value="users" status="userStatus"> <saf:property value="fullName" /><saf:if test="!#userStatus.last">,</saf:if> </saf:iterator> </td> </tr> </saf:iterator> <!-- END SNIPPET: example3code --> </pre> <p> <!-- START SNIPPET: example4description --> </p> The next example iterates over a an action collection and passes every iterator value to another action. The trick here lies in the use of the '[0]' operator. It takes the current iterator value and passes it on to the edit action. Using the '[0]' operator has the same effect as using >a:property />. (The latter, however, does not work from inside the param tag). </p> <!-- END SNIPPET: example4description --> <pre> <!-- START SNIPPET: example4code --> <a:action name="entries" id="entries"/> <a:iterator value="#entries.entries" > <a:property value="name" /> <a:property /> <a:push value="..."> <a:action name="edit" id="edit" > <a:param name="entry" value="[0]" /> </a:action> </push> </a:iterator> <!-- END SNIPPET: example4code --> </pre> <!-- START SNIPPET: example5description --> </p>To simulate a simple loop with iterator tag, the following could be done. It does the loop 5 times. <!-- END SNIPPET: example5description --> <pre> <!-- START SNIPPET: example5code --> <a:iterator status="stat" value="{1,2,3,4,5}" > <!-- grab the index (start with 0 ... ) --> <a:property value="#stat.index" /> <!-- grab the top of the stack which should be the --> <!-- current iteration value (0, 1, ... 5) --> <a:property value="top" /> </a:iterator> <!-- END SNIPPET: example5code --> </pre> +<!-- START SNIPPET: javadoc --> <p>Iterator will iterate over a value. An iterable value can be either of: java.util.Collection, java.util.Iterator, java.util.Enumeration, java.util.Map, array.</p> <p/> <!-- END SNIPPET: javadoc --> <!-- START SNIPPET: params --> <ul> <li>status (String) - if specified, an instanceof IteratorStatus will be pushed into stack upon each iteration</li> <li>value (Object) - the source to iterate over, must be iteratable, else an the object itself will be put into a newly created List (see MakeIterator#convert(Object)</li> <li>id (String) - if specified the current iteration object will be place with this id in Struts stack's context scope</li> </ul> <!-- END SNIPPET: params --> <!-- START SNIPPET: example1description --> <p>The following example retrieves the value of the getDays() method of the current object on the value stack and uses it to iterate over. The <a:property/> tag prints out the current value of the iterator.</p> <!-- END SNI PPET: example1description --> <pre> <!-- START SNIPPET: example1code --> <a:iterator value="days"> <p>day is: <a:property/></p> </a:iterator> <!-- END SNIPPET: example1code --> </pre> <!-- START SNIPPET: example2description --> <p>The following example uses a [EMAIL PROTECTED] Bean} tag and places it into the ActionContext. The iterator tag will retrieve that object from the ActionContext and then calls its getDays() method as above. The status attribute is also used to create a [EMAIL PROTECTED] IteratorStatus} object, which in this example, its odd() method is used to alternate row colours:</p> <!-- END SNIPPET: example2description --> <pre> <!-- START SNIPPET: example2code --> <a:bean name="org.apache.struts2.example.IteratorExample" id="it"> <a:param name="day" value="'foo'"/> <a:param name="day" value="'bar'"/> </a:bean> <p/> <table border="0" cellspacing="0" cellpadding="1"> <tr> <th>Days of the week</th> </tr& gt; <p/> <a:iterator value="#it.days" status="rowstatus"> <tr> <a:if test="#rowstatus.odd == true"> <td style="background: grey"><a:property/></td> </a:if> <a:else> <td><a:property/></td> </a:else> </tr> </a:iterator> </table> <!-- END SNIPPET: example2code --> </pre> <!--START SNIPPET: example3description --> <p> The next example will further demonstrate the use of the status attribute, using a DAO obtained from the action class through OGNL, iterating over groups and their users (in a security context). The last() method indicates if the current object is the last available in the iteration, and if not, we need to seperate the users using a comma: </p> <!-- END SNIPPET: example3description --> <pre> <!-- START SNIPPET: example3code --> <s:iterator value="groupDao.groups" status="groupStatus"> <tr class="<s:if test="#groupStatus.odd == true ">odd</s:if><s:else&g t;even</s:else>"> <td><s:property value="name" /></td> <td><s:property value="description" /></td> <td> <s:iterator value="users" status="userStatus"> <s:property value="fullName" /><s:if test="!#userStatus.last">,</s:if> </s:iterator> </td> </tr> </s:iterator> <!-- END SNIPPET: example3code --> </pre> <p> <!-- START SNIPPET: example4description --> </p> The next example iterates over a an action collection and passes every iterator value to another action. The trick here lies in the use of the '[0]' operator. It takes the current iterator value and passes it on to the edit action. Using the '[0]' operator has the same effect as using >a:property />. (The latter, however, does not work from inside the param tag). </p> <!-- END SNIPPET: example4description --> <pre> <!-- START SNIPPET: example4code --> <a:action name="entries" id="entries"/> <a:iterator value="#en tries.entries" > <a:property value="name" /> <a:property /> <a:push value="..."> <a:action name="edit" id="edit" > <a:param name="entry" value="[0]" /> </a:action> </push> </a:iterator> <!-- END SNIPPET: example4code --> </pre> <!-- START SNIPPET: example5description --> </p>To simulate a simple loop with iterator tag, the following could be done. It does the loop 5 times. <!-- END SNIPPET: example5description --> <pre> <!-- START SNIPPET: example5code --> <a:iterator status="stat" value="{1,2,3,4,5}" > <!-- grab the index (start with 0 ... ) --> <a:property value="#stat.index" /> <!-- grab the top of the stack which should be the --> <!-- current iteration value (0, 1, ... 5) --> <a:property value="top" /> </a:iterator> <!-- END SNIPPET: example5code --> </pre> </p> <h2>Attributes</h2> Modified: struts/struts2/trunk/docs/tags/Tree.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/docs/tags/Tree.html?rev=432886&r1=432885&r2=432886&view=diff ============================================================================== --- struts/struts2/trunk/docs/tags/Tree.html (original) +++ struts/struts2/trunk/docs/tags/Tree.html Sat Aug 19 15:03:04 2006 @@ -16,7 +16,7 @@ </p> <p> -<!-- START SNIPPET: javadoc --> Renders a tree widget with AJAX support.<p/> The id attribute is normally specified, such that it could be looked up using javascript if necessary.<p/> <!-- END SNIPPET: javadoc --> <p/> <b>Examples</b> <pre> <!-- START SNIPPET: example --> <-- statically --> <saf:tree id="..." label="..."> <saf:treenode id="..." label="..." /> <saf:treenode id="..." label="..."> <saf:treenode id="..." label="..." /> <saf:treenode id="..." label="..." /> &;lt;/saf:treenode> <saf:treenode id="..." label="..." /> </saf:tree> <-- dynamically --> <saf:tree id="..." rootNode="..." nodeIdProperty="..." nodeTitleProperty="..." childCollectionProperty="..." /> <!-- END SNIPPET: example --> </pre> +<!-- START SNIPPET: javadoc --> Renders a tree widget with AJAX support.<p/> The id attribute is normally specified, such that it could be looked up using javascript if necessary.<p/> <!-- END SNIPPET: javadoc --> <p/> <b>Examples</b> <pre> <!-- START SNIPPET: example --> <-- statically --> <s:tree id="..." label="..."> <s:treenode id="..." label="..." /> <s:treenode id="..." label="..."> <s:treenode id="..." label="..." /> <s:treenode id="..." label="..." /> </s:treenode> <s:treenode id="..." label="..." /> </s:tree> <-- dynamically --> <s:tree id="..." rootNode="..." nodeIdProperty="..." nodeTitleProperty="..." childCollectionProperty="..." /> <!-- END SNIPPET: example --> </pre> </p> <h2>Attributes</h2>
