Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 52244 invoked from network); 30 Jun 2009 07:04:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Jun 2009 07:04:21 -0000 Received: (qmail 34044 invoked by uid 500); 30 Jun 2009 07:04:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 33956 invoked by uid 500); 30 Jun 2009 07:04:31 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 33947 invoked by uid 99); 30 Jun 2009 07:04:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2009 07:04:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2009 07:04:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5576723888CF; Tue, 30 Jun 2009 07:04:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r789589 - in /commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate: EscapeUtils.java UnescapeUtils.java Date: Tue, 30 Jun 2009 07:04:07 -0000 To: commits@commons.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090630070407.5576723888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bayard Date: Tue Jun 30 07:04:06 2009 New Revision: 789589 URL: http://svn.apache.org/viewvc?rev=789589&view=rev Log: Splitting out the \b \n \t \f \r Java ctrl chars as their own translator to help with the request in LANG-498 Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/EscapeUtils.java commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/UnescapeUtils.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/EscapeUtils.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/EscapeUtils.java?rev=789589&r1=789588&r2=789589&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/EscapeUtils.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/EscapeUtils.java Tue Jun 30 07:04:06 2009 @@ -29,12 +29,7 @@ */ public class EscapeUtils { - public static final CharSequenceTranslator ESCAPE_JAVA = - new LookupTranslator( - new String[][] { - {"\"", "\\\""}, - {"\\", "\\\\"}, - }).with( + public static final CharSequenceTranslator ESCAPE_JAVA_CTRL_CHARS = new LookupTranslator( new String[][] { {"\b", "\\b"}, @@ -42,9 +37,18 @@ {"\t", "\\t"}, {"\f", "\\f"}, {"\r", "\\r"} + }); + + public static final CharSequenceTranslator ESCAPE_JAVA = + new LookupTranslator( + new String[][] { + {"\"", "\\\""}, + {"\\", "\\\\"}, }).with( - UnicodeEscaper.outsideOf(32, 0x7f) - )); + ESCAPE_JAVA_CTRL_CHARS + ).with( + UnicodeEscaper.outsideOf(32, 0x7f) + ); public static final String escapeJava(String input) { return ESCAPE_JAVA.translate(input); @@ -59,14 +63,7 @@ {"\\", "\\\\"}, {"/", "\\/"} }), - new LookupTranslator( - new String[][] { - {"\b", "\\b"}, - {"\n", "\\n"}, - {"\t", "\\t"}, - {"\f", "\\f"}, - {"\r", "\\r"} - }), + ESCAPE_JAVA_CTRL_CHARS, UnicodeEscaper.outsideOf(32, 0x7f) ); Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/UnescapeUtils.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/UnescapeUtils.java?rev=789589&r1=789588&r2=789589&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/UnescapeUtils.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/UnescapeUtils.java Tue Jun 30 07:04:06 2009 @@ -29,20 +29,26 @@ */ public class UnescapeUtils { + public static final CharSequenceTranslator UNESCAPE_JAVA_CTRL_CHARS = + new LookupTranslator( + new String[][] { + {"\\b", "\b"}, + {"\\n", "\n"}, + {"\\t", "\t"}, + {"\\f", "\f"}, + {"\\r", "\r"} + }); + // throw "illegal character: \92" as an Exception if a \ on the end of the Java (as per the compiler)? public static final CharSequenceTranslator UNESCAPE_JAVA = new AggregateTranslator( new UnicodeUnescaper(), + UNESCAPE_JAVA_CTRL_CHARS, new LookupTranslator( new String[][] { {"\\\\", "\\"}, {"\\\"", "\""}, {"\\'", "'"}, - {"\\r", "\r"}, - {"\\f", "\f"}, - {"\\t", "\t"}, - {"\\n", "\n"}, - {"\\b", "\b"}, {"\\", ""} }) );