Author: scolebourne Date: Sat Aug 20 04:16:54 2005 New Revision: 234019 URL: http://svn.apache.org/viewcvs?rev=234019&view=rev Log: Remove StringPrintWriter (package scoped) as performed no useful purpose
Removed: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringPrintWriter.java Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java?rev=234019&r1=234018&r2=234019&view=diff ============================================================================== --- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java (original) +++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Sat Aug 20 04:16:54 2005 @@ -16,6 +16,7 @@ package org.apache.commons.lang; import java.io.IOException; +import java.io.StringWriter; import java.io.Writer; import org.apache.commons.lang.exception.NestableRuntimeException; @@ -150,9 +151,9 @@ return null; } try { - StringPrintWriter writer = new StringPrintWriter(str.length() * 2); + StringWriter writer = new StringWriter(str.length() * 2); escapeJavaStyleString(writer, str, escapeSingleQuotes); - return writer.getString(); + return writer.toString(); } catch (IOException ioe) { // this should never ever happen while writing to a StringWriter ioe.printStackTrace(); @@ -266,9 +267,9 @@ return null; } try { - StringPrintWriter writer = new StringPrintWriter(str.length()); + StringWriter writer = new StringWriter(str.length()); unescapeJava(writer, str); - return writer.getString(); + return writer.toString(); } catch (IOException ioe) { // this should never ever happen while writing to a StringWriter ioe.printStackTrace(); @@ -442,9 +443,9 @@ } try { - StringPrintWriter writer = new StringPrintWriter ((int)(str.length() * 1.5)); + StringWriter writer = new StringWriter ((int)(str.length() * 1.5)); escapeHtml(writer, str); - return writer.getString(); + return writer.toString(); } catch (IOException e) { //assert false; //should be impossible @@ -514,9 +515,9 @@ } try { - StringPrintWriter writer = new StringPrintWriter ((int)(str.length() * 1.5)); + StringWriter writer = new StringWriter ((int)(str.length() * 1.5)); unescapeHtml(writer, str); - return writer.getString(); + return writer.toString(); } catch (IOException e) { //assert false; //should be impossible Modified: jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java?rev=234019&r1=234018&r2=234019&view=diff ============================================================================== --- jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java (original) +++ jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java Sat Aug 20 04:16:54 2005 @@ -16,6 +16,7 @@ package org.apache.commons.lang; import java.io.IOException; +import java.io.StringWriter; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; @@ -105,9 +106,9 @@ message = "escapeJava(String) failed" + (message == null ? "" : (": " + message)); assertEquals(message, expected, converted); - StringPrintWriter writer = new StringPrintWriter(); + StringWriter writer = new StringWriter(); StringEscapeUtils.escapeJava(writer, original); - assertEquals(expected, writer.getString()); + assertEquals(expected, writer.toString()); } public void testUnescapeJava() throws IOException { @@ -127,7 +128,7 @@ } catch (IllegalArgumentException ex) { } try { - String str = StringEscapeUtils.unescapeJava("\\u02-3"); + StringEscapeUtils.unescapeJava("\\u02-3"); fail(); } catch (RuntimeException ex) { } @@ -159,9 +160,9 @@ "' actual '" + StringEscapeUtils.escapeJava(actual) + "'", expected, actual); - StringPrintWriter writer = new StringPrintWriter(); + StringWriter writer = new StringWriter(); StringEscapeUtils.unescapeJava(writer, original); - assertEquals(unescaped, writer.getString()); + assertEquals(unescaped, writer.toString()); } @@ -210,12 +211,12 @@ String expected = htmlEscapes[i][1]; String original = htmlEscapes[i][2]; assertEquals(message, expected, StringEscapeUtils.escapeHtml(original)); - StringPrintWriter sw = new StringPrintWriter(); + StringWriter sw = new StringWriter(); try { StringEscapeUtils.escapeHtml(sw, original); } catch (IOException e) { } - String actual = original == null ? null : sw.getString(); + String actual = original == null ? null : sw.toString(); assertEquals(message, expected, actual); } } @@ -227,12 +228,12 @@ String original = htmlEscapes[i][1]; assertEquals(message, expected, StringEscapeUtils.unescapeHtml(original)); - StringPrintWriter sw = new StringPrintWriter(); + StringWriter sw = new StringWriter(); try { StringEscapeUtils.unescapeHtml(sw, original); } catch (IOException e) { } - String actual = original == null ? null : sw.getString(); + String actual = original == null ? null : sw.toString(); assertEquals(message, expected, actual); } // \u00E7 is a cedilla (c with wiggle under) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]