Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C6C4D493 for ; Sat, 13 Oct 2012 16:03:52 +0000 (UTC) Received: (qmail 83812 invoked by uid 500); 13 Oct 2012 16:03:52 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 83754 invoked by uid 500); 13 Oct 2012 16:03:52 -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 83747 invoked by uid 99); 13 Oct 2012 16:03:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Oct 2012 16:03:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 13 Oct 2012 16:03:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D810123888E3 for ; Sat, 13 Oct 2012 16:03:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1397872 - /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java Date: Sat, 13 Oct 2012 16:03:03 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121013160303.D810123888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Sat Oct 13 16:03:03 2012 New Revision: 1397872 URL: http://svn.apache.org/viewvc?rev=1397872&view=rev Log: Use the single quote char to delineate a char in error messages. Remove a trailing space. Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java?rev=1397872&r1=1397871&r2=1397872&view=diff ============================================================================== --- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java (original) +++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java Sat Oct 13 16:03:03 2012 @@ -117,7 +117,7 @@ public class CSVFormat implements Serial * @see * http://dev.mysql.com/doc/refman/5.1/en/load-data.html */ - public static final CSVFormat MYSQL = + public static final CSVFormat MYSQL = PRISTINE .withDelimiter(TAB) .withEscape(ESCAPE) @@ -172,28 +172,25 @@ public class CSVFormat implements Serial */ void validate() throws IllegalArgumentException { if (delimiter == encapsulator) { - throw new IllegalArgumentException("The encapsulator character and the delimiter cannot be the same (\"" + - encapsulator + "\")"); + throw new IllegalArgumentException("The encapsulator character and the delimiter cannot be the same ('" + encapsulator + ")"); } if (delimiter == escape) { - throw new IllegalArgumentException("The escape character and the delimiter cannot be the same (\"" + - escape + "\")"); + throw new IllegalArgumentException("The escape character and the delimiter cannot be the same ('" + escape + "')"); } if (delimiter == commentStart) { - throw new IllegalArgumentException("The comment start character and the delimiter cannot be the same (\"" + - commentStart + "\")"); + throw new IllegalArgumentException("The comment start character and the delimiter cannot be the same ('" + commentStart + + "')"); } if (encapsulator != null && encapsulator == commentStart) { - throw new IllegalArgumentException( - "The comment start character and the encapsulator cannot be the same (\"" + commentStart + "\")"); + throw new IllegalArgumentException("The comment start character and the encapsulator cannot be the same ('" + commentStart + + "')"); } if (escape != null && escape == commentStart) { - throw new IllegalArgumentException("The comment start and the escape character cannot be the same (\"" + - commentStart + "\")"); + throw new IllegalArgumentException("The comment start and the escape character cannot be the same ('" + commentStart + "')"); } }