svn commit: r722331 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java

[davenewton]

Author: davenewton
Date: Mon Dec  1 18:04:42 2008
New Revision: 722331

URL: http://svn.apache.org/viewvc?rev=722331&view=rev
Log:
Updated URL component's default value documentation to reflect WW-2901 change; 
now "none".

I don't think I like this lack of cohesion in cases like this; if the default 
value is coming from a default configuration file then documenting it manually 
with @StrutsTagAttribute seems dangerous and potentially misleading.

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java

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=722331&r1=722330&r2=722331&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 
Mon Dec  1 18:04:42 2008
@@ -46,17 +46,17 @@
  * <p>This tag is used to create a URL.</p>
  *
  * <p>You can use the &lt;param&gt; 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.</p>
  *
  * <b>NOTE:</b>
  * <p>By default request parameters will be separated using escaped ampersands 
(i.e., &amp;amp;).
  * This is necessary for XHTML compliance, however, when using the URL 
generated by this tag
  * with the &lt;s:property&gt; tag, the <b>escapeAmp</b> attribute should be 
used to disable
- * ampersand escaping.</p> 
- * 
+ * ampersand escaping.</p>
+ *
  * <b>NOTE:</b>
- * <p>When includeParams is 'all' or 'get', the parameter defined in a 
&lt;param&gt; 
+ * <p>When includeParams is 'all' or 'get', the parameter defined in a 
&lt;param&gt;
  * 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://&lt;host&gt;:&lt;port&gt;/&lt;context&gt;/editUser.action?id=3333&name=John
@@ -163,7 +163,7 @@
     public void setUrlIncludeParams(String urlIncludeParams) {
         this.urlIncludeParams = urlIncludeParams;
     }
-    
+
     @Inject
        public void setUrlRenderer(UrlRenderer urlRenderer) {
                this.urlRenderer = urlRenderer;
@@ -185,7 +185,7 @@
         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 void setAnchor(String anchor) {
         this.anchor = anchor;
     }
-    
+
     @StrutsTagAttribute(description="Specifies whether to escape ampersand 
(&amp;) to (&amp;amp;) or not", type="Boolean", defaultValue="true")
     public void setEscapeAmp(boolean escapeAmp) {
         this.escapeAmp = escapeAmp;