diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index c02e9ae4b..a96d770f0 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -46,17 +46,17 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; *

This tag is used to create a URL.

* *

You can use the <param> tag inside the body to provide - * additional request parameters. If the value of a param is an Array or + * additional request parameters. If the value of a param is an Array or * an Iterable all the values will be added to the URL.

* * NOTE: *

By default request parameters will be separated using escaped ampersands (i.e., &amp;). * This is necessary for XHTML compliance, however, when using the URL generated by this tag * with the <s:property> tag, the escapeAmp attribute should be used to disable - * ampersand escaping.

- * + * ampersand escaping.

+ * * NOTE: - *

When includeParams is 'all' or 'get', the parameter defined in a <param> + *

When includeParams is 'all' or 'get', the parameter defined in a <param> * tag will take precedence over any params included due to the includeParams attribute. For * example, in Example 3 below, if there is a id parameter in the url where the page this * tag is included like http://<host>:<port>/<context>/editUser.action?id=3333&name=John @@ -163,7 +163,7 @@ public class URL extends ContextBean { public void setUrlIncludeParams(String urlIncludeParams) { this.urlIncludeParams = urlIncludeParams; } - + @Inject public void setUrlRenderer(UrlRenderer urlRenderer) { this.urlRenderer = urlRenderer; @@ -185,7 +185,7 @@ public class URL extends ContextBean { return super.end(writer, body); } - @StrutsTagAttribute(description="The includeParams attribute may have the value 'none', 'get' or 'all'", defaultValue="get") + @StrutsTagAttribute(description="The includeParams attribute may have the value 'none', 'get' or 'all'", defaultValue="none") public void setIncludeParams(String includeParams) { this.includeParams = includeParams; } @@ -244,7 +244,7 @@ public class URL extends ContextBean { public void setAnchor(String anchor) { this.anchor = anchor; } - + @StrutsTagAttribute(description="Specifies whether to escape ampersand (&) to (&amp;) or not", type="Boolean", defaultValue="true") public void setEscapeAmp(boolean escapeAmp) { this.escapeAmp = escapeAmp;