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

Use the single quote char to delineate a char in error messages. Remove a trailing space. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1397872 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2012-10-13 16:03:03 +00:00
parent 8f068b60ed
commit e331df694c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ public class CSVFormat implements Serializable {
* @see <a href="http://dev.mysql.com/doc/refman/5.1/en/load-data.html">
* http://dev.mysql.com/doc/refman/5.1/en/load-data.html</a>
*/
public static final CSVFormat MYSQL =
public static final CSVFormat MYSQL =
PRISTINE
.withDelimiter(TAB)
.withEscape(ESCAPE)
@ -172,28 +172,25 @@ public class CSVFormat implements Serializable {
*/
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 + "')");
}
}