diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 01ba33500..917fd7242 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -$Id: RELEASE-NOTES.txt,v 1.12 2003/07/16 21:19:22 scolebourne Exp $ +$Id: RELEASE-NOTES.txt,v 1.13 2003/07/16 21:23:50 scolebourne Exp $ Commons Lang Package Version 2.0 @@ -77,8 +77,8 @@ lang: isNotEmpty() changed return true for null. chomp() changed to be more like Perl. Various methods changed in the handling of null (less exceptions). - Thirty-one new methods. - Eight methods deprecated. + Thirty new methods. + Seven methods deprecated. SystemUtils: isJavaVersionAtLeast(int) added. getJavaVersion() deprecated. host of new constants. @@ -274,7 +274,6 @@ org.apache.commons.lang.StringUtils > public static java.lang.String sliceRemainder(java.lang.String, java.lang.String); > public static java.lang.String sliceFirstRemainder(java.lang.String, java.lang.String); > public static java.lang.String sliceFirst(java.lang.String, java.lang.String); -> public static java.lang.String unescape(java.lang.String); > public static java.lang.String rightPad(java.lang.String, int, char); > public static java.lang.String leftPad(java.lang.String, int, char); > public static java.lang.String uncapitaliseAllWords(java.lang.String); diff --git a/src/java/org/apache/commons/lang/StringUtils.java b/src/java/org/apache/commons/lang/StringUtils.java index 1e0cb95d3..2cb09d988 100644 --- a/src/java/org/apache/commons/lang/StringUtils.java +++ b/src/java/org/apache/commons/lang/StringUtils.java @@ -90,7 +90,7 @@ * @author Arun Mammen Thomas * @author Gary Gregory * @since 1.0 - * @version $Id: StringUtils.java,v 1.58 2003/07/16 21:19:22 scolebourne Exp $ + * @version $Id: StringUtils.java,v 1.59 2003/07/16 21:23:50 scolebourne Exp $ */ public class StringUtils { @@ -1494,23 +1494,6 @@ public static String escape(String str) { return StringEscapeUtils.escapeJava(str); } - /** - *

Unescapes any Java literals found in the String. For example, - * it will turn a sequence of '\' and 'n' - * into a newline character, unless the '\' is preceded - * by another '\'.

- * - *

As of Lang 2.0, this calls {@link StringEscapeUtils#unescapeJava(java.lang.String)} - * behind the scenes.

- * - * @see StringEscapeUtils#unescapeJava(java.lang.String) - * @deprecated Use {@link StringEscapeUtils#unescapeJava(java.lang.String)} - * This method will be removed in Commons Lang 3.0 - */ - public static String unescape(String str) { - return StringEscapeUtils.unescapeJava(str); - } - // Padding //-------------------------------------------------------------------------- diff --git a/src/test/org/apache/commons/lang/StringUtilsTest.java b/src/test/org/apache/commons/lang/StringUtilsTest.java index b5060febf..33ebec3e0 100644 --- a/src/test/org/apache/commons/lang/StringUtilsTest.java +++ b/src/test/org/apache/commons/lang/StringUtilsTest.java @@ -69,7 +69,7 @@ * @author Henning P. Schmiedehausen - * @version $Id: StringUtilsTest.java,v 1.22 2003/07/15 23:41:54 scolebourne Exp $ + * @version $Id: StringUtilsTest.java,v 1.23 2003/07/16 21:23:50 scolebourne Exp $ */ public class StringUtilsTest extends TestCase { @@ -478,16 +478,6 @@ public void testEscapeFunctions() { "\\u0234", StringUtils.escape("\u0234") ); assertEquals("escape(String) failed", "\\u00FD", StringUtils.escape("\u00fd") ); - assertEquals("unescape(String) failed", - "", StringUtils.unescape("") ); - assertEquals("unescape(String) failed", - "test", StringUtils.unescape("test") ); - assertEquals("unescape(String) failed", - "\ntest\b", StringUtils.unescape("\\ntest\\b") ); - assertEquals("unescape(String) failed", - "\u123425foo\ntest\b", StringUtils.unescape("\\u123425foo\\ntest\\b") ); - assertEquals("unescape(String) failed with unicode as final char", - "\u1234", StringUtils.unescape("\\u1234") ); } public void testGetLevenshteinDistance() {