Skip to content

Commit 939a8a0

Browse files
committed
Standardise on recordSeparator; fix incorrect Javadoc comments
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1468825 13f79535-47bb-0310-9956-ffa450edef68
1 parent f16818b commit 939a8a0

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/org/apache/commons/csv/CSVFormat.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ public static class CSVFormatBuilder {
9898
* @param nullToString TODO
9999
* @param header
100100
* the header
101-
* @param lineSeparator
102-
* the line separator to use for output
101+
* @param recordSeparator
102+
* the record separator to use for output
103103
* @throws IllegalArgumentException if the delimiter is a line break character
104104
*/
105105
// package protected for use by test code
106106
CSVFormatBuilder(final char delimiter, final Character quoteChar,
107107
final Quote quotePolicy, final Character commentStart,
108108
final Character escape, final boolean ignoreSurroundingSpaces,
109-
final boolean ignoreEmptyLines, final String lineSeparator,
109+
final boolean ignoreEmptyLines, final String recordSeparator,
110110
String nullToString, final String[] header) {
111111
if (isLineBreak(delimiter)) {
112112
throw new IllegalArgumentException("The delimiter cannot be a line break");
@@ -118,7 +118,7 @@ public static class CSVFormatBuilder {
118118
this.escape = escape;
119119
this.ignoreSurroundingSpaces = ignoreSurroundingSpaces;
120120
this.ignoreEmptyLines = ignoreEmptyLines;
121-
this.recordSeparator = lineSeparator;
121+
this.recordSeparator = recordSeparator;
122122
this.nullToString = nullToString;
123123
this.header = header;
124124
}
@@ -431,7 +431,7 @@ static boolean isLineBreak(final Character c) {
431431
* <li>withDelimiter(',')</li>
432432
* <li>withQuoteChar('"')</li>
433433
* <li>withEmptyLinesIgnored(true)</li>
434-
* <li>withLineSeparator(CRLF)</li>
434+
* <li>withRecordSeparator(CRLF)</li>
435435
* </ul>
436436
*
437437
* Shortcut for {@code CSVFormat.newBuilder(CSVFormat.DEFAULT)}
@@ -462,7 +462,7 @@ public static CSVFormatBuilder newBuilder() {
462462
* <ul>
463463
* <li>withDelimiter(',')</li>
464464
* <li>withQuoteChar('"')</li>
465-
* <li>withLineSeparator(CRLF)</li>
465+
* <li>withRecordSeparator(CRLF)</li>
466466
* </ul>
467467
*/
468468
public static final CSVFormat RFC4180 =
@@ -476,7 +476,7 @@ public static CSVFormatBuilder newBuilder() {
476476
* <ul>
477477
* <li>withDelimiter(',')</li>
478478
* <li>withQuoteChar('"')</li>
479-
* <li>withLineSeparator(CRLF)</li>
479+
* <li>withRecordSeparator(CRLF)</li>
480480
* </ul>
481481
* <h3>Additional:</h3>
482482
* <ul>
@@ -500,7 +500,7 @@ public static CSVFormatBuilder newBuilder() {
500500
* <ul>
501501
* <li>withDelimiter(',')</li>
502502
* <li>withQuoteChar('"')</li>
503-
* <li>withLineSeparator(CRLF)</li>
503+
* <li>withRecordSeparator(CRLF)</li>
504504
* </ul>
505505
* Note: this is currently the same as RFC4180
506506
*/

0 commit comments

Comments
 (0)