You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/08/20 01:10:13 UTC
svn commit: r432893 [1/2] - in
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components: ./
table/
Author: husted
Date: Sat Aug 19 16:10:09 2006
New Revision: 432893
URL: http://svn.apache.org/viewvc?rev=432893&view=rev
Log:
=WW-1340 Update Javadocs, constants, and such
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Panel.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java Sat Aug 19 16:10:09 2006
@@ -92,20 +92,20 @@
* <!-- START SNIPPET: example -->
* <div>The following action tag will execute result and include it in this page</div>
* <br />
- * <a:action name="actionTagAction" executeResult="true" />
+ * <s:action name="actionTagAction" executeResult="true" />
* <br />
* <div>The following action tag will do the same as above, but invokes method specialMethod in action</div>
* <br />
- * <a:action name="actionTagAction!specialMethod" executeResult="true" />
+ * <s:action name="actionTagAction!specialMethod" executeResult="true" />
* <br />
* <div>The following action tag will not execute result, but put a String in request scope
* under an id "stringByAction" which will be retrieved using property tag</div>
- * <a:action name="actionTagAction!default" executeResult="false" />
- * <a:property value="#attr.stringByAction" />
+ * <s:action name="actionTagAction!default" executeResult="false" />
+ * <s:property value="#attr.stringByAction" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ActionTag"
+ * @s.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ActionTag"
* description="Execute an action from within a view"
*/
public class ActionComponent extends Component {
@@ -252,7 +252,7 @@
/**
* the id (if speficied) to put the action under stack's context.
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setId(String id) {
super.setId(id);
@@ -260,7 +260,7 @@
/**
* name of the action to be executed (without the extension suffix eg. .action)
- * @a2.tagattribute required="true" type="String"
+ * @s.tagattribute required="true" type="String"
*/
public void setName(String name) {
this.name = name;
@@ -268,7 +268,7 @@
/**
* namespace for action to call
- * @a2.tagattribute required="false" type="String" default="namespace from where tag is used"
+ * @s.tagattribute required="false" type="String" default="namespace from where tag is used"
*/
public void setNamespace(String namespace) {
this.namespace = namespace;
@@ -276,7 +276,7 @@
/**
* whether the result of this action (probably a view) should be executed/rendered
- * @a2.tagattribute required="false" type="Boolean" default="false"
+ * @s.tagattribute required="false" type="Boolean" default="false"
*/
public void setExecuteResult(boolean executeResult) {
this.executeResult = executeResult;
@@ -284,7 +284,7 @@
/**
* whether the request parameters are to be included when the action is invoked
- * @a2.tagattribute required="false" type="Boolean" default="false"
+ * @s.tagattribute required="false" type="Boolean" default="false"
*/
public void setIgnoreContextParams(boolean ignoreContextParams) {
this.ignoreContextParams = ignoreContextParams;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java Sat Aug 19 16:10:09 2006
@@ -35,15 +35,15 @@
* <pre>
* <!-- START SNIPPET: example -->
*
- * <a:actionerror />
- * <a:form .... >>
+ * <s:actionerror />
+ * <s:form .... >>
* ....
- * </a:form>
+ * </s:form>
*
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionErrorTag"
+ * @s.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionErrorTag"
* description="Render action errors if they exists"
*/
public class ActionError extends UIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java Sat Aug 19 16:10:09 2006
@@ -34,14 +34,14 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:actionmessage />
- * <a:form .... >
+ * <s:actionmessage />
+ * <s:form .... >
* ....
- * </a:form>
+ * </s:form>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionMessageTag"
+ * @s.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionMessageTag"
* description="Render action messages if they exists"
*/
public class ActionMessage extends UIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java Sat Aug 19 16:10:09 2006
@@ -35,10 +35,10 @@
*
* <pre>
* <!-- START SNIPPET: example1 -->
- * <a:a id="link1" theme="ajax" href="/DoIt.action" errorText="An error ocurred" showErrorTransportText="true">
+ * <s:a id="link1" theme="ajax" href="/DoIt.action" errorText="An error ocurred" showErrorTransportText="true">
* <img border="none" src="<%=request.getContextPath()%>/images/delete.gif"/>
- * <a:param name="id" value="1"/>
- * </a:a>
+ * <s:param name="id" value="1"/>
+ * </s:a>
* <!-- END SNIPPET: example1 -->
* </pre>
*
@@ -71,13 +71,13 @@
*
* <pre>
* <!-- START SNIPPET: example3 -->
- * <a:a id="test" theme="ajax" href="/simpeResult.action" preInvokeJS="confirm(\'You sure\')">
+ * <s:a id="test" theme="ajax" href="/simpeResult.action" preInvokeJS="confirm(\'You sure\')">
* A
- * </a:a>
+ * </s:a>
* <!-- END SNIPPET: example3 -->
* </pre>
*
- * @a2.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.AnchorTag"
+ * @s.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.AnchorTag"
* description="Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest"
*
*/
@@ -115,7 +115,7 @@
/**
* The id to assign the component
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setId(String id) {
super.setId(id);
@@ -123,7 +123,7 @@
/**
* Topic names to post an event to after the remote call has been made
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setNotifyTopics(String notifyTopics) {
this.notifyTopics = notifyTopics;
@@ -131,7 +131,7 @@
/**
* A javascript snippet that will be invoked prior to the execution of the target href. If provided must return true or false. True indicates to continue executing target, false says do not execute link target. Possible uses are for confirm dialogs.
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setPreInvokeJS(String preInvokeJS) {
this.preInvokeJS = preInvokeJS;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java Sat Aug 19 16:10:09 2006
@@ -95,21 +95,21 @@
* <!-- END SNIPPET: code -->
*
* <!-- START SNIPPET: example -->
- * <a:append id="myAppendIterator">
- * <a:param value="%{myList1}" />
- * <a:param value="%{myList2}" />
- * <a:param value="%{myList3}" />
- * </a:append>
- * <a:iterator value="%{#myAppendIterator}">
- * <a:property />
- * </a:iterator>
+ * <s:append id="myAppendIterator">
+ * <s:param value="%{myList1}" />
+ * <s:param value="%{myList2}" />
+ * <s:param value="%{myList3}" />
+ * </s:append>
+ * <s:iterator value="%{#myAppendIterator}">
+ * <s:property />
+ * </s:iterator>
* <!-- END SNIPPET: example -->
*
*
* @see org.apache.struts2.util.AppendIteratorFilter
* @see org.apache.struts2.views.jsp.iterator.AppendIteratorTag
*
- * @a2.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.AppendIteratorTag"
+ * @s.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.AppendIteratorTag"
* description="Append the values of a list of iterators to one iterator"
*/
public class AppendIterator extends Component implements UnnamedParametric {
@@ -160,7 +160,7 @@
/**
* the id of which if supplied will have the resultant appended iterator stored under in the stack's context
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setId(String id) {
super.setId(id);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java Sat Aug 19 16:10:09 2006
@@ -51,15 +51,15 @@
* <!-- START SNIPPET: examples -->
* <-- in freemarker form -->
* [@s.bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter"]
- * [a:param name="foo" value="BAR"/]
- * The value of foo is : [a:property value="foo"/], when inside the bean tag.<br />
- * [/a:bean]
+ * [s:param name="foo" value="BAR"/]
+ * The value of foo is : [s:property value="foo"/], when inside the bean tag.<br />
+ * [/s:bean]
*
* <-- in jsp form -->
- * <a:bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter">
- * <a:param name="foo" value="BAR" />
- * The value of foot is : <a:property value="foo"/>, when inside the bean tag <br />
- * </a:bean>
+ * <s:bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter">
+ * <s:param name="foo" value="BAR" />
+ * The value of foot is : <s:property value="foo"/>, when inside the bean tag <br />
+ * </s:bean>
* <!-- END SNIPPET: examples -->
* </pre>
* <p/>
@@ -74,10 +74,10 @@
* <p/>
* <pre>
* <-- jsp form -->
- * <a:property value="#counter" />
+ * <s:property value="#counter" />
*
* <-- freemarker form -->
- * [a:property value="#counter.foo"/]
+ * [s:property value="#counter.foo"/]
* </pre>
* <p/>
* <p>In the property tag example, the <i>#</i> tells Ognl to search the context for the SimpleCounter class which has
@@ -86,7 +86,7 @@
*
* @see Param
*
- * @a2.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.BeanTag"
+ * @s.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.BeanTag"
* description="Instantiate a JavaBean and place it in the context."
*/
public class Bean extends Component {
@@ -137,7 +137,7 @@
/**
* the class name of the bean to be instantiated (must respect JavaBean specification)
- * @a2.tagattribute required="true" type="String"
+ * @s.tagattribute required="true" type="String"
*/
public void setName(String name) {
this.name = name;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java Sat Aug 19 16:10:09 2006
@@ -32,7 +32,7 @@
* <pre>
* <!-- START SNIPPET: example -->
* JSP:
- * <a:checkbox label="checkbox test" name="checkboxField1" value="aBoolean" fieldValue="true"/>
+ * <s:checkbox label="checkbox test" name="checkboxField1" value="aBoolean" fieldValue="true"/>
*
* Velocity:
* #tag( Checkbox "label=checkbox test" "name=checkboxField1" "value=aBoolean" )
@@ -43,7 +43,7 @@
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxTag"
+ * @s.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxTag"
* description="Render a checkbox input field"
*/
public class Checkbox extends UIBean {
@@ -73,7 +73,7 @@
/**
* The actual HTML value attribute of the checkbox.
- * @a2.tagattribute required="false" default="'true'"
+ * @s.tagattribute required="false" default="'true'"
*/
public void setFieldValue(String fieldValue) {
this.fieldValue = fieldValue;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java Sat Aug 19 16:10:09 2006
@@ -25,7 +25,7 @@
/**
* <!-- START SNIPPET: javadoc -->
*
- * Creates a series of checkboxes from a list. Setup is like <a:select /> or <a:radio />, but creates checkbox tags.
+ * Creates a series of checkboxes from a list. Setup is like <s:select /> or <s:radio />, but creates checkbox tags.
*
* <!-- END SNIPPET: javadoc -->
*
@@ -33,11 +33,11 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:checkboxlist name="foo" list="bar"/>
+ * <s:checkboxlist name="foo" list="bar"/>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxListTag"
+ * @s.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxListTag"
* description="Render a list of checkboxes"
*/
public class CheckboxList extends ListUIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java Sat Aug 19 16:10:09 2006
@@ -41,7 +41,7 @@
/**
* Set template to use for opening the rendered html.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setOpenTemplate(String openTemplate) {
this.openTemplate = openTemplate;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java Sat Aug 19 16:10:09 2006
@@ -40,7 +40,7 @@
* span from first to last. The population is done via javascript, and requires that this tag be surrounded by a
* <form>.<p/>
*
- * Note that unlike the <a:select/> tag, there is no ability to define the individual <option> tags' id attribute
+ * Note that unlike the <s:select/> tag, there is no ability to define the individual <option> tags' id attribute
* or content separately. Each of these is simply populated from the toString() method of the list item. Presumably
* this is because the select box isn't intended to actually submit useful data, but to assist the user in filling
* out the text field.<p/>
@@ -52,15 +52,15 @@
* <!-- START SNIPPET: example -->
* JSP:
* <-- Example One -->
- * <a:bean name="struts.util.Counter" id="year">
- * <a:param name="first" value="text('firstBirthYear')"/>
- * <a:param name="last" value="2000"/>
+ * <s:bean name="struts.util.Counter" id="year">
+ * <s:param name="first" value="text('firstBirthYear')"/>
+ * <s:param name="last" value="2000"/>
*
- * <a:combobox label="Birth year" size="6" maxlength="4" name="birthYear" list="#year"/>
- * </a:bean>
+ * <s:combobox label="Birth year" size="6" maxlength="4" name="birthYear" list="#year"/>
+ * </s:bean>
*
* <-- Example Two -->
- * <a:combobox
+ * <s:combobox
* label="My Favourite Fruit"
* name="myFavouriteFruit"
* list="{'apple','banana','grape','pear'}"
@@ -70,7 +70,7 @@
* value="banana" />
*
* <-- Example Two -->
- * <a:combobox
+ * <s:combobox
* label="My Favourite Color"
* name="myFavouriteColor"
* list="#{'red':'red','green':'green','blue':'blue'}"
@@ -84,7 +84,7 @@
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComboBoxTag"
+ * @s.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComboBoxTag"
* description="Widget that fills a text box from a select"
*/
public class ComboBox extends TextField {
@@ -163,7 +163,7 @@
/**
* Iteratable source to populate from. If this is missing, the select widget is simply not displayed.
- * @a2.tagattribute required="true"
+ * @s.tagattribute required="true"
*/
public void setList(String list) {
this.list = list;
@@ -171,7 +171,7 @@
/**
* Decide if an empty option is to be inserted. Default false.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setEmptyOption(String emptyOption) {
this.emptyOption = emptyOption;
@@ -179,7 +179,7 @@
/**
* set the header key for the header option.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setHeaderKey(String headerKey) {
this.headerKey = headerKey;
@@ -187,7 +187,7 @@
/**
* set the header value for the header option.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setHeaderValue(String headerValue) {
this.headerValue = headerValue;
@@ -195,7 +195,7 @@
/**
* set the key used to retrive the option key.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListKey(String listKey) {
this.listKey = listKey;
@@ -203,7 +203,7 @@
/**
* set the value used to retrive the option value.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListValue(String listValue) {
this.listValue = listValue;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java Sat Aug 19 16:10:09 2006
@@ -464,7 +464,7 @@
/**
* id for referencing element. For UI and form tags it will be used as HTML id attribute
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setId(String id) {
if (id != null) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java Sat Aug 19 16:10:09 2006
@@ -122,16 +122,16 @@
* <p/> <b>Examples</b>
* <pre>
* <!-- START SNIPPET: example -->
- * <a:date name="person.birthday" format="dd/MM/yyyy" />
- * <a:date name="person.birthday" format="%{getText('some.i18n.key')}" />
- * <a:date name="person.birthday" nice="true" />
- * <a:date name="person.birthday" />
+ * <s:date name="person.birthday" format="dd/MM/yyyy" />
+ * <s:date name="person.birthday" format="%{getText('some.i18n.key')}" />
+ * <s:date name="person.birthday" nice="true" />
+ * <s:date name="person.birthday" />
* <!-- END SNIPPET: example -->
* </pre>
*
* <code>Date</code>
*
- * @a2.tag name="date" tld-body-content="empty"
+ * @s.tag name="date" tld-body-content="empty"
* tld-tag-class="org.apache.struts2.views.jsp.DateTag"
* description="Render a formatted date."
*/
@@ -335,7 +335,7 @@
/**
* Date or DateTime format pattern
*
- * @a2.tagattribute required="false" rtexprvalue="false"
+ * @s.tagattribute required="false" rtexprvalue="false"
*/
public void setFormat(String format) {
this.format = format;
@@ -344,7 +344,7 @@
/**
* Whether to print out the date nicely
*
- * @a2.tagattribute required="false" type="Boolean" default="false"
+ * @s.tagattribute required="false" type="Boolean" default="false"
*/
public void setNice(boolean nice) {
this.nice = nice;
@@ -360,7 +360,7 @@
/**
* The date value to format
*
- * @a2.tagattribute required="true" type="String"
+ * @s.tagattribute required="true" type="String"
*/
public void setName(String name) {
this.name = name;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java Sat Aug 19 16:10:09 2006
@@ -72,9 +72,9 @@
* <!-- START SNIPPET: expl1 -->
*
* Example 1:
- * <a:datepicker name="order.date" label="Order Date" />
+ * <s:datepicker name="order.date" label="Order Date" />
* Example 2:
- * <a:datepicker name="delivery.date" label="Delivery Date" format="#yyyy-#MM-#dd" />
+ * <s:datepicker name="delivery.date" label="Delivery Date" format="#yyyy-#MM-#dd" />
*
* <!-- END SNIPPET: expl1 -->
* </pre>
@@ -89,12 +89,12 @@
* <pre>
* <!-- START SNIPPET: expl2 -->
*
- * <a:datepicker name="birthday" label="Birthday" templateCss="...." />
+ * <s:datepicker name="birthday" label="Birthday" templateCss="...." />
*
* <!-- END SNIPPET: expl2 -->
* </pre>
*
- * @a2.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DatePickerTag"
+ * @s.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DatePickerTag"
* description="Render datepicker"
*/
public class DatePicker extends TextField {
@@ -137,7 +137,7 @@
/**
* The format to use for date field.
- * @a2.tagattribute required="false" type="String" default="Dateformat specified by language preset (%Y/%m/%d for en)"
+ * @s.tagattribute required="false" type="String" default="Dateformat specified by language preset (%Y/%m/%d for en)"
*/
public void setFormat(String format) {
this.format = format;
@@ -145,7 +145,7 @@
/**
* The date picker icon path
- * @a2.tagattribute required="false" type="String" default="/struts/dojo/struts/widgets/dateIcon.gif"
+ * @s.tagattribute required="false" type="String" default="/struts/dojo/struts/widgets/dateIcon.gif"
*/
public void setDateIconPath(String dateIconPath) {
this.dateIconPath = dateIconPath;
@@ -153,7 +153,7 @@
/**
* The datepicker template path.
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setTemplatePath(String templatePath) {
this.templatePath = templatePath;
@@ -161,7 +161,7 @@
/**
* The datepicker template css path.
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setTemplateCssPath(String templateCssPath) {
this.templateCssPath = templateCssPath;
@@ -169,7 +169,7 @@
/**
* The datepicker text field size.
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setSize(String size) {
this.size = size;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Aug 19 16:10:09 2006
@@ -44,11 +44,11 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:div ... />
+ * <s:div ... />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DivTag"
+ * @s.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DivTag"
* description="Render HTML div providing content from remote call via AJAX"
*/
public class Div extends RemoteCallUIBean {
@@ -126,7 +126,7 @@
/**
* How often to re-fetch the content (in milliseconds)
- * @a2.tagattribute required="false" type="Integer" default="0"
+ * @s.tagattribute required="false" type="Integer" default="0"
*/
public void setUpdateFreq(String updateFreq) {
this.updateFreq = updateFreq;
@@ -134,7 +134,7 @@
/**
* How long to wait before fetching the content (in milliseconds)
- * @a2.tagattribute required="false" type="Integer" default="0"
+ * @s.tagattribute required="false" type="Integer" default="0"
*/
public void setDelay(String delay) {
this.delay = delay;
@@ -142,7 +142,7 @@
/**
* The text to display to the user while the new content is being fetched (especially good if the content will take awhile)
- * @a2.tagattribute required="false" rtexprvalue="true"
+ * @s.tagattribute required="false" rtexprvalue="true"
*/
public void setLoadingText(String loadingText) {
this.loadingText = loadingText;
@@ -150,7 +150,7 @@
/**
* Topic name to listen to (comma delimited), that will cause the DIV's content to be re-fetched
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListenTopics(String listenTopics) {
this.listenTopics = listenTopics;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java Sat Aug 19 16:10:09 2006
@@ -257,7 +257,7 @@
/**
* The second iterable source to populate from.
- * @a2.tagattribute required="true"
+ * @s.tagattribute required="true"
*/
public void setDoubleList(String doubleList) {
this.doubleList = doubleList;
@@ -265,7 +265,7 @@
/**
* The key expression to use for second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleListKey(String doubleListKey) {
this.doubleListKey = doubleListKey;
@@ -273,7 +273,7 @@
/**
* The value expression to use for second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleListValue(String doubleListValue) {
this.doubleListValue = doubleListValue;
@@ -281,7 +281,7 @@
/**
* The name for complete component
- * @a2.tagattribute required="true"
+ * @s.tagattribute required="true"
*/
public void setDoubleName(String doubleName) {
this.doubleName = doubleName;
@@ -289,7 +289,7 @@
/**
* The value expression for complete component
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleValue(String doubleValue) {
this.doubleValue = doubleValue;
@@ -297,7 +297,7 @@
/**
* The form name this component resides in and populates to
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setFormName(String formName) {
this.formName = formName;
@@ -309,7 +309,7 @@
/**
* The css class for the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleCssClass(String doubleCssClass) {
this.doubleCssClass = doubleCssClass;
@@ -321,7 +321,7 @@
/**
* The css style for the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleCssStyle(String doubleCssStyle) {
this.doubleCssStyle = doubleCssStyle;
@@ -333,7 +333,7 @@
/**
* The header key for the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleHeaderKey(String doubleHeaderKey) {
this.doubleHeaderKey = doubleHeaderKey;
@@ -345,7 +345,7 @@
/**
* The header value for the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleHeaderValue(String doubleHeaderValue) {
this.doubleHeaderValue = doubleHeaderValue;
@@ -357,7 +357,7 @@
/**
* Decides if the second list will add an empty option
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleEmptyOption(String doubleEmptyOption) {
this.doubleEmptyOption = doubleEmptyOption;
@@ -374,7 +374,7 @@
/**
* Decides if a disable attribute should be added to the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleDisabled(String doubleDisabled) {
this.doubleDisabled = doubleDisabled;
@@ -386,7 +386,7 @@
/**
* The id of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleId(String doubleId) {
this.doubleId = doubleId;
@@ -398,7 +398,7 @@
/**
* Decides if multiple attribute should be set on the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleMultiple(String doubleMultiple) {
this.doubleMultiple = doubleMultiple;
@@ -410,7 +410,7 @@
/**
* Set the onblur attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnblur(String doubleOnblur) {
this.doubleOnblur = doubleOnblur;
@@ -422,7 +422,7 @@
/**
* Set the onchange attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnchange(String doubleOnchange) {
this.doubleOnchange = doubleOnchange;
@@ -434,7 +434,7 @@
/**
* Set the onclick attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnclick(String doubleOnclick) {
this.doubleOnclick = doubleOnclick;
@@ -446,7 +446,7 @@
/**
* Set the ondbclick attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOndblclick(String doubleOndblclick) {
this.doubleOndblclick = doubleOndblclick;
@@ -458,7 +458,7 @@
/**
* Set the onfocus attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnfocus(String doubleOnfocus) {
this.doubleOnfocus = doubleOnfocus;
@@ -470,7 +470,7 @@
/**
* Set the onkeydown attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnkeydown(String doubleOnkeydown) {
this.doubleOnkeydown = doubleOnkeydown;
@@ -482,7 +482,7 @@
/**
* Set the onkeypress attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnkeypress(String doubleOnkeypress) {
this.doubleOnkeypress = doubleOnkeypress;
@@ -494,7 +494,7 @@
/**
* Set the onkeyup attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnkeyup(String doubleOnkeyup) {
this.doubleOnkeyup = doubleOnkeyup;
@@ -506,7 +506,7 @@
/**
* Set the onmousedown attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnmousedown(String doubleOnmousedown) {
this.doubleOnmousedown = doubleOnmousedown;
@@ -518,7 +518,7 @@
/**
* Set the onmousemove attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnmousemove(String doubleOnmousemove) {
this.doubleOnmousemove = doubleOnmousemove;
@@ -530,7 +530,7 @@
/**
* Set the onmouseout attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnmouseout(String doubleOnmouseout) {
this.doubleOnmouseout = doubleOnmouseout;
@@ -542,7 +542,7 @@
/**
* Set the onmouseover attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnmouseover(String doubleOnmouseover) {
this.doubleOnmouseover = doubleOnmouseover;
@@ -554,7 +554,7 @@
/**
* Set the onmouseup attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnmouseup(String doubleOnmouseup) {
this.doubleOnmouseup = doubleOnmouseup;
@@ -566,7 +566,7 @@
/**
* Set the onselect attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleOnselect(String doubleOnselect) {
this.doubleOnselect = doubleOnselect;
@@ -578,7 +578,7 @@
/**
* Set the size attribute of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleSize(String doubleSize) {
this.doubleSize = doubleSize;
@@ -590,7 +590,7 @@
/**
* Set the list key of the second attribute
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public String getDoubleListKey() {
return doubleListKey;
@@ -610,7 +610,7 @@
/**
* Decides of an empty option is to be inserted in the second list
- * @a2.tagattribute required="false" default="false" type="Boolean"
+ * @s.tagattribute required="false" default="false" type="Boolean"
*/
public void setEmptyOption(String emptyOption) {
this.emptyOption = emptyOption;
@@ -618,7 +618,7 @@
/**
* Set the header key of the second list. Must not be empty! "'-1'" and "''" is correct, "" is bad.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setHeaderKey(String headerKey) {
this.headerKey = headerKey;
@@ -626,7 +626,7 @@
/**
* Set the header value of the second list
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setHeaderValue(String headerValue) {
this.headerValue = headerValue;
@@ -634,7 +634,7 @@
/**
* Creates a multiple select. The tag will pre-select multiple values if the values are passed as an Array (of appropriate types) via the value attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setMultiple(String multiple) {
// TODO: Passing a Collection may work too?
@@ -643,7 +643,7 @@
/**
* Size of the element box (# of elements to show)
- * @a2.tagattribute required="false" type="Integer"
+ * @s.tagattribute required="false" type="Integer"
*/
public void setSize(String size) {
this.size = size;
@@ -651,7 +651,7 @@
/**
* Set the html accesskey attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDoubleAccesskey(String doubleAccesskey) {
this.doubleAccesskey = doubleAccesskey;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java Sat Aug 19 16:10:09 2006
@@ -31,12 +31,12 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:doubleselect label="doubleselect test1" name="menu" list="{'fruit','other'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" />
- * <a:doubleselect label="doubleselect test2" name="menu" list="#{'fruit':'Nice Fruits', 'other':'Other Dishes'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" />
+ * <s:doubleselect label="doubleselect test1" name="menu" list="{'fruit','other'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" />
+ * <s:doubleselect label="doubleselect test2" name="menu" list="#{'fruit':'Nice Fruits', 'other':'Other Dishes'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DoubleSelectTag"
+ * @s.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DoubleSelectTag"
* description="Renders two HTML select elements with second one changing displayed values depending on selected entry of first one."
*/
public class DoubleSelect extends DoubleListUIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java Sat Aug 19 16:10:09 2006
@@ -39,19 +39,19 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:if test="%{false}">
+ * <s:if test="%{false}">
* <div>Will Not Be Executed</div>
- * </a:if>
- * <a:elseif test="%{true}">
+ * </s:if>
+ * <s:elseif test="%{true}">
* <div>Will Be Executed</div>
- * </a:elseif>
- * <a:else>
+ * </s:elseif>
+ * <s:else>
* <div>Will Not Be Executed</div>
- * </a:else>
+ * </s:else>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="else" bodycontent="JSP" description="Else tag" tld-tag-class="org.apache.struts2.views.jsp.ElseTag"
+ * @s.tag name="else" bodycontent="JSP" description="Else tag" tld-tag-class="org.apache.struts2.views.jsp.ElseTag"
*/
public class Else extends Component {
public Else(OgnlValueStack stack) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java Sat Aug 19 16:10:09 2006
@@ -43,19 +43,19 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:if test="%{false}">
+ * <s:if test="%{false}">
* <div>Will Not Be Executed</div>
- * </a:if>
- * <a:elseif test="%{true}">
+ * </s:if>
+ * <s:elseif test="%{true}">
* <div>Will Be Executed</div>
- * </a:elseif>
- * <a:else>
+ * </s:elseif>
+ * <s:else>
* <div>Will Not Be Executed</div>
- * </a:else>
+ * </s:else>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="elseif" tld-body-content="JSP" description="Elseif tag" tld-tag-class="org.apache.struts2.views.jsp.ElseIfTag"
+ * @s.tag name="elseif" tld-body-content="JSP" description="Elseif tag" tld-tag-class="org.apache.struts2.views.jsp.ElseIfTag"
*/
public class ElseIf extends Component {
public ElseIf(OgnlValueStack stack) {
@@ -91,7 +91,7 @@
/**
* Expression to determine if body of tag is to be displayed
- * @a2.tagattribute required="true" type="Boolean"
+ * @s.tagattribute required="true" type="Boolean"
*/
public void setTest(String test) {
this.test = test;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java Sat Aug 19 16:10:09 2006
@@ -38,26 +38,26 @@
* <!-- START SNIPPET: example -->
*
* <!-- example 1 -->
- * <a:fielderror />
+ * <s:fielderror />
*
* <!-- example 2 -->
- * <a:fielderror>
- * <a:param>field1</a:param>
- * <a:param>field2</a:param>
- * </a:fielderror>
- * <a:form .... >>
+ * <s:fielderror>
+ * <s:param>field1</s:param>
+ * <s:param>field2</s:param>
+ * </s:fielderror>
+ * <s:form .... >>
* ....
- * </a:form>
+ * </s:form>
*
* OR
*
- * <a:fielderror>
- * <a:param value="%{'field1'}" />
- * <a:param value="%{'field2'}" />
- * </a:fielderror>
- * <a:form .... >>
+ * <s:fielderror>
+ * <s:param value="%{'field1'}" />
+ * <s:param value="%{'field2'}" />
+ * </s:fielderror>
+ * <s:form .... >>
* ....
- * </a:form>
+ * </s:form>
*
* <!-- END SNIPPET: example -->
* </pre>
@@ -75,7 +75,7 @@
* <!-- END SNIPPET: description -->
* </pre>
*
- * @a2.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FieldErrorTag"
+ * @s.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FieldErrorTag"
* description="Render field error (all or partial depending on param tag nested)if they exists"
*/
public class FieldError extends UIBean implements UnnamedParametric {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java Sat Aug 19 16:10:09 2006
@@ -34,12 +34,12 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:file name="anUploadFile" accept="text/*" />
- * <a:file name="anohterUploadFIle" accept="text/html,text/plain" />
+ * <s:file name="anUploadFile" accept="text/*" />
+ * <s:file name="anohterUploadFIle" accept="text/html,text/plain" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FileTag"
+ * @s.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FileTag"
* description="Render a file input field"
*/
public class File extends UIBean {
@@ -66,13 +66,13 @@
String encType = (String) form.getParameters().get("enctype");
if (!"multipart/form-data".equals(encType)) {
// uh oh, this isn't good! Let's warn the developer
- log.warn("Struts has detected a file upload UI tag (a:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
+ log.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
}
String method = (String) form.getParameters().get("method");
if (!"post".equalsIgnoreCase(method)) {
// uh oh, this isn't good! Let's warn the developer
- log.warn("Struts has detected a file upload UI tag (a:file) being used without a form set to method 'POST'. This is probably an error!");
+ log.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to method 'POST'. This is probably an error!");
}
}
@@ -87,7 +87,7 @@
/**
* HTML accept attribute to indicate accepted file mimetypes
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setAccept(String accept) {
this.accept = accept;
@@ -95,7 +95,7 @@
/**
* HTML size attribute
- * @a2.tagattribute required="false" type="Integer"
+ * @s.tagattribute required="false" type="Integer"
*/
public void setSize(String size) {
this.size = size;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java Sat Aug 19 16:10:09 2006
@@ -77,12 +77,12 @@
* <pre>
* <!-- START SNIPPET: example -->
* <p/>
- * <a:form ... />
+ * <s:form ... />
* <p/>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FormTag"
+ * @s.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FormTag"
* description="Renders an input form"
*/
public class Form extends ClosingUIBean {
@@ -415,7 +415,7 @@
/**
* HTML onsubmit attribute
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setOnsubmit(String onsubmit) {
this.onsubmit = onsubmit;
@@ -424,7 +424,7 @@
/**
* Set action nane to submit to, without .action suffix
*
- * @a2.tagattribute required="false" default="current action"
+ * @s.tagattribute required="false" default="current action"
*/
public void setAction(String action) {
this.action = action;
@@ -433,7 +433,7 @@
/**
* HTML form target attribute
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setTarget(String target) {
this.target = target;
@@ -442,7 +442,7 @@
/**
* HTML form enctype attribute
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setEnctype(String enctype) {
this.enctype = enctype;
@@ -451,7 +451,7 @@
/**
* HTML form method attribute
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setMethod(String method) {
this.method = method;
@@ -460,7 +460,7 @@
/**
* namespace for action to submit to
*
- * @a2.tagattribute required="false" default="current namespace"
+ * @s.tagattribute required="false" default="current namespace"
*/
public void setNamespace(String namespace) {
this.namespace = namespace;
@@ -469,7 +469,7 @@
/**
* Whether client side/remote validation should be performed. Only useful with theme xhtml/ajax
*
- * @a2.tagattribute required="false" type="Boolean" default="false"
+ * @s.tagattribute required="false" type="Boolean" default="false"
*/
public void setValidate(String validate) {
this.validate = validate;
@@ -478,7 +478,7 @@
/**
* The portlet mode to display after the form submit
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setPortletMode(String portletMode) {
this.portletMode = portletMode;
@@ -487,7 +487,7 @@
/**
* The window state to display after the form submit
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setWindowState(String windowState) {
this.windowState = windowState;
@@ -496,7 +496,7 @@
/**
* The accepted charsets for this form. The values may be comma or blank delimited.
*
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setAcceptcharset(String acceptcharset) {
this.acceptcharset = acceptcharset;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java Sat Aug 19 16:10:09 2006
@@ -139,7 +139,7 @@
/**
* Set action attribute.
*
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setAction(String action) {
this.action = action;
@@ -148,7 +148,7 @@
/**
* Set method attribute.
*
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setMethod(String method) {
this.method = method;
@@ -157,7 +157,7 @@
/**
* HTML align attribute.
*
- * @a2.tagattribute required="false" type="String"
+ * @s.tagattribute required="false" type="String"
*/
public void setAlign(String align) {
this.align = align;
@@ -166,7 +166,7 @@
/**
* The type of submit to use. Valid values are <i>input</i>, <i>button</i> and <i>image</i>.
*
- * @a2.tagattribute required="false" type="String" default="input"
+ * @s.tagattribute required="false" type="String" default="input"
*/
public void setType(String type) {
this.type = type;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java Sat Aug 19 16:10:09 2006
@@ -61,14 +61,14 @@
* <pre>
* <!-- START SNIPPET: example -->
* JSP
- * <a:component template="/my/custom/component.vm"/>
+ * <s: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>
+ * <s:component template="/my/custom/component.vm">
+ * <s:param name="key1" value="value1"/>
+ * <s:param name="key2" value="value2"/>
+ * </s:component>
*
* Velocity
* #s-component( "template=/my/custom/component.vm" )
@@ -104,7 +104,7 @@
*
* <!-- END SNIPPET: note -->
*
- * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComponentTag"
+ * @s.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComponentTag"
* description="Render a custom ui widget"
*/
public class GenericUIBean extends UIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java Sat Aug 19 16:10:09 2006
@@ -47,7 +47,7 @@
* <!-- START SNIPPET: example1 -->
* <head>
* <title>My page</title>
- * <a:head/>
+ * <s:head/>
* </head>
* <!-- END SNIPPET: example1 -->
* </pre>
@@ -56,7 +56,7 @@
* <!-- START SNIPPET: example2 -->
* <head>
* <title>My page</title>
- * <a:head theme="ajax" calendarcss="calendar-green"/>
+ * <s:head theme="ajax" calendarcss="calendar-green"/>
* </head>
* <!-- END SNIPPET: example2 -->
* </pre>
@@ -65,12 +65,12 @@
* <!-- START SNIPPET: example3 -->
* <head>
* <title>My page</title>
- * <a:head theme="ajax" debug="true"/>
+ * <s:head theme="ajax" debug="true"/>
* </head>
* <!-- END SNIPPET: example3 -->
* </pre>
*
- * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.HeadTag"
+ * @s.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.HeadTag"
* description="Render a chunk of HEAD for your HTML file"
*/
public class Head extends UIBean {
@@ -111,7 +111,7 @@
/**
* The jscalendar css theme to use" default="calendar-blue.css
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setCalendarcss(String calendarcss) {
this.calendarcss = calendarcss;
@@ -123,7 +123,7 @@
/**
* Set to true to enable debugging mode for AJAX themes
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDebug(boolean debug) {
this.debug = debug;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java Sat Aug 19 16:10:09 2006
@@ -32,9 +32,9 @@
* <pre>
* <!-- START SNIPPET: example -->
* <-- example one -->
- * <a:hidden name="foo" />
+ * <s:hidden name="foo" />
* <-- example two -->
- * <a:hidden name="foo" value="bar" />
+ * <s:hidden name="foo" value="bar" />
*
* Example One Resulting HTML (if foo evaluates to bar):
* <input type="hidden" name="foo" value="bar" />
@@ -43,7 +43,7 @@
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.HiddenTag"
+ * @s.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.HiddenTag"
* description="Render a hidden input field"
*/
public class Hidden extends UIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java Sat Aug 19 16:10:09 2006
@@ -56,9 +56,9 @@
* <pre>
* <!-- START SNIPPET: example -->
*
- * <a:i18n name="myCustomBundle">
- * The i18n value for key aaa.bbb.ccc in myCustomBundle is <a:property value="text('aaa.bbb.ccc')" />
- * </a:i18n>
+ * <s:i18n name="myCustomBundle">
+ * The i18n value for key aaa.bbb.ccc in myCustomBundle is <s:property value="text('aaa.bbb.ccc')" />
+ * </s:i18n>
*
* <!-- END SNIPPET: example -->
* </pre>
@@ -67,14 +67,14 @@
* <pre>
* <!-- START SNIPPET: i18nExample -->
*
- * <a:i18n name="some.package.bundle" >
- * <a:text name="some.key" />
- * </a:i18n>
+ * <s:i18n name="some.package.bundle" >
+ * <s:text name="some.key" />
+ * </s:i18n>
*
* <!-- END SNIPPET: i18nExample -->
* </pre>
*
- * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.I18nTag"
+ * @s.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.I18nTag"
* description="Get a resource bundle and place it on the value stack"
*/
public class I18n extends Component {
@@ -125,7 +125,7 @@
/**
* Name of ressource bundle to use (eg foo/bar/customBundle)
- * @a2.tagattribute required="true" default="String"
+ * @s.tagattribute required="true" default="String"
*/
public void setName(String name) {
this.name = name;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java Sat Aug 19 16:10:09 2006
@@ -43,22 +43,22 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <a:if test="%{false}">
+ * <s:if test="%{false}">
* <div>Will Not Be Executed</div>
- * </a:if>
- * <a:elseif test="%{true}">
+ * </s:if>
+ * <s:elseif test="%{true}">
* <div>Will Be Executed</div>
- * </a:elseif>
- * <a:else>
+ * </s:elseif>
+ * <s:else>
* <div>Will Not Be Executed</div>
- * </a:else>
+ * </s:else>
* <!-- END SNIPPET: example -->
* </pre>
*
* @see Else
* @see ElseIf
*
- * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts2.views.jsp.IfTag"
+ * @s.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts2.views.jsp.IfTag"
*/
public class If extends Component {
public static final String ANSWER = "struts.if.answer";
@@ -68,7 +68,7 @@
/**
* Expression to determine if body of tag is to be displayed
- * @a2.tagattribute required="true" type="Boolean"
+ * @s.tagattribute required="true" type="Boolean"
*/
public void setTest(String test) {
this.test = test;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java Sat Aug 19 16:10:09 2006
@@ -57,19 +57,19 @@
* <pre>
* <!-- START SNIPPET: example -->
* <-- One: -->
- * <a:include value="myJsp.jsp" />
+ * <s:include value="myJsp.jsp" />
*
* <-- Two: -->
- * <a:include value="myJsp.jsp">
- * <a:param name="param1" value="value2" />
- * <a:param name="param2" value="value2" />
- * </a:include>
+ * <s:include value="myJsp.jsp">
+ * <s:param name="param1" value="value2" />
+ * <s:param name="param2" value="value2" />
+ * </s:include>
*
* <-- Three: -->
- * <a:include value="myJsp.jsp">
- * <a:param name="param1">value1</a:param>
- * <a:param name="param2">value2<a:param>
- * </a:include>
+ * <s:include value="myJsp.jsp">
+ * <s:param name="param1">value1</s:param>
+ * <s:param name="param2">value2<s:param>
+ * </s:include>
* <!-- END SNIPPET: example -->
*
* <!-- START SNIPPET: exampledescription -->
@@ -79,7 +79,7 @@
* <!-- END SNIPPET: exampledescription -->
* </pre>
*
- * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IncludeTag"
+ * @s.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IncludeTag"
* description="Include a servlet's output (result of servlet or a JSP page)"
*/
public class Include extends Component {
@@ -150,7 +150,7 @@
/**
* The jsp/servlet output to include
- * @a2.tagattribute required="true" type="String"
+ * @s.tagattribute required="true" type="String"
*/
public void setValue(String value) {
this.value = value;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java Sat Aug 19 16:10:09 2006
@@ -49,15 +49,15 @@
* <!-- 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>
+ * uses it to iterate over. The <s:property/> tag prints out the current value of the iterator.</p>
*
* <!-- END SNIPPET: example1description -->
*
* <pre>
* <!-- START SNIPPET: example1code -->
- * <a:iterator value="days">
- * <p>day is: <a:property/></p>
- * </a:iterator>
+ * <s:iterator value="days">
+ * <p>day is: <s:property/></p>
+ * </s:iterator>
* <!-- END SNIPPET: example1code -->
* </pre>
*
@@ -75,26 +75,26 @@
* <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>
+ * <s:bean name="org.apache.struts2.example.IteratorExample" id="it">
+ * <s:param name="day" value="'foo'"/>
+ * <s:param name="day" value="'bar'"/>
+ * </s:bean>
* <p/>
* <table border="0" cellspacing="0" cellpadding="1">
* <tr>
* <th>Days of the week</th>
* </tr>
* <p/>
- * <a:iterator value="#it.days" status="rowstatus">
+ * <s: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>
+ * <s:if test="#rowstatus.odd == true">
+ * <td style="background: grey"><s:property/></td>
+ * </s:if>
+ * <s:else>
+ * <td><s:property/></td>
+ * </s:else>
* </tr>
- * </a:iterator>
+ * </s:iterator>
* </table>
*
* <!-- END SNIPPET: example2code -->
@@ -131,7 +131,7 @@
*
* </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
+ * action. Using the '[0]' operator has the same effect as using >s:property />. (The latter, however, does not
* work from inside the param tag). </p>
*
* <!-- END SNIPPET: example4description -->
@@ -139,16 +139,16 @@
* <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>
+ * <s:action name="entries" id="entries"/>
+ * <s:iterator value="#entries.entries" >
+ * <s:property value="name" />
+ * <s:property />
+ * <s:push value="...">
+ * <s:action name="edit" id="edit" >
+ * <s:param name="entry" value="[0]" />
+ * </s:action>
* </push>
- * </a:iterator>
+ * </s:iterator>
*
* <!-- END SNIPPET: example4code -->
* </pre>
@@ -163,19 +163,19 @@
* <pre>
* <!-- START SNIPPET: example5code -->
*
- * <a:iterator status="stat" value="{1,2,3,4,5}" >
+ * <s:iterator status="stat" value="{1,2,3,4,5}" >
* <!-- grab the index (start with 0 ... ) -->
- * <a:property value="#stat.index" />
+ * <s: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>
+ * <s:property value="top" />
+ * </s:iterator>
*
* <!-- END SNIPPET: example5code -->
* </pre>
*
- * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IteratorTag"
+ * @s.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IteratorTag"
* description="Iterate over a iterable value"
*/
public class IteratorComponent extends Component {
@@ -272,7 +272,7 @@
/**
* if specified, an instanceof IteratorStatus will be pushed into stack upon each iteration
- * @a2.tagattribute required="false" type="Boolean" default="false"
+ * @s.tagattribute required="false" type="Boolean" default="false"
*/
public void setStatus(String status) {
this.statusAttr = status;
@@ -280,7 +280,7 @@
/**
* the iteratable source to iterate over, else an the object itself will be put into a newly created List
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setValue(String value) {
this.value = value;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java Sat Aug 19 16:10:09 2006
@@ -37,11 +37,11 @@
* <!-- END SNIPPET: exdescription -->
* <pre>
* <!-- START SNIPPET: example -->
- * <a:label label="%{text('user_name')}" name="userName" />
+ * <s:label label="%{text('user_name')}" name="userName" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.LabelTag"
+ * @s.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.LabelTag"
* description="Render a label that displays read-only information"
*/
public class Label extends UIBean {
@@ -79,7 +79,7 @@
/**
* HTML for attribute
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setFor(String forAttr) {
this.forAttr = forAttr;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java Sat Aug 19 16:10:09 2006
@@ -118,7 +118,7 @@
/**
* Iterable source to populate from. If the list is a Map (key, value), the Map key will become the option "value" parameter and the Map value will become the option body.
- * @a2.tagattribute required="true"
+ * @s.tagattribute required="true"
*/
public void setList(Object list) {
this.list = list;
@@ -126,7 +126,7 @@
/**
* Property of list objects to get field value from
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListKey(String listKey) {
this.listKey = listKey;
@@ -134,7 +134,7 @@
/**
* Property of list objects to get field content from
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListValue(String listValue) {
this.listValue = listValue;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java Sat Aug 19 16:10:09 2006
@@ -105,14 +105,14 @@
* <!-- END SNIPPET: javacode -->
*
* <!-- START SNIPPET: example -->
- * <a:merge id="myMergedIterator1">
- * <a:param value="%{myList1}" />
- * <a:param value="%{myList2}" />
- * <a:param value="%{myList3}" />
- * </a:merge>
- * <a:iterator value="%{#myMergedIterator1}">
- * <a:property />
- * </a:iterator>
+ * <s:merge id="myMergedIterator1">
+ * <s:param value="%{myList1}" />
+ * <s:param value="%{myList2}" />
+ * <s:param value="%{myList3}" />
+ * </s:merge>
+ * <s:iterator value="%{#myMergedIterator1}">
+ * <s:property />
+ * </s:iterator>
* <!-- END SNIPPET: example -->
*
* <!-- START SNIPPET: description -->
@@ -122,7 +122,7 @@
* @see org.apache.struts2.util.MergeIteratorFilter
* @see org.apache.struts2.views.jsp.iterator.MergeIteratorTag
*
- * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.MergeIteratorTag"
+ * @s.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.MergeIteratorTag"
* description="Merge the values of a list of iterators into one iterator"
*/
public class MergeIterator extends Component implements UnnamedParametric {
@@ -169,7 +169,7 @@
/**
* the id where the resultant merged iterator will be stored in the stack's context
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setId(String id) {
super.setId(id);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java?rev=432893&r1=432892&r2=432893&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java Sat Aug 19 16:10:09 2006
@@ -109,7 +109,7 @@
/**
* Set the label attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setLabel(String label) {
internalUiBean.setLabel(label);
@@ -117,7 +117,7 @@
/**
* Set the disable attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setDisabled(String disabled) {
internalUiBean.setDisabled(disabled);
@@ -125,7 +125,7 @@
/**
* Set the list attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setList(String list) {
internalUiBean.setList(list);
@@ -133,7 +133,7 @@
/**
* Set the listKey attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListKey(String listKey) {
internalUiBean.setListKey(listKey);
@@ -141,7 +141,7 @@
/**
* Set the listValue attribute.
- * @a2.tagattribute required="false"
+ * @s.tagattribute required="false"
*/
public void setListValue(String listValue) {
internalUiBean.setListValue(listValue);