Author: musachy
Date: Wed Jul 11 08:25:29 2007
New Revision: 555302
URL: http://svn.apache.org/viewvc?view=rev&rev=555302
Log:
WW-2027 Tags that push values into the value stack should use the "var"
attribute to specify the name of the variable
* Use 'var' instead of 'id' on examples
Modified:
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/ComboBox.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/MergeIterator.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/views/jsp/iterator/SortIteratorTag.java
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -100,7 +100,7 @@
* <!-- END SNIPPET: code -->
*
* <!-- START SNIPPET: example -->
- * <s:append id="myAppendIterator">
+ * <s:append var="myAppendIterator">
* <s:param value="%{myList1}" />
* <s:param value="%{myList2}" />
* <s:param value="%{myList3}" />
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -38,7 +38,7 @@
* <p>Instantiates a class that conforms to the JavaBeans specification. This
tag has a body which can contain
* a number of [EMAIL PROTECTED] Param} elements to set any mutator methods on
that class.</p>
* <p/>
- * <p>If the id attribute is set on the BeanTag, it will place the
instantiated bean into the
+ * <p>If the var attribute is set on the BeanTag, it will place the
instantiated bean into the
* stack's Context.</p>
* <p/>
* <!-- END SNIPPET: javadoc -->
@@ -46,7 +46,7 @@
*
* <!-- START SNIPPET: params -->
* <ul>
- * <li>id - the stack's context id (if supplied) that the created bean
will be store under</li>
+ * <li>var - the stack's context name (if supplied) that the created bean
will be store under</li>
* <li>name* - the class name of the bean to be instantiated (must
respect JavaBean specification)</li>
* </ul>
* <!-- END SNIPPET: params -->
@@ -57,13 +57,13 @@
* <pre>
* <!-- START SNIPPET: examples -->
* <-- in freemarker form -->
- * [EMAIL PROTECTED] name="org.apache.struts2.example.counter.SimpleCounter"
id="counter"]
+ * [EMAIL PROTECTED] name="org.apache.struts2.example.counter.SimpleCounter"
var="counter"]
* [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 -->
- * <s:bean name="org.apache.struts2.example.counter.SimpleCounter"
id="counter">
+ * <s:bean name="org.apache.struts2.example.counter.SimpleCounter"
var="counter">
* <s:param name="foo" value="BAR" />
* The value of foot is : <s:property value="foo"/>, when inside the
bean tag <br />
* </s:bean>
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -55,7 +55,7 @@
* <!-- START SNIPPET: example -->
* JSP:
* <-- Example One -->
- * <s:bean name="struts.util.Counter" id="year">
+ * <s:bean name="struts.util.Counter" var="year">
* <s:param name="first" value="text('firstBirthYear')"/>
* <s:param name="last" value="2000"/>
*
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -81,7 +81,7 @@
* <pre>
* <!-- START SNIPPET: example2code -->
*
- * <s:bean name="org.apache.struts2.example.IteratorExample" id="it">
+ * <s:bean name="org.apache.struts2.example.IteratorExample" var="it">
* <s:param name="day" value="'foo'"/>
* <s:param name="day" value="'bar'"/>
* </s:bean>
@@ -145,12 +145,12 @@
* <pre>
* <!-- START SNIPPET: example4code -->
*
- * <s:action name="entries" id="entries"/>
+ * <s:action name="entries" var="entries"/>
* <s:iterator value="#entries.entries" >
* <s:property value="name" />
* <s:property />
* <s:push value="...">
- * <s:action name="edit" id="edit" >
+ * <s:action name="edit" var="edit" >
* <s:param name="entry" value="[0]" />
* </s:action>
* </push>
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -110,7 +110,7 @@
* <!-- END SNIPPET: javacode -->
*
* <!-- START SNIPPET: example -->
- * <s:merge id="myMergedIterator1">
+ * <s:merge var="myMergedIterator1">
* <s:param value="%{myList1}" />
* <s:param value="%{myList2}" />
* <s:param value="%{myList3}" />
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -58,7 +58,7 @@
* <pre>
* <!-- START SNIPPET: example2 -->
* <s:push value="myObject"> ----- (1)
- * <s:bean name="jp.SomeBean" id="myBean"/> ----- (2)
+ * <s:bean name="jp.SomeBean" var="myBean"/> ----- (2)
* <s:param name="myParam" value="top"/> ----- (3)
* </s:bean>
* </s:push>
@@ -76,7 +76,7 @@
* <pre>
* <!-- START SNIPPET: example3 -->
* <s:push value="myObject"> ---(A)
- * <s:bean name="jp.SomeBean" id="myBean"/> ---(B)
+ * <s:bean name="jp.SomeBean" var="myBean"/> ---(B)
* <s:param name="myParam" value="top.mySomeOtherValue"/> ---(C)
* </s:bean>
* </s:push>
@@ -94,7 +94,7 @@
* <pre>
* <!-- START SNIPPET: example4 -->
* <s:push value="myObject"> ---- (i)
- * <s:bean name="jp.SomeBean" id="myBean"/> ---- (ii)
+ * <s:bean name="jp.SomeBean" var="myBean"/> ---- (ii)
* <s:param name="myParam" value="[1].top"/> -----(iii)
* </s:bean>
* </s:push>
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?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
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
Wed Jul 11 08:25:29 2007
@@ -43,7 +43,7 @@
* <!-- END SNIPPET: exdescription -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:action name="GenderMap" id="genders"/>
+ * <s:action name="GenderMap" var="genders"/>
* <s:radio label="Gender" name="male" list="#genders.genders"/>
* <!-- END SNIPPET: example -->
* </pre>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java?view=diff&rev=555302&r1=555301&r2=555302
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
Wed Jul 11 08:25:29 2007
@@ -68,7 +68,7 @@
* </s:sort>
*
* USAGE 2:
- * <s:sort id="mySortedList" comparator="myComparator" source="myList" />
+ * <s:sort var="mySortedList" comparator="myComparator" source="myList"
/>
*
* <%
* Iterator sortedIterator = (Iterator)
pageContext.getAttribute("mySortedList");
