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 2007/05/22 14:13:02 UTC

svn commit: r540552 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java site/resources/tags/sort.html site/resources/tags/subset.html

Author: mrdon
Date: Tue May 22 05:13:00 2007
New Revision: 540552

URL: http://svn.apache.org/viewvc?view=rev&rev=540552
Log:
Restoring the 'id' attribute to the sort and subset tags in the tld
WW-1905

Modified:
    struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
    struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/sort.html
    struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/subset.html

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java?view=diff&rev=540552&r1=540551&r2=540552
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java Tue May 22 05:13:00 2007
@@ -25,6 +25,7 @@
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts2.util.FastByteArrayOutputStream;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.util.ContextUtil;
 
 import com.opensymphony.xwork2.util.ValueStack;
@@ -38,10 +39,7 @@
 
     private static final long serialVersionUID = -1201668454354226175L;
 
-    /**
-     * @s.tagattribute required="false" type="String"
-     * description="The id of the tag element."
-     */
+    @StrutsTagAttribute(required=false,description="The id of the tag element")
     public void setId(String string) {
         super.setId(string);
     }

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/sort.html
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/sort.html?view=diff&rev=540552&r1=540551&r2=540552
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/sort.html (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/sort.html Tue May 22 05:13:00 2007
@@ -36,6 +36,14 @@
 					<td align="left" valign="top">The comparator to use</td>
 				</tr>
 				<tr>
+					<td align="left" valign="top">id</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The id of the tag element</td>
+				</tr>
+				<tr>
 					<td align="left" valign="top">source</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/subset.html
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/subset.html?view=diff&rev=540552&r1=540551&r2=540552
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/subset.html (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/subset.html Tue May 22 05:13:00 2007
@@ -44,6 +44,14 @@
 					<td align="left" valign="top">Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator</td>
 				</tr>
 				<tr>
+					<td align="left" valign="top">id</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The id of the tag element</td>
+				</tr>
+				<tr>
 					<td align="left" valign="top">source</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>