Apache
/
commons-csv
mirror of https://github.com/apache/commons-csv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delimiter is not optional so change back type from Character to char. The side effect is that the "pristine" format must be built with somekind of default (',') seems reasonable. The comment used to say "no settings defined" but that was not true, since false was passed in for two values instead of null. IMO, this is all due to the fluent API making this part of the code a little more tricky. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1397930 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2012-10-13 19:15:59 +00:00
parent f074aeedfe
commit a50d473a3b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/apache/commons/csv/CSVFormat.java
View File

@ -173,15 +173,15 @@ public class CSVFormat implements Serializable {
* @throws IllegalStateException
*/
void validate() throws IllegalStateException {
if (delimiter == encapsulator) {
if (encapsulator != null && delimiter == encapsulator) {
throw new IllegalStateException("The encapsulator character and the delimiter cannot be the same ('" + encapsulator + "')");
}
if (delimiter == escape) {
if (escape != null && delimiter == escape) {
throw new IllegalStateException("The escape character and the delimiter cannot be the same ('" + escape + "')");
}
if (delimiter == commentStart) {
if (commentStart != null && delimiter == commentStart) {
throw new IllegalStateException("The comment start character and the delimiter cannot be the same ('" + commentStart +
"')");
}