Author: musachy Date: Wed Mar 25 13:50:03 2009 New Revision: 758258 URL: http://svn.apache.org/viewvc?rev=758258&view=rev Log: WW-3045 Remove html encode method from StrutsUtils
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java?rev=758258&r1=758257&r2=758258&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java Wed Mar 25 13:50:03 2009 @@ -224,14 +224,6 @@ return selectList; } - public String htmlEncode(Object obj) { - if (obj == null) { - return null; - } - - return StringEscapeUtils.escapeHtml(obj.toString()); - } - public int toInt(long aLong) { return (int) aLong; } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java?rev=758258&r1=758257&r2=758258&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java Wed Mar 25 13:50:03 2009 @@ -169,14 +169,6 @@ assertEquals(((ListEntry)listMade.get(2)).getIsSelected(), false); } - - public void testHtmlEncode() throws Exception { - assertEquals( - strutsUtil.htmlEncode("<html><head><title>some title</title><body>some content</body></html>"), - "<html><head><title>some title</title><body>some content</body></html>"); - } - - public void testToInt() throws Exception { assertEquals(strutsUtil.toInt(11l), 11); }