Author: musachy
Date: Mon Nov 16 18:46:45 2009
New Revision: 880907
URL: http://svn.apache.org/viewvc?rev=880907&view=rev
Log:
WW-3333 deprecate "escape" attribute of "property" tagm and add a "escapeHtml"
which is more explicit (and self documenting)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
struts/struts2/trunk/core/src/site/resources/tags/property.html
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?rev=880907&r1=880906&r2=880907&view=diff
==============================================================================
---
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
Mon Nov 16 18:46:45 2009
@@ -100,7 +100,7 @@
private String defaultValue;
private String value;
- private boolean escape = true;
+ private boolean escapeHtml = true;
private boolean escapeJavaScript = false;
private boolean escapeXml = false;
private boolean escapeCsv = false;
@@ -110,9 +110,14 @@
this.defaultValue = defaultValue;
}
- @StrutsTagAttribute(description=" Whether to escape HTML", type="Boolean",
defaultValue="true")
+ @StrutsTagAttribute(description="Deprecated. Use 'escapeHtml'. Whether to
escape HTML", type="Boolean", defaultValue="true")
public void setEscape(boolean escape) {
- this.escape = escape;
+ this.escapeHtml = escape;
+ }
+
+ @StrutsTagAttribute(description="Whether to escape HTML", type="Boolean",
defaultValue="true")
+ public void setEscapeHtml(boolean escape) {
+ this.escapeHtml = escape;
}
@StrutsTagAttribute(description="Whether to escape Javascript",
type="Boolean", defaultValue="false")
@@ -171,7 +176,7 @@
private String prepare(String value) {
String result = value;
- if (escape) {
+ if (escapeHtml) {
result = StringEscapeUtils.escapeHtml(result);
}
if (escapeJavaScript) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java?rev=880907&r1=880906&r2=880907&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
Mon Nov 16 18:46:45 2009
@@ -39,7 +39,7 @@
private String defaultValue;
private String value;
- private boolean escape = true;
+ private boolean escapeHtml = true;
private boolean escapeJavaScript = false;
private boolean escapeXml = false;
private boolean escapeCsv = false;
@@ -54,7 +54,7 @@
Property tag = (Property) component;
tag.setDefault(defaultValue);
tag.setValue(value);
- tag.setEscape(escape);
+ tag.setEscape(escapeHtml);
tag.setEscapeJavaScript(escapeJavaScript);
tag.setEscapeXml(escapeXml);
tag.setEscapeCsv(escapeCsv);
@@ -65,7 +65,11 @@
}
public void setEscape(boolean escape) {
- this.escape = escape;
+ this.escapeHtml = escape;
+ }
+
+ public void setEscapeHtml(boolean escapeHtml) {
+ this.escapeHtml = escapeHtml;
}
public void setEscapeJavaScript(boolean escapeJavaScript) {
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?rev=880907&r1=880906&r2=880907&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/property.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/property.html Mon Nov 16
18:46:45 2009
@@ -47,7 +47,7 @@
<td align="left" valign="top">true</td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top"> Whether
to escape HTML</td>
+ <td align="left"
valign="top">Deprecated. Use 'escapeHtml'. Whether to escape HTML</td>
</tr>
<tr>
<td align="left"
valign="top">escapeCsv</td>
@@ -55,7 +55,15 @@
<td align="left" valign="top">false</td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Whether
to escape CSV</td>
+ <td align="left" valign="top">Whether
to escape CSV (useful to escape a value for a column)</td>
+ </tr>
+ <tr>
+ <td align="left"
valign="top">escapeHtml</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">false</td>
+ <td align="left"
valign="top">Boolean</td>
+ <td align="left" valign="top">Whether
to escape HTML</td>
</tr>
<tr>
<td align="left"
valign="top">escapeJavaScript</td>
