You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/06/20 20:02:13 UTC
svn commit: r549173 - in /struts/struts2/trunk/core/src:
main/java/org/apache/struts2/components/ site/resources/tags/
site/resources/tags/ajax/
Author: musachy
Date: Wed Jun 20 11:02:11 2007
New Revision: 549173
URL: http://svn.apache.org/viewvc?view=rev&rev=549173
Log:
WW-2004
* Hide "id" attribute in tags where it is not used
* Update tag ref
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
struts/struts2/trunk/core/src/site/resources/tags/else.html
struts/struts2/trunk/core/src/site/resources/tags/elseif.html
struts/struts2/trunk/core/src/site/resources/tags/i18n.html
struts/struts2/trunk/core/src/site/resources/tags/if.html
struts/struts2/trunk/core/src/site/resources/tags/include.html
struts/struts2/trunk/core/src/site/resources/tags/optgroup.html
struts/struts2/trunk/core/src/site/resources/tags/param.html
struts/struts2/trunk/core/src/site/resources/tags/property.html
struts/struts2/trunk/core/src/site/resources/tags/push.html
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java Wed Jun 20 11:02:11 2007
@@ -24,6 +24,7 @@
import java.util.Map;
import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
@@ -70,5 +71,10 @@
context.remove(If.ANSWER);
return !((ifResult == null) || (ifResult.booleanValue()));
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java Wed Jun 20 11:02:11 2007
@@ -24,6 +24,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
@@ -103,5 +104,10 @@
@StrutsTagAttribute(description="Expression to determine if body of tag is to be displayed", type="Boolean", required=true)
public void setTest(String test) {
this.test = test;
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java Wed Jun 20 11:02:11 2007
@@ -26,6 +26,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.Dispatcher;
@@ -131,5 +132,10 @@
@StrutsTagAttribute(description="Name of ressource bundle to use (eg foo/bar/customBundle)", required=true, defaultValue="String")
public void setName(String name) {
this.name = name;
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java Wed Jun 20 11:02:11 2007
@@ -24,6 +24,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
@@ -94,5 +95,10 @@
public boolean end(Writer writer, String body) {
stack.getContext().put(ANSWER, answer);
return super.end(writer, body);
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java Wed Jun 20 11:02:11 2007
@@ -44,6 +44,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.util.FastByteArrayOutputStream;
@@ -170,6 +171,11 @@
@StrutsTagAttribute(description="The jsp/servlet output to include", required=true)
public void setValue(String value) {
this.value = value;
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
public static String getContextRelativePath(ServletRequest request, String relativePath) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java Wed Jun 20 11:02:11 2007
@@ -31,6 +31,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
@@ -141,5 +142,10 @@
@StrutsTagAttribute(description="Set the listValue attribute.")
public void setListValue(String listValue) {
internalUiBean.setListValue(listValue);
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java Wed Jun 20 11:02:11 2007
@@ -24,6 +24,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import org.apache.struts2.StrutsException;
import com.opensymphony.xwork2.util.ValueStack;
@@ -136,6 +137,11 @@
@StrutsTagAttribute(description="Value expression for Parameter to set", defaultValue="The value of evaluating provided name against stack")
public void setValue(String value) {
this.value = value;
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
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?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- 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 Wed Jun 20 11:02:11 2007
@@ -27,6 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.TextUtils;
@@ -154,5 +155,10 @@
} else {
return value;
}
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
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=549173&r1=549172&r2=549173
==============================================================================
--- 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 Jun 20 11:02:11 2007
@@ -24,6 +24,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
@@ -146,5 +147,10 @@
@StrutsTagAttribute(description="Value to push on stack", required=true)
public void setValue(String value) {
this.value = value;
+ }
+
+ @StrutsTagSkipInheritance
+ public void setId(String id) {
+ super.setId(id);
}
}
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html Wed Jun 20 11:02:11 2007
@@ -441,7 +441,7 @@
<td align="left" valign="top">true</td>
<td align="left" valign="top">true</td>
<td align="left" valign="top">Boolean</td>
- <td align="left" valign="top">Load content when page is loaded</td>
+ <td align="left" valign="top">Load options when page is loaded</td>
</tr>
<tr>
<td align="left" valign="top">readonly</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/else.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/else.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/else.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/else.html Wed Jun 20 11:02:11 2007
@@ -27,14 +27,6 @@
<th align="left" valign="top"><h4>Type</h4></th>
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
</table>
<!-- END SNIPPET: tagattributes -->
</body>
Modified: struts/struts2/trunk/core/src/site/resources/tags/elseif.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/elseif.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/elseif.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/elseif.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">test</td>
<td align="left" valign="top"><strong>true</strong></td>
<td align="left" valign="top"></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/i18n.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/i18n.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/i18n.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/i18n.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">name</td>
<td align="left" valign="top"><strong>true</strong></td>
<td align="left" valign="top">String</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/if.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/if.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/if.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/if.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">test</td>
<td align="left" valign="top"><strong>true</strong></td>
<td align="left" valign="top"></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/include.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/include.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/include.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/include.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">value</td>
<td align="left" valign="top"><strong>true</strong></td>
<td align="left" valign="top"></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/optgroup.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optgroup.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/optgroup.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/optgroup.html Wed Jun 20 11:02:11 2007
@@ -36,14 +36,6 @@
<td align="left" valign="top">Set the disable attribute.</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">label</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/param.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/param.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/param.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/param.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">name</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/property.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/property.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/property.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/property.html Wed Jun 20 11:02:11 2007
@@ -44,14 +44,6 @@
<td align="left" valign="top"> Whether to escape HTML</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">value</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"><top of stack></td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/push.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/push.html?view=diff&rev=549173&r1=549172&r2=549173
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/push.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/push.html Wed Jun 20 11:02:11 2007
@@ -28,14 +28,6 @@
<th align="left" valign="top"><h4>Description</h4></th>
</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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
- </tr>
- <tr>
<td align="left" valign="top">value</td>
<td align="left" valign="top"><strong>true</strong></td>
<td align="left" valign="top"></td>