You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/09/03 09:54:28 UTC
svn commit: r439738 [3/12] - in /struts/struts2/trunk/core/src:
main/java/org/apache/struts2/ main/java/org/apache/struts2/components/
main/java/org/apache/struts2/components/table/
main/java/org/apache/struts2/components/table/renderer/ main/java/org/...
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render an HTML input tag of type password.</p>
@@ -35,11 +35,11 @@
* <!-- END SNIPPET: exdescription -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:password label="%{text('password')}" name="password" size="10" maxlength="15" />
+ * <a:password label="%{text('password')}" name="password" size="10" maxlength="15" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @s.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.PasswordTag"
+ * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.PasswordTag"
* description="Render an HTML input tag of type password"
*/
public class Password extends TextField {
@@ -65,7 +65,7 @@
/**
* Whether to show input
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setShowPassword(String showPassword) {
this.showPassword = showPassword;
@@ -73,7 +73,7 @@
/**
* Deprecated. Use showPassword instead.
- * @s.tagattribute required="false" rtexprvalue="true"
+ * @a2.tagattribute required="false" rtexprvalue="true"
* @deprecated use {@link #setShowPassword(String)}
*/
public void setShow(String showPassword) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java Sun Sep 3 00:54:09 2006
@@ -17,15 +17,15 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.util.TextUtils;
-
-import java.io.Writer;
import java.io.IOException;
+import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.util.TextUtils;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
*
@@ -51,13 +51,13 @@
* <pre>
* <!-- START SNIPPET: example -->
*
- * <s:push value="myBean">
+ * <a:push value="myBean">
* <!-- Example 1: -->
- * <s:property value="myBeanProperty" />
+ * <a:property value="myBeanProperty" />
*
* <!-- Example 2: -->
- * <s:property value="myBeanProperty" default="a default value" />
- * </s:push>
+ * <a:property value="myBeanProperty" default="a default value" />
+ * </a:push>
*
* <!-- END SNIPPET: example -->
* </pre>
@@ -75,12 +75,12 @@
* <pre>
* <!-- START SNIPPET: i18nExample -->
*
- * <s:property value="getText('some.key')" />
+ * <a:property value="getText('some.key')" />
*
* <!-- END SNIPPET: i18nExample -->
* </pre>
*
- * @s.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.PropertyTag"
+ * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.PropertyTag"
* description="Print out expression which evaluates against the stack"
*/
public class Property extends Component {
@@ -96,7 +96,7 @@
/**
* The default value to be used if <u>value</u> attribute is null
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setDefault(String defaultValue) {
this.defaultValue = defaultValue;
@@ -104,7 +104,7 @@
/**
* Whether to escape HTML
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setEscape(boolean escape) {
this.escape = escape;
@@ -112,7 +112,7 @@
/**
* value to be displayed
- * @s.tagattribute required="false" type="Object" default="<top of stack>"
+ * @a2.tagattribute required="false" type="Object" default="<top of stack>"
*/
public void setValue(String value) {
this.value = value;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java Sun Sep 3 00:54:09 2006
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* <p>Push value on stack for simplified usage.</p>
@@ -36,10 +36,10 @@
* <p/> <b>Examples</b>
* <pre>
* <!-- START SNIPPET: example1 -->
- * <s:push value="user">
- * <s:propery value="firstName" />
- * <s:propery value="lastName" />
- * </s:push>
+ * <a:push value="user">
+ * <a:propery value="firstName" />
+ * <a:propery value="lastName" />
+ * </a:push>
* <!-- END SNIPPET: example1 -->
* </pre>
*
@@ -50,11 +50,11 @@
*
* <pre>
* <!-- START SNIPPET: example2 -->
- * <s:push value="myObject"> ----- (1)
- * <s:bean name="jp.SomeBean" id="myBean"/> ----- (2)
- * <s:param name="myParam" value="top"/> ----- (3)
- * </s:bean>
- * </s:push>
+ * <a:push value="myObject"> ----- (1)
+ * <a:bean name="jp.SomeBean" id="myBean"/> ----- (2)
+ * <a:param name="myParam" value="top"/> ----- (3)
+ * </a:bean>
+ * </a:push>
* <!-- END SNIPPET: example2 -->
* </pre>
*
@@ -68,11 +68,11 @@
*
* <pre>
* <!-- START SNIPPET: example3 -->
- * <s:push value="myObject"> ---(A)
- * <s:bean name="jp.SomeBean" id="myBean"/> ---(B)
- * <s:param name="myParam" value="top.mySomeOtherValue"/> ---(C)
- * </s:bean>
- * </s:push>
+ * <a:push value="myObject"> ---(A)
+ * <a:bean name="jp.SomeBean" id="myBean"/> ---(B)
+ * <a:param name="myParam" value="top.mySomeOtherValue"/> ---(C)
+ * </a:bean>
+ * </a:push>
* <!-- END SNIPPET: example3 -->
* </pre>
*
@@ -86,11 +86,11 @@
*
* <pre>
* <!-- START SNIPPET: example4 -->
- * <s:push value="myObject"> ---- (i)
- * <s:bean name="jp.SomeBean" id="myBean"/> ---- (ii)
- * <s:param name="myParam" value="[1].top"/> -----(iii)
- * </s:bean>
- * </s:push>
+ * <a:push value="myObject"> ---- (i)
+ * <a:bean name="jp.SomeBean" id="myBean"/> ---- (ii)
+ * <a:param name="myParam" value="[1].top"/> -----(iii)
+ * </a:bean>
+ * </a:push>
* <!-- END SNIPPET: example4 -->
* </pre>
*
@@ -102,7 +102,7 @@
* <!-- END SNIPPET: example4description -->
* </pre>
*
- * @s.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.PushTag"
+ * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.PushTag"
* description="Push value on stack for simplified usage."
*/
public class Push extends Component {
@@ -140,7 +140,7 @@
/**
* Value to push on stack
- * @s.tagattribute required="true"
+ * @a2.tagattribute required="true"
*/
public void setValue(String value) {
this.value = value;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render a radio button input field.</p>
@@ -31,19 +31,19 @@
* <p/>
* <!-- START SNIPPET: exdescription -->
* In this example, a radio control is displayed with a list of genders. The gender list is built from attribute
- * id=genders. The framework calls getGenders() which will return a Map. For examples using listKey and listValue attributes,
+ * id=genders. WW calls getGenders() which will return a Map. For examples using listKey and listValue attributes,
* see the section select tag. The default selected one will be determined (in this case) by the getMale() method
* in the action class which should retun a value similar to the key of the getGenters() map if that particular
* gender is to be selected.<p/>
* <!-- END SNIPPET: exdescription -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:action name="GenderMap" id="genders"/>
- * <s:radio label="Gender" name="male" list="#genders.genders"/>
+ * <a:action name="GenderMap" id="genders"/>
+ * <a:radio label="Gender" name="male" list="#genders.genders"/>
* <!-- END SNIPPET: example -->
* </pre>
*
- * @s.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.RadioTag"
+ * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.RadioTag"
* description="Renders a radio button input field"
*/
public class Radio extends ListUIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* RemoteCallUIBean is superclass for all components dealing with remote calls.
*
@@ -59,7 +59,7 @@
/**
* The theme to use for the element. <b>This tag will usually use the ajax theme.</b>
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setTheme(String theme) {
super.setTheme(theme);
@@ -67,7 +67,7 @@
/**
* The URL to call to obtain the content
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setHref(String href) {
this.href = href;
@@ -75,7 +75,7 @@
/**
* The text to display to the user if the is an error fetching the content
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setErrorText(String errorText) {
this.errorText = errorText;
@@ -83,7 +83,7 @@
/**
* when to show the error message as content when the URL had problems
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setShowErrorTransportText(String showErrorTransportText) {
this.showErrorTransportText = showErrorTransportText;
@@ -91,7 +91,7 @@
/**
* Javascript code that will be executed after the content has been fetched
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setAfterLoading(String afterLoading) {
this.afterLoading = afterLoading;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render a reset button. The reset tag is used together with the form tag to provide form resetting.
@@ -38,18 +38,18 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <s:reset value="%{'Reset'}" />
+ * <a:reset value="%{'Reset'}" />
* <!-- END SNIPPET: example -->
* </pre>
*
* <pre>
* <!-- START SNIPPET: example2 -->
* Render an button reset:
- * <s:reset type="button" value="%{'Reset'}" label="Reset the form"/>
+ * <a:reset type="button" value="%{'Reset'}" label="Reset the form"/>
* <!-- END SNIPPET: example2 -->
* </pre>
*
- * @s.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ResetTag"
+ * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ResetTag"
* description="Render a reset button"
*/
public class Reset extends FormButton {
@@ -90,7 +90,7 @@
* Supply a reset button text apart from reset value. Will have no effect for <i>input</i> type reset, since button
* text will always be the value parameter.
*
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setLabel(String label) {
super.setLabel(label);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
*
@@ -33,7 +33,7 @@
* <pre>
* <!-- START SNIPPET: example -->
*
- * <s:select label="Pets"
+ * <a:select label="Pets"
* name="petIds"
* list="petDao.pets"
* listKey="id"
@@ -43,7 +43,7 @@
* required="true"
* />
*
- * <s:select label="Months"
+ * <a:select label="Months"
* name="months"
* headerKey="-1" headerValue="Select Month"
* list="#{'01':'Jan', '02':'Feb', [...]}"
@@ -70,7 +70,7 @@
*
* <!-- END SNIPPET: exnote -->
*
- * @s.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SelectTag"
+ * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SelectTag"
* description="Render a select element"
*/
public class Select extends ListUIBean {
@@ -113,7 +113,7 @@
/**
* Whether or not to add an empty (--) option after the header option
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setEmptyOption(String emptyOption) {
this.emptyOption = emptyOption;
@@ -121,7 +121,7 @@
/**
* Key for first item in list. Must not be empty! "'-1'" and "''" is correct, "" is bad.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setHeaderKey(String headerKey) {
this.headerKey = headerKey;
@@ -129,7 +129,7 @@
/**
* Value expression for first item in list
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setHeaderValue(String headerValue) {
this.headerValue = headerValue;
@@ -137,7 +137,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. Passing a Collection may work too? Haven't tested this.
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setMultiple(String multiple) {
this.multiple = multiple;
@@ -145,7 +145,7 @@
/**
* Size of the element box (# of elements to show)
- * @s.tagattribute required="false" type="Integer"
+ * @a2.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/Set.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java Sun Sep 3 00:54:09 2006
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* <p>The set tag assigns a value to a variable in a specified scope. It is useful when you wish to assign a variable to a
@@ -63,12 +63,12 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <s:set name="personName" value="person.name"/>
- * Hello, <s:property value="#personName"/>. How are you?
+ * <a:set name="personName" value="person.name"/>
+ * Hello, <a:property value="#personName"/>. How are you?
* <!-- END SNIPPET: example -->
* </pre>
*
- * @s.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.SetTag"
+ * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.SetTag"
* description="Assigns a value to a variable in a specified scope"
*/
public class Set extends Component {
@@ -118,7 +118,7 @@
/**
* The name of the new variable that is assigned the value of <i>value</i>
- * @s.tagattribute required="true" type="String"
+ * @a2.tagattribute required="true" type="String"
*/
public void setName(String name) {
this.name = name;
@@ -126,7 +126,7 @@
/**
* The scope in which to assign the variable. Can be <b>application</b>, <b>session</b>, <b>request</b>, <b>page</b>, or <b>action</b>.
- * @s.tagattribute required="false" type="String" default="action"
+ * @a2.tagattribute required="false" type="String" default="action"
*/
public void setScope(String scope) {
this.scope = scope;
@@ -134,7 +134,7 @@
/**
* The value that is assigned to the variable named <i>name</i>
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setValue(String value) {
this.value = value;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.
@@ -39,21 +39,21 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <s:submit value="%{'Submit'}" />
+ * <a:submit value="%{'Submit'}" />
* <!-- END SNIPPET: example -->
* </pre>
*
* <pre>
* <!-- START SNIPPET: example2 -->
* Render an image submit:
- * <s:submit type="image" value="%{'Submit'}" label="Submit the form" src="submit.gif"/>
+ * <a:submit type="image" value="%{'Submit'}" label="Submit the form" src="submit.gif"/>
* <!-- END SNIPPET: example2 -->
* </pre>
*
* <pre>
* <!-- START SNIPPET: example3 -->
* Render an button submit:
- * <s:submit type="button" value="%{'Submit'}" label="Submit the form"/>
+ * <a:submit type="button" value="%{'Submit'}" label="Submit the form"/>
* <!-- END SNIPPET: example3 -->
* </pre>
*
@@ -82,7 +82,7 @@
* <!-- START SNIPPET: ajxExample1 -->
* Remote form replacing another div:
* <div id='two' style="border: 1px solid yellow;">Initial content</div>
- * <s:form
+ * <a:form
* id='theForm2'
* cssStyle="border: 1px solid green;"
* action='/AjaxRemoteForm.action'
@@ -90,9 +90,9 @@
* theme="ajax">
*
* <input type='text' name='data' value='Struts User' />
- * <s:submit value="GO2" theme="ajax" resultDivId="two" />
+ * <a:submit value="GO2" theme="ajax" resultDivId="two" />
*
- * </s:form >
+ * </a:form >
* <!-- END SNIPPET: ajxExample1 -->
* </pre>
*
@@ -108,15 +108,15 @@
*
* <pre>
* <!-- START SNIPPET: ajxExample2 -->
- * <s:form id="frm1" action="newPersonWithXMLResult" theme="ajax" >
- * <s:textfield label="Name" name="person.name" value="person.name" size="20" required="true" />
- * <s:submit id="submitBtn" value="Save" theme="ajax" cssClass="primary" notifyTopics="personUpdated, systemWorking" />
- * </s:form >
+ * <a:form id="frm1" action="newPersonWithXMLResult" theme="ajax" >
+ * <a:textfield label="Name" name="person.name" value="person.name" size="20" required="true" />
+ * <a:submit id="submitBtn" value="Save" theme="ajax" cssClass="primary" notifyTopics="personUpdated, systemWorking" />
+ * </a:form >
*
- * <s:div href="/listPeople.action" theme="ajax" errorText="error opps"
+ * <a:div href="/listPeople.action" theme="ajax" errorText="error opps"
* loadingText="loading..." id="cart-body" >
- * <s:action namespace="" name="listPeople" executeResult="true" />
- * </s:div>
+ * <a:action namespace="" name="listPeople" executeResult="true" />
+ * </a:div>
* <!-- END SNIPPET: ajxExample2 -->
* </pre>
*
@@ -150,14 +150,14 @@
* }
* </script>
*
- * <s:form id="frm1" action="newPersonWithXMLResult" theme="ajax" >
- * <s:textfield label="Name" name="person.name" value="person.name" size="20" required="true" />
- * <s:submit id="submitBtn" value="Save" theme="ajax" cssClass="primary" onLoadJS="doGreatThings(data, type)" />
- * </s:form>
+ * <a:form id="frm1" action="newPersonWithXMLResult" theme="ajax" >
+ * <a:textfield label="Name" name="person.name" value="person.name" size="20" required="true" />
+ * <a:submit id="submitBtn" value="Save" theme="ajax" cssClass="primary" onLoadJS="doGreatThings(data, type)" />
+ * </a:form>
* <!-- END SNIPPET: ajxExample3 -->
* </pre>
*
- * @s.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SubmitTag"
+ * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SubmitTag"
* description="Render a submit button"
*/
public class Submit extends FormButton {
@@ -179,20 +179,12 @@
}
public void evaluateParams() {
- if (value == null) {
- value = "Submit";
- }
- super.evaluateParams();
- }
-
- public void evaluateExtraParams() {
- super.evaluateExtraParams();
- /* if (value == null) {
+ if (value == null) {
value = "Submit";
- }*/
+ }
- //super.evaluateParams();
+ super.evaluateParams();
if (null != src) {
addParameter("src", findString(src));
@@ -231,7 +223,7 @@
/**
* The id of the HTML element to place the result (this can the the form's id or any id on the page.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setResultDivId(String resultDivId) {
this.resultDivId = resultDivId;
@@ -239,7 +231,7 @@
/**
* Javascript code that will be executed after the form has been submitted. The format is onLoadJS='yourMethodName(data,type)'. NOTE: the words data and type must be left like that if you want the event type and the returned data.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setOnLoadJS(String onLoadJS) {
this.onLoadJS = onLoadJS;
@@ -247,7 +239,7 @@
/**
* Topic names to post an event to after the form has been submitted.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setNotifyTopics(String notifyTopics) {
this.notifyTopics = notifyTopics;
@@ -255,7 +247,7 @@
/**
* Set listenTopics attribute.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setListenTopics(String listenTopics) {
this.listenTopics = listenTopics;
@@ -263,7 +255,7 @@
/**
* Javascript code that will be executed before invokation. The format is preInvokeJS='yourMethodName(data,type)'.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setPreInvokeJS(String preInvokeJS) {
this.preInvokeJS = preInvokeJS;
@@ -271,7 +263,7 @@
/**
* Supply a submit button text apart from submit value. Will have no effect for <i>input</i> type submit, since button text will always be the value parameter. For the type <i>image</i>, alt parameter will be set to this value.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setLabel(String label) {
super.setLabel(label);
@@ -279,7 +271,7 @@
/**
* Supply an image src for <i>image</i> type submit button. Will have no effect for types <i>input</i> and <i>button</i>.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setSrc(String src) {
this.src = src;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java Sun Sep 3 00:54:09 2006
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* <!-- START SNIPPET: javadoc -->
@@ -37,24 +38,24 @@
* <!-- END SNIPPET: exdesc -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:tabbedPanel id="test2" theme="simple" >
- * <s:panel id="left" tabName="left" theme="ajax">
+ * <a:tabbedPanel id="test2" theme="simple" >
+ * <a:panel id="left" tabName="left" theme="ajax">
* This is the left pane<br/>
- * <s:form >
- * <s:textfield name="tt" label="Test Text" /> <br/>
- * <s:textfield name="tt2" label="Test Text2" />
- * </s:form>
- * </s:panel>
- * <s:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax" tabName="remote one" />
- * <s:panel id="middle" tabName="middle" theme="ajax">
+ * <a:form >
+ * <a:textfield name="tt" label="Test Text" /> <br/>
+ * <a:textfield name="tt2" label="Test Text2" />
+ * </a:form>
+ * </a:panel>
+ * <a:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax" tabName="remote one" />
+ * <a:panel id="middle" tabName="middle" theme="ajax">
* middle tab<br/>
- * <s:form >
- * <s:textfield name="tt" label="Test Text44" /> <br/>
- * <s:textfield name="tt2" label="Test Text442" />
- * </s:form>
- * </s:panel>
- * <s:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right" />
- * </s:tabbedPanel>
+ * <a:form >
+ * <a:textfield name="tt" label="Test Text44" /> <br/>
+ * <a:textfield name="tt2" label="Test Text442" />
+ * </a:form>
+ * </a:panel>
+ * <a:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right" />
+ * </a:tabbedPanel>
* <!-- END SNIPPET: example -->
* </pre>
*
@@ -68,10 +69,10 @@
*
* <pre>
* <!-- START SNIPPET: example2 -->
- * <link rel="stylesheet" type="text/css" href="<s:url value="/struts/tabs.css"/>">
- * <link rel="stylesheet" type="text/css" href="<s:url value="/struts/niftycorners/niftyCorners.css"/>">
- * <link rel="stylesheet" type="text/css" href="<s:url value="/struts/niftycorners/niftyPrint.css"/>" media="print">
- * <script type="text/javascript" src="<s:url value="/struts/niftycorners/nifty.js"/>"></script>
+ * <link rel="stylesheet" type="text/css" href="<a:url value="/struts/tabs.css"/>">
+ * <link rel="stylesheet" type="text/css" href="<a:url value="/struts/niftycorners/niftyCorners.css"/>">
+ * <link rel="stylesheet" type="text/css" href="<a:url value="/struts/niftycorners/niftyPrint.css"/>" media="print">
+ * <script type="text/javascript" src="<a:url value="/struts/niftycorners/nifty.js"/>"></script>
* <script type="text/javascript">
* dojo.event.connect(window, "onload", function() {
* if (!NiftyCheck())
@@ -88,7 +89,7 @@
*
* @see Panel
*
- * @s.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TabbedPanelTag"
+ * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TabbedPanelTag"
* description="Render a tabbedPanel widget."
*/
public class TabbedPanel extends ClosingUIBean {
@@ -146,7 +147,7 @@
/**
* The id to assign to the component.
- * @s.tagattribute required="true" type="String"
+ * @a2.tagattribute required="true" type="String"
*/
public void setId(String id) {
// This is required to override tld generation attributes to required=true
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java Sun Sep 3 00:54:09 2006
@@ -66,7 +66,7 @@
* <pre>
* <!-- START SNIPPET: exdescription -->
*
- * Accessing messages from a given bundle (the i18n Shop example bundle in the first example) and using bundle defined through the framework in the second example.</p>
+ * Accessing messages from a given bundle (the i18n Shop example bundle in the first example) and using bundle defined through ww in the second example.</p>
*
* <!-- END SNIPPET: exdescription -->
* </pre>
@@ -75,17 +75,12 @@
* <!-- START SNIPPET: example -->
*
* <!-- First Example -->
- * <s:i18n name="struts.action.test.i18n.Shop">
- * <s:text name="main.title"/>
- * </s:i18n>
+ * <a:i18n name="struts.action.test.i18n.Shop">
+ * <a:text name="main.title"/>
+ * </a:i18n>
*
* <!-- Second Example -->
- * <s:text name="main.title" />
- *
- * <!-- Third Examlpe -->
- * <s:text name="i18n.label.greetings">
- * <s:param >Mr Smith</s:param>
- * </s:text>
+ * <a:text name="main.title" />
*
* <!-- END SNIPPET: example -->
* </pre>
@@ -94,20 +89,20 @@
* <pre>
* <!-- START SNIPPET: i18nExample -->
*
- * <-- Fourth Example -->
- * <s:text name="some.key" />
+ * <-- Third Example -->
+ * <a:text name="some.key" />
*
- * <-- Fifth Example -->
- * <s:text name="some.invalid.key" >
+ * <-- Fourth Example -->
+ * <a:text name="some.invalid.key" >
* The Default Message That Will Be Displayed
- * </s:text>
+ * </a:text>
*
* <!-- END SNIPPET: i18nExample -->
* </pre>
*
* @see Param
*
- * @s.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.TextTag"
+ * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.TextTag"
* description="Render a I18n text message."
*/
public class Text extends Component implements Param.UnnamedParametric {
@@ -123,7 +118,7 @@
/**
* Name of resource property to fetch
- * @s.tagattribute required="true"
+ * @a2.tagattribute required="true"
*/
public void setName(String name) {
this.name = name;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render HTML textarea tag.</p>
@@ -31,13 +31,13 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <s:textarea label="Comments" name="comments" cols="30" rows="8"/>
+ * <a:textarea label="Comments" name="comments" cols="30" rows="8"/>
* <!-- END SNIPPET: example -->
* </pre>
*
* @see TabbedPanel
*
- * @s.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextareaTag"
+ * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextareaTag"
* description="Render HTML textarea tag."
*/
public class TextArea extends UIBean {
@@ -78,7 +78,7 @@
/**
* HTML cols attribute
- * @s.tagattribute required="false" type="Integer"
+ * @a2.tagattribute required="false" type="Integer"
*/
public void setCols(String cols) {
this.cols = cols;
@@ -86,7 +86,7 @@
/**
* Whether the textarea is readonly
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setReadonly(String readonly) {
this.readonly = readonly;
@@ -94,7 +94,7 @@
/**
* HTML rows attribute
- * @s.tagattribute required="false" type="Integer"
+ * @a2.tagattribute required="false" type="Integer"
*/
public void setRows(String rows) {
this.rows = rows;
@@ -102,7 +102,7 @@
/**
* HTML wrap attribute
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setWrap(String wrap) {
this.wrap = wrap;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
* Render an HTML input field of type text</p>
@@ -35,11 +35,11 @@
* <!-- END SNIPPET: exdescription -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:textfield label="%{text('user_name')}" name="user" />
+ * <a:textfield label="%{text('user_name')}" name="user" />
* <!-- END SNIPPET: example -->
* </pre>
*
- * @s.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextFieldTag"
+ * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextFieldTag"
* description="Render an HTML input field of type text"
*/
public class TextField extends UIBean {
@@ -79,7 +79,7 @@
/**
* HTML maxlength attribute
- * @s.tagattribute required="false" type="Integer"
+ * @a2.tagattribute required="false" type="Integer"
*/
public void setMaxlength(String maxlength) {
this.maxlength = maxlength;
@@ -87,7 +87,7 @@
/**
* Deprecated. Use maxlength instead.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setMaxLength(String maxlength) {
this.maxlength = maxlength;
@@ -95,7 +95,7 @@
/**
* Whether the input is readonly
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setReadonly(String readonly) {
this.readonly = readonly;
@@ -103,7 +103,7 @@
/**
* HTML size attribute
- * @s.tagattribute required="false" type="Integer"
+ * @a2.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/TimePicker.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java Sun Sep 3 00:54:09 2006
@@ -112,7 +112,7 @@
/**
* The format to use for time field.
- * @s.tagattribute required="false" type="String" default="Dateformat specified by language preset (%Y/%m/%d for en)"
+ * @a2.tagattribute required="false" type="String" default="Dateformat specified by language preset (%Y/%m/%d for en)"
*/
public void setFormat(String format) {
this.format = format;
@@ -120,7 +120,7 @@
/**
* The time picker icon path
- * @s.tagattribute required="false" type="String" default="/struts/dojo/struts/widgets/dateIcon.gif"
+ * @a2.tagattribute required="false" type="String" default="/struts/dojo/struts/widgets/dateIcon.gif"
*/
public void setTimeIconPath(String timeIconPath) {
this.timeIconPath = timeIconPath;
@@ -128,7 +128,7 @@
/**
* The time picker template path.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setTemplatePath(String templatePath) {
this.templatePath = templatePath;
@@ -136,7 +136,7 @@
/**
* The time picker template css path.
- * @s.tagattribute required="false" type="String"
+ * @a2.tagattribute required="false" type="String"
*/
public void setTemplateCssPath(String templateCssPath) {
this.templateCssPath = templateCssPath;
@@ -144,7 +144,7 @@
/**
* The time picker text field size.
- * @s.tagattribute required="false" type="String"
+ * @a2.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/Token.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java Sun Sep 3 00:54:09 2006
@@ -17,19 +17,21 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.util.TokenHelper;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
+
+import org.apache.struts2.util.TokenHelper;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* <!-- START SNIPPET: javadoc -->
* Stop double-submission of forms.</p>
*
* The token tag is used to help with the "double click" submission problem. It is needed if you are using the
- * TokenInterceptor or the TokenSessionInterceptor. The s:token tag merely places a hidden element that contains
+ * TokenInterceptor or the TokenSessionInterceptor. The a:token tag merely places a hidden element that contains
* the unique token.</p>
* <!-- END SNIPPET: javadoc -->
*
@@ -37,14 +39,14 @@
*
* <pre>
* <!-- START SNIPPET: example -->
- * <s:token />
+ * <a:token />
* <!-- END SNIPPET: example -->
* </pre>
*
* @see org.apache.struts2.interceptor.TokenInterceptor
* @see org.apache.struts2.interceptor.TokenSessionStoreInterceptor
*
- * @s.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TokenTag"
+ * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TokenTag"
* description="Stop double-submission of forms"
*/
public class Token extends UIBean {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,12 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.io.Writer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* <!-- START SNIPPET: javadoc -->
@@ -39,17 +40,17 @@
* <!-- START SNIPPET: example -->
*
* <-- statically -->
- * <s:tree id="..." label="...">
- * <s:treenode id="..." label="..." />
- * <s:treenode id="..." label="...">
- * <s:treenode id="..." label="..." />
- * <s:treenode id="..." label="..." />
- * &;lt;/s:treenode>
- * <s:treenode id="..." label="..." />
- * </s:tree>
+ * <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 -->
- * <s:tree
+ * <saf:tree
* id="..."
* rootNode="..."
* nodeIdProperty="..."
@@ -60,7 +61,7 @@
* </pre>
*
*
- * @s.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeTag"
+ * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeTag"
* description="Render a tree widget."
*/
public class Tree extends ClosingUIBean {
@@ -220,7 +221,7 @@
/**
* The toggle property (either 'explode' or 'fade'). Default is 'fade'.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setToggle(String toggle) {
this.toggle = toggle;
@@ -232,7 +233,7 @@
/**
* The treeSelectedTopic property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTreeSelectedTopic(String treeSelectedTopic) {
this.treeSelectedTopic = treeSelectedTopic;
@@ -244,7 +245,7 @@
/**
* The treeExpandedTopic property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTreeExpandedTopic(String treeExpandedTopic) {
this.treeExpandedTopic = treeExpandedTopic;
@@ -256,7 +257,7 @@
/**
* The treeCollapsedTopic property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTreeCollapsedTopic(String treeCollapsedTopic) {
this.treeCollapsedTopic = treeCollapsedTopic;
@@ -268,7 +269,7 @@
/**
* The rootNode property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setRootNode(String rootNode) {
this.rootNodeAttr = rootNode;
@@ -280,7 +281,7 @@
/**
* The childCollectionProperty property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setChildCollectionProperty(String childCollectionProperty) {
this.childCollectionProperty = childCollectionProperty;
@@ -292,7 +293,7 @@
/**
* The nodeTitleProperty property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setNodeTitleProperty(String nodeTitleProperty) {
this.nodeTitleProperty = nodeTitleProperty;
@@ -304,7 +305,7 @@
/**
* The nodeIdProperty property.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setNodeIdProperty(String nodeIdProperty) {
this.nodeIdProperty = nodeIdProperty;
@@ -312,7 +313,7 @@
/**
* The showRootGrid property (default true).
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setShowRootGrid(String showRootGrid) {
this.showRootGrid = showRootGrid;
@@ -328,7 +329,7 @@
/**
* Blank icon image source.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setBlankIconSrc(String blankIconSrc) {
this.blankIconSrc = blankIconSrc;
@@ -340,7 +341,7 @@
/**
* Expand icon (-) image source.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setExpandIconSrcMinus(String expandIconSrcMinus) {
this.expandIconSrcMinus = expandIconSrcMinus;
@@ -352,7 +353,7 @@
/**
* Expand Icon (+) image source.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setExpandIconSrcPlus(String expandIconSrcPlus) {
this.expandIconSrcPlus = expandIconSrcPlus;
@@ -364,7 +365,7 @@
/**
* Image source for under child item child icons.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcC(String gridIconSrcC) {
this.gridIconSrcC = gridIconSrcC;
@@ -377,7 +378,7 @@
/**
* Image source for last child grid.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcL(String gridIconSrcL) {
this.gridIconSrcL = gridIconSrcL;
@@ -389,7 +390,7 @@
/**
* Image source for under parent item child icons.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcP(String gridIconSrcP) {
this.gridIconSrcP = gridIconSrcP;
@@ -401,7 +402,7 @@
/**
* Image source for vertical line.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcV(String gridIconSrcV) {
this.gridIconSrcV = gridIconSrcV;
@@ -413,7 +414,7 @@
/**
* Image source for grid for sole root item.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcX(String gridIconSrcX) {
this.gridIconSrcX = gridIconSrcX;
@@ -425,7 +426,7 @@
/**
* Image source for grid for last root item.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setGridIconSrcY(String gridIconSrcY) {
this.gridIconSrcY = gridIconSrcY;
@@ -438,7 +439,7 @@
/**
* Icon height (default 18 pixels).
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setIconHeight(String iconHeight) {
this.iconHeight = iconHeight;
@@ -450,7 +451,7 @@
/**
* Icon width (default 19 pixels).
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setIconWidth(String iconWidth) {
this.iconWidth = iconWidth;
@@ -464,7 +465,7 @@
/**
* Template css path (default {contextPath}/struts/tree.css.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTemplateCssPath(String templateCssPath) {
this.templateCssPath = templateCssPath;
@@ -476,7 +477,7 @@
/**
* Toggle duration (default 150 ms)
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setToggleDuration(String toggleDuration) {
this.toggleDuration = toggleDuration;
@@ -488,7 +489,7 @@
/**
* Show grid (default true).
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setShowGrid(String showGrid) {
this.showGrid = showGrid;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java Sun Sep 3 00:54:09 2006
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* <!-- START SNIPPET: javadoc -->
*
@@ -52,17 +52,17 @@
* <!-- START SNIPPET: example -->
*
* <-- statically -->
- * <s:tree id="..." label="...">
- * <s:treenode id="..." label="..." />
- * <s:treenode id="..." label="...">
- * <s:treenode id="..." label="..." />
- * <s:treenode id="..." label="..." />
- * &;lt;/s:treenode>
- * <s:treenode id="..." label="..." />
- * </s:tree>
+ * <ww:tree id="..." label="...">
+ * <ww:treenode id="..." label="..." />
+ * <ww:treenode id="..." label="...">
+ * <ww:treenode id="..." label="..." />
+ * <ww:treenode id="..." label="..." />
+ * &;lt;/ww:treenode>
+ * <ww:treenode id="..." label="..." />
+ * </ww:tree>
*
* <-- dynamically -->
- * <s:tree
+ * <ww:tree
* id="..."
* rootNode="..."
* nodeIdProperty="..."
@@ -73,7 +73,7 @@
* </pre>
*
*
- * @s.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeNodeTag"
+ * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeNodeTag"
* description="Render a tree node within a tree widget."
*/
public class TreeNode extends ClosingUIBean {
@@ -94,7 +94,7 @@
/**
* Label expression used for rendering tree node label.
- * @s.tagattribute required="true"
+ * @a2.tagattribute required="true"
*/
public void setLabel(String label) {
super.setLabel(label);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Sun Sep 3 00:54:09 2006
@@ -17,6 +17,17 @@
*/
package org.apache.struts2.components;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.components.template.Template;
import org.apache.struts2.components.template.TemplateEngine;
@@ -24,18 +35,9 @@
import org.apache.struts2.components.template.TemplateRenderingContext;
import org.apache.struts2.config.Settings;
import org.apache.struts2.views.util.ContextUtil;
+
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
/**
* UIBean is the standard superclass of all Struts UI componentns.
@@ -332,50 +334,50 @@
* <!-- START SNIPPET: tooltipexample -->
*
* <!-- Example 1: -->
- * <s:form
+ * <a:form
* tooltipConfig="#{'tooltipDelay':'500',
* 'tooltipIcon='/myImages/myIcon.gif'}" .... >
* ....
- * <s:textfield label="Customer Name" tooltip="Enter the customer name" .... />
+ * <a:textfield label="Customer Name" tooltip="Enter the customer name" .... />
* ....
- * </s:form>
+ * </a:form>
*
* <!-- Example 2: -->
- * <s:form
+ * <a:form
* tooltipConfig="#{'tooltipDelay':'500',
* 'tooltipIcon':'/myImages/myIcon.gif'}" ... >
* ....
- * <s:textfield label="Address"
+ * <a:textfield label="Address"
* tooltip="Enter your address"
* tooltipConfig="#{'tooltipDelay':'5000'}" />
* ....
- * </s:form>
+ * </a:form>
*
*
* <-- Example 3: -->
- * <s:textfield
+ * <a:textfield
* label="Customer Name"
* tooltip="One of our customer Details'">
- * <s:param name="tooltipConfig">
+ * <a:param name="tooltipConfig">
* tooltipDelay = 500 |
* tooltipIcon = /myImages/myIcon.gif
- * </s:param>
- * </s:textfield>
+ * </a:param>
+ * </a:textfield>
*
*
* <-- Example 4: -->
- * <s:textfield
+ * <a:textfield
* label="Customer Address"
* tooltip="Enter The Customer Address" >
- * <s:param
+ * <a:param
* name="tooltipConfig"
* value="#{'tooltipDelay':'500',
* 'tooltipIcon':'/myImages/myIcon.gif'}" />
- * </s:textfield>
+ * </a:textfield>
*
*
* <-- Example 5: -->
- * <s:textfield
+ * <a:textfield
* label="Customer Telephone Number"
* tooltip="Enter customer Telephone Number"
* tooltipConfig="#{'tooltipDelay':'500',
@@ -689,8 +691,18 @@
final Form form = (Form) findAncestor(Form.class);
- // create HTML id element
- populateComponentHtmlId(form);
+ if (id != null) {
+ // this check is needed for backwards compatibility with 2.1.x
+ if (altSyntax()) {
+ addParameter("id", findString(id));
+ } else {
+ addParameter("id", id);
+ }
+ } else if (form != null) {
+ addParameter("id", form.getParameters().get("id") + "_" + escape(name));
+ } else {
+ addParameter("id", escape(name));
+ }
if (form != null ) {
addParameter("form", form.getParameters());
@@ -805,38 +817,10 @@
return tooltipConfig;
}
- /**
- * Create HTML id element for the component and populate this component parmaeter
- * map.
- *
- * The order is as follows :-
- * <ol>
- * <li>This component id attribute</li>
- * <li>[containing_form_id]_[this_component_name]</li>
- * <li>[this_component_name]</li>
- * </ol>
- *
- * @param form
- */
- protected void populateComponentHtmlId(Form form) {
- if (id != null) {
- // this check is needed for backwards compatibility with 2.1.x
- if (altSyntax()) {
- addParameter("id", findString(id));
- } else {
- addParameter("id", id);
- }
- } else if (form != null) {
- addParameter("id", form.getParameters().get("id") + "_" + escape(name));
- } else {
- addParameter("id", escape(name));
- }
- }
-
/**
* The template directory.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTemplateDir(String templateDir) {
this.templateDir = templateDir;
@@ -844,7 +828,7 @@
/**
* The theme (other than default) to use for rendering the element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTheme(String theme) {
this.theme = theme;
@@ -856,7 +840,7 @@
/**
* The template (other than default) to use for rendering the element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTemplate(String template) {
this.template = template;
@@ -864,7 +848,7 @@
/**
* The css class to use for element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setCssClass(String cssClass) {
this.cssClass = cssClass;
@@ -872,7 +856,7 @@
/**
* The css style definitions for element ro use
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setCssStyle(String cssStyle) {
this.cssStyle = cssStyle;
@@ -880,7 +864,7 @@
/**
* Set the html title attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTitle(String title) {
this.title = title;
@@ -888,7 +872,7 @@
/**
* Set the html disabled attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setDisabled(String disabled) {
this.disabled = disabled;
@@ -896,7 +880,7 @@
/**
* Label expression used for rendering a element specific label
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setLabel(String label) {
this.label = label;
@@ -904,7 +888,7 @@
/**
* deprecated.
- * @s.tagattribute required="false" default="left"
+ * @a2.tagattribute required="false" default="left"
* @deprecated please use {@link #setLabelposition(String)} instead
*/
public void setLabelPosition(String labelPosition) {
@@ -913,7 +897,7 @@
/**
* define label position of form element (top/left)
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setLabelposition(String labelPosition) {
this.labelPosition = labelPosition;
@@ -921,7 +905,7 @@
/**
* define required position of required form element (left|right)
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setRequiredposition(String requiredposition) {
this.requiredposition = requiredposition;
@@ -929,7 +913,7 @@
/**
* The name to set for element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setName(String name) {
this.name = name;
@@ -937,7 +921,7 @@
/**
* If set to true, the rendered element will indicate that input is required
- * @s.tagattribute required="false" type="Boolean" default="false"
+ * @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setRequired(String required) {
this.required = required;
@@ -945,7 +929,7 @@
/**
* Set the html tabindex attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setTabindex(String tabindex) {
this.tabindex = tabindex;
@@ -953,7 +937,7 @@
/**
* Preset the value of input element.
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setValue(String value) {
this.value = value;
@@ -961,7 +945,7 @@
/**
* Set the html onclick attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnclick(String onclick) {
this.onclick = onclick;
@@ -969,7 +953,7 @@
/**
* Set the html ondblclick attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOndblclick(String ondblclick) {
this.ondblclick = ondblclick;
@@ -977,7 +961,7 @@
/**
* Set the html onmousedown attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnmousedown(String onmousedown) {
this.onmousedown = onmousedown;
@@ -985,7 +969,7 @@
/**
* Set the html onmouseup attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnmouseup(String onmouseup) {
this.onmouseup = onmouseup;
@@ -993,7 +977,7 @@
/**
* Set the html onmouseover attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnmouseover(String onmouseover) {
this.onmouseover = onmouseover;
@@ -1001,7 +985,7 @@
/**
* Set the html onmousemove attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnmousemove(String onmousemove) {
this.onmousemove = onmousemove;
@@ -1009,7 +993,7 @@
/**
* Set the html onmouseout attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnmouseout(String onmouseout) {
this.onmouseout = onmouseout;
@@ -1017,7 +1001,7 @@
/**
* Set the html onfocus attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnfocus(String onfocus) {
this.onfocus = onfocus;
@@ -1025,7 +1009,7 @@
/**
* Set the html onblur attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnblur(String onblur) {
this.onblur = onblur;
@@ -1033,7 +1017,7 @@
/**
* Set the html onkeypress attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnkeypress(String onkeypress) {
this.onkeypress = onkeypress;
@@ -1041,7 +1025,7 @@
/**
* Set the html onkeydown attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnkeydown(String onkeydown) {
this.onkeydown = onkeydown;
@@ -1049,7 +1033,7 @@
/**
* Set the html onkeyup attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnkeyup(String onkeyup) {
this.onkeyup = onkeyup;
@@ -1057,7 +1041,7 @@
/**
* Set the html onselect attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnselect(String onselect) {
this.onselect = onselect;
@@ -1065,7 +1049,7 @@
/**
* Set the html onchange attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setOnchange(String onchange) {
this.onchange = onchange;
@@ -1073,7 +1057,7 @@
/**
* Set the html accesskey attribute on rendered html element
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setAccesskey(String accesskey) {
this.accesskey = accesskey;
@@ -1081,7 +1065,7 @@
/**
* Set the tooltip of this particular component
- * @s.tagattribute required="false" type="String" default=""
+ * @a2.tagattribute required="false" type="String" default=""
*/
public void setTooltip(String tooltip) {
this.tooltip = tooltip;
@@ -1089,7 +1073,7 @@
/**
* Set the tooltip configuration
- * @s.tagattribute required="false" type="String" default=""
+ * @a2.tagattribute required="false" type="String" default=""
*/
public void setTooltipConfig(String tooltipConfig) {
this.tooltipConfig = tooltipConfig;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Sun Sep 3 00:54:09 2006
@@ -17,26 +17,25 @@
*/
package org.apache.struts2.components;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.portlet.util.PortletUrlHelper;
import org.apache.struts2.views.util.UrlHelper;
-import org.apache.struts2.dispatcher.Dispatcher;
+
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.XWorkContinuationConfig;
-import com.opensymphony.xwork2.ActionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpUtils;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
/**
* <!-- START SNIPPET: javadoc -->
@@ -81,26 +80,26 @@
* <!-- START SNIPPET: example -->
*
* <-- Example 1 -->
- * <s:url value="editGadget.action">
- * <s:param name="id" value="%{selected}" />
- * </s:url>
+ * <a:url value="editGadget.action">
+ * <a:param name="id" value="%{selected}" />
+ * </a:url>
*
* <-- Example 2 -->
- * <s:url action="editGadget">
- * <s:param name="id" value="%{selected}" />
- * </s:url>
+ * <a:url action="editGadget">
+ * <a:param name="id" value="%{selected}" />
+ * </a:url>
*
* <-- Example 3-->
- * <s:url includeParams="get" >
+ * <a:url includeParams="get" >
* <:param name="id" value="%{'22'}" />
- * </s:url>
+ * </a:url>
*
* <!-- END SNIPPET: example -->
* </pre>
*
* @see Param
*
- * @s.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.URLTag"
+ * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.URLTag"
* description="This tag is used to create a URL"
*/
public class URL extends Component {
@@ -159,10 +158,9 @@
}
if (NONE.equalsIgnoreCase(includeParams)) {
- mergeRequestParameters(value, parameters, Collections.EMPTY_MAP);
ActionContext.getContext().put(XWorkContinuationConfig.CONTINUE_KEY, null);
} else if (ALL.equalsIgnoreCase(includeParams)) {
- mergeRequestParameters(value, parameters, req.getParameterMap());
+ mergeRequestParameters(parameters, req.getParameterMap());
// for ALL also include GET parameters
includeGetParameters();
@@ -182,7 +180,10 @@
private void includeGetParameters() {
if(!(Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest())) {
String query = extractQueryString();
- mergeRequestParameters(value, parameters, UrlHelper.parseQueryString(query));
+ if (query != null) {
+ //mergeRequestParameters(parameters, HttpUtils.parseQueryString(query));
+ mergeRequestParameters(parameters, UrlHelper.parseQueryString(query));
+ }
}
}
@@ -221,14 +222,7 @@
result = PortletUrlHelper.buildResourceUrl(value, parameters);
}
else {
- String _value = value;
-
- // We don't include the request parameters cause they would have been
- // prioritised before this [in start(Writer) method]
- if (_value != null && _value.indexOf("?") > 0) {
- _value = _value.substring(0, _value.indexOf("?"));
- }
- result = UrlHelper.buildUrl(_value, req, res, parameters, scheme, includeContext, encode);
+ result = UrlHelper.buildUrl(value, req, res, parameters, scheme, includeContext, encode);
}
}
if ( anchor != null && anchor.length() > 0 ) {
@@ -254,7 +248,7 @@
/**
* The includeParams attribute may have the value 'none', 'get' or 'all'.
- * @s.tagattribute required="false" default="get"
+ * @a2.tagattribute required="false" default="get"
*/
public void setIncludeParams(String includeParams) {
this.includeParams = includeParams;
@@ -262,7 +256,7 @@
/**
* Set scheme attribute
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setScheme(String scheme) {
this.scheme = scheme;
@@ -270,7 +264,7 @@
/**
* The target value to use, if not using action
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setValue(String value) {
this.value = value;
@@ -278,7 +272,7 @@
/**
* The action generate url for, if not using value
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setAction(String action) {
this.action = action;
@@ -286,7 +280,7 @@
/**
* The namespace to use
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setNamespace(String namespace) {
this.namespace = namespace;
@@ -294,8 +288,7 @@
/**
* The method of action to use
- * @s.tagattribute required="false"
- * @deprecated Since Struts 2.0.0
+ * @a2.tagattribute required="false"
*/
public void setMethod(String method) {
this.method = method;
@@ -303,7 +296,7 @@
/**
* whether to encode parameters
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setEncode(boolean encode) {
this.encode = encode;
@@ -311,7 +304,7 @@
/**
* whether actual context should be included in url
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setIncludeContext(boolean includeContext) {
this.includeContext = includeContext;
@@ -319,7 +312,7 @@
/**
* The resulting portlet mode
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setPortletMode(String portletMode) {
this.portletMode = portletMode;
@@ -327,7 +320,7 @@
/**
* The resulting portlet window state
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setWindowState(String windowState) {
this.windowState = windowState;
@@ -335,7 +328,7 @@
/**
* Specifies if this should be a portlet render or action url
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setPortletUrlType(String portletUrlType) {
this.portletUrlType = portletUrlType;
@@ -343,7 +336,7 @@
/**
* The anchor for this URL
- * @s.tagattribute required="false"
+ * @a2.tagattribute required="false"
*/
public void setAnchor(String anchor) {
this.anchor = anchor;
@@ -352,52 +345,13 @@
/**
* Merge request parameters into current parameters. If a parameter is
- * already present, than the request parameter in the current request and value atrribute
- * will not override its value.
- *
- * The priority is as follows:-
- * <ul>
- * <li>parameter from the current request (least priority)</li>
- * <li>parameter form the value attribute (more priority)</li>
- * <li>parameter from the param tag (most priority)</li>
- * </ul>
+ * already present, than the request parameter will not override its value.
*
- * @param value the value attribute (url to be generated by this component)
* @param parameters component parameters
* @param contextParameters request parameters
*/
- protected void mergeRequestParameters(String value, Map parameters, Map contextParameters){
-
- Map mergedParams = new LinkedHashMap(contextParameters);
-
- // Merge contextParameters (from current request) with parameters specified in value attribute
- // eg. value="someAction.action?id=someId&venue=someVenue"
- // where the parameters specified in value attribute takes priority.
-
- if (value != null && value.trim().length() > 0 && value.indexOf("?") > 0) {
- mergedParams = new LinkedHashMap();
-
- String queryString = value.substring(value.indexOf("?")+1);
-
- mergedParams = UrlHelper.parseQueryString(queryString);
- for (Iterator iterator = contextParameters.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- Object key = entry.getKey();
-
- if (!mergedParams.containsKey(key)) {
- mergedParams.put(key, entry.getValue());
- }
- }
- }
-
-
- // Merge parameters specified in value attribute
- // eg. value="someAction.action?id=someId&venue=someVenue"
- // with parameters specified though param tag
- // eg. <param name="id" value="%{'someId'}" />
- // where parameters specified through param tag takes priority.
-
- for (Iterator iterator = mergedParams.entrySet().iterator(); iterator.hasNext();) {
+ protected void mergeRequestParameters(Map parameters, Map contextParameters){
+ for (Iterator iterator = contextParameters.entrySet().iterator(); iterator.hasNext();) {
Map.Entry entry = (Map.Entry) iterator.next();
Object key = entry.getKey();
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java Sun Sep 3 00:54:09 2006
@@ -43,7 +43,7 @@
* <!-- START SNIPPET: example -->
*
* <!-- Example 1: simple example -->
- * <s:updownselect
+ * <a:updownselect
* list="#{'england':'England', 'america':'America', 'germany':'Germany'}"
* name="prioritisedFavouriteCountries"
* headerKey="-1"
@@ -51,7 +51,7 @@
* emptyOption="true" />
*
* <!-- Example 2: more complex example -->
- * <s:updownselect
+ * <a:updownselect
* list="defaultFavouriteCartoonCharacters"
* name="prioritisedFavouriteCartoonCharacters"
* headerKey="-1"
@@ -69,7 +69,7 @@
*
* @version $Date$ $Id$
*
- * @s.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.UpDownSelectTag"
+ * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.UpDownSelectTag"
* description="Render a up down select element"
*/
public class UpDownSelect extends Select {
@@ -148,7 +148,7 @@
ancestorForm.getParameters().put("updownselectIds", m);
}
else {
- _log.warn("no ancestor form found for updownselect "+this+", therefore autoselect of all elements upon form submission will not work ");
+ _log.warn("no ancestor form found for updownselect "+this+", therefore autoselect of all elements unpon form submission will not work ");
}
}
@@ -158,7 +158,7 @@
}
/**
* Whether move up button should be displayed
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setAllowMoveUp(String allowMoveUp) {
this.allowMoveUp = allowMoveUp;
@@ -171,7 +171,7 @@
}
/**
* Whether move down button should be displayed
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setAllowMoveDown(String allowMoveDown) {
this.allowMoveDown = allowMoveDown;
@@ -184,7 +184,7 @@
}
/**
* Whether or not select all button should be displayed
- * @s.tagattribute required="false" type="Boolean" default="true"
+ * @a2.tagattribute required="false" type="Boolean" default="true"
*/
public void setAllowSelectAll(String allowSelectAll) {
this.allowSelectAll = allowSelectAll;
@@ -196,7 +196,7 @@
}
/**
* Text to display on the move up button
- * @s.tagattribute required="false" type="String" default="^"
+ * @a2.tagattribute required="false" type="String" default="^"
*/
public void setMoveUpLabel(String moveUpLabel) {
this.moveUpLabel = moveUpLabel;
@@ -209,7 +209,7 @@
}
/**
* Text to display on the move down button
- * @s.tagattribute required="false" type="String" default="v"
+ * @a2.tagattribute required="false" type="String" default="v"
*/
public void setMoveDownLabel(String moveDownLabel) {
this.moveDownLabel = moveDownLabel;
@@ -222,7 +222,7 @@
}
/**
* Text to display on the select all button
- * @s.tagattribute required="false" type="String" default="*"
+ * @a2.tagattribute required="false" type="String" default="*"
*/
public void setSelectAllLabel(String selectAllLabel) {
this.selectAllLabel = selectAllLabel;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java Sun Sep 3 00:54:09 2006
@@ -17,10 +17,11 @@
*/
package org.apache.struts2.components.table;
+import java.util.Vector;
+
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
-import java.util.Vector;
/**
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java?rev=439738&r1=439737&r2=439738&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java Sun Sep 3 00:54:09 2006
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.components.table;
-import javax.swing.*;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.TableModel;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collections;
+
+import javax.swing.JTable;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
/**