Author: musachy
Date: Wed Mar 25 13:52:03 2009
New Revision: 758259
URL: http://svn.apache.org/viewvc?rev=758259&view=rev
Log:
WW-3045 Replace TextUtils String methods. Add direct dependency to core.
Modified:
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/pom.xml (original)
+++ struts/struts2/trunk/plugins/javatemplates/pom.xml Wed Mar 25 13:52:03 2009
@@ -19,6 +19,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
Wed Mar 25 13:52:03 2009
@@ -20,7 +20,8 @@
*/
package org.apache.struts2.views.java;
-import com.opensymphony.xwork2.util.TextUtils;
+import org.apache.commons.lang.xwork.StringEscapeUtils;
+import org.apache.commons.lang.xwork.StringUtils;
import java.util.LinkedHashMap;
@@ -34,7 +35,7 @@
}
public Attributes add(String key, String value, boolean encode) {
- put(key, (encode ? TextUtils.htmlEncode(value) : value));
+ put(key, (encode ?
StringUtils.defaultString(StringEscapeUtils.escapeHtml(value)) : value));
return this;
}
@@ -59,8 +60,8 @@
public Attributes addIfExists(String attrName, Object paramValue, boolean
encode) {
if (paramValue != null) {
String val = paramValue.toString();
- if (val.trim().length() > 0)
- put(attrName, (encode ? TextUtils.htmlEncode(val) : val));
+ if (StringUtils.isNotBlank(val))
+ put(attrName, (encode ?
StringUtils.defaultString(StringEscapeUtils.escapeHtml(val)) : val));
}
return this;
}
@@ -103,7 +104,7 @@
public Attributes addDefaultToEmpty(String attrName, Object paramValue,
boolean encode) {
if (paramValue != null) {
String val = paramValue.toString();
- put(attrName, (encode ? TextUtils.htmlEncode(val) : val));
+ put(attrName, (encode ?
StringUtils.defaultString(StringEscapeUtils.escapeHtml(val)) : val));
} else {
put(attrName, "");
}
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
Wed Mar 25 13:52:03 2009
@@ -20,8 +20,9 @@
*/
package org.apache.struts2.views.java;
-import com.opensymphony.xwork2.util.TextUtils;
import org.apache.struts2.components.template.TemplateRenderingContext;
+import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.xwork.StringEscapeUtils;
import java.io.IOException;
import java.io.Writer;
@@ -38,7 +39,7 @@
}
public void characters(String text, boolean encode) throws IOException {
- writer.write(encode ? TextUtils.htmlEncode(text) : text);
+ writer.write(encode ?
StringUtils.defaultString(StringEscapeUtils.escapeHtml(text)) : text);
}
public void end(String name) throws IOException {
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
Wed Mar 25 13:52:03 2009
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.Map;
-import com.opensymphony.xwork2.util.TextUtils;
-
public class AnchorHandler extends AbstractTagHandler implements TagGenerator {
public void generate() throws IOException {
//all rendering must happend at the end of the tag, so we can support
nested params
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
Wed Mar 25 13:52:03 2009
@@ -1,8 +1,9 @@
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.TextUtils;
import org.apache.struts2.views.java.Attributes;
import org.apache.struts2.views.java.TagGenerator;
+import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.xwork.StringEscapeUtils;
import java.io.IOException;
import java.util.Map;
@@ -34,9 +35,9 @@
//hidden input
attrs = new Attributes();
attrs.add("type", "hidden")
- .add("id", "__checkbox_" + TextUtils.htmlEncode(id))
- .add("name", "__checkbox_" + TextUtils.htmlEncode(name))
- .add("value", "__checkbox_" + TextUtils.htmlEncode(fieldValue))
+ .add("id", "__checkbox_" +
StringUtils.defaultString(StringEscapeUtils.escapeHtml(id)))
+ .add("name", "__checkbox_" +
StringUtils.defaultString(StringEscapeUtils.escapeHtml(name)))
+ .add("value", "__checkbox_" +
StringUtils.defaultString(StringEscapeUtils.escapeHtml(fieldValue)))
.addIfTrue("disabled", disabled);
start("input", attrs);
end("input");
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
Wed Mar 25 13:52:03 2009
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.Map;
-import com.opensymphony.xwork2.util.TextUtils;
-
public class LabelHandler extends AbstractTagHandler implements TagGenerator {
public void generate() throws IOException {
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
Wed Mar 25 13:52:03 2009
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.Map;
-import com.opensymphony.xwork2.util.TextUtils;
-
public class ResetHandler extends AbstractTagHandler implements TagGenerator {
public void generate() throws IOException {
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
Wed Mar 25 13:52:03 2009
@@ -20,7 +20,6 @@
*/
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.components.ListUIBean;
import org.apache.struts2.components.OptGroup;
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
Wed Mar 25 13:52:03 2009
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.Map;
-import com.opensymphony.xwork2.util.TextUtils;
-
public class SubmitHandler extends AbstractTagHandler implements TagGenerator {
public void generate() throws IOException {
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java?rev=758259&r1=758258&r2=758259&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
Wed Mar 25 13:52:03 2009
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.Map;
-import com.opensymphony.xwork2.util.TextUtils;
-
public class TextAreaHandler extends AbstractTagHandler implements
TagGenerator {
public void generate() throws IOException {
