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 6FF27F541 for ; Wed, 17 Apr 2013 10:29:01 +0000 (UTC) Received: (qmail 24960 invoked by uid 500); 17 Apr 2013 10:29:01 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 23599 invoked by uid 500); 17 Apr 2013 10:28:55 -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 23488 invoked by uid 99); 17 Apr 2013 10:28:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2013 10:28:54 +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; Wed, 17 Apr 2013 10:28:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 74A6323888E4; Wed, 17 Apr 2013 10:28:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1468825 - /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java Date: Wed, 17 Apr 2013 10:28:33 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130417102833.74A6323888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Wed Apr 17 10:28:33 2013 New Revision: 1468825 URL: http://svn.apache.org/r1468825 Log: Standardise on recordSeparator; fix incorrect Javadoc comments 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=1468825&r1=1468824&r2=1468825&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 Wed Apr 17 10:28:33 2013 @@ -98,15 +98,15 @@ public class CSVFormat implements Serial * @param nullToString TODO * @param header * the header - * @param lineSeparator - * the line separator to use for output + * @param recordSeparator + * the record separator to use for output * @throws IllegalArgumentException if the delimiter is a line break character */ // package protected for use by test code CSVFormatBuilder(final char delimiter, final Character quoteChar, final Quote quotePolicy, final Character commentStart, final Character escape, final boolean ignoreSurroundingSpaces, - final boolean ignoreEmptyLines, final String lineSeparator, + final boolean ignoreEmptyLines, final String recordSeparator, String nullToString, final String[] header) { if (isLineBreak(delimiter)) { throw new IllegalArgumentException("The delimiter cannot be a line break"); @@ -118,7 +118,7 @@ public class CSVFormat implements Serial this.escape = escape; this.ignoreSurroundingSpaces = ignoreSurroundingSpaces; this.ignoreEmptyLines = ignoreEmptyLines; - this.recordSeparator = lineSeparator; + this.recordSeparator = recordSeparator; this.nullToString = nullToString; this.header = header; } @@ -431,7 +431,7 @@ public class CSVFormat implements Serial *
  • withDelimiter(',')
    • *
  • withQuoteChar('"')
    • *
  • withEmptyLinesIgnored(true)
    • - *
  • withLineSeparator(CRLF)
    • + *
  • withRecordSeparator(CRLF)
    • * * * Shortcut for {@code CSVFormat.newBuilder(CSVFormat.DEFAULT)} @@ -462,7 +462,7 @@ public class CSVFormat implements Serial *
      *
    • withDelimiter(',')
      • *
    • withQuoteChar('"')
      • - *
    • withLineSeparator(CRLF)
      • + *
    • withRecordSeparator(CRLF)
      • *
    */ public static final CSVFormat RFC4180 = @@ -476,7 +476,7 @@ public class CSVFormat implements Serial *
      *
    • withDelimiter(',')
      • *
    • withQuoteChar('"')
      • - *
    • withLineSeparator(CRLF)
      • + *
    • withRecordSeparator(CRLF)
      • *
    *

    Additional:

    *
      @@ -500,7 +500,7 @@ public class CSVFormat implements Serial *
        *
      • withDelimiter(',')
        • *
      • withQuoteChar('"')
        • - *
      • withLineSeparator(CRLF)
        • + *
      • withRecordSeparator(CRLF)
        • *
      * Note: this is currently the same as RFC4180 */