commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brit...@apache.org
Subject svn commit: r1617066 - in /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv: CSVFormat.java CSVParser.java CSVPrinter.java CSVRecord.java
Date Sun, 10 Aug 2014 08:50:06 GMT
Author: britter
Date: Sun Aug 10 08:50:05 2014
New Revision: 1617066

URL: http://svn.apache.org/r1617066
Log:
Make checkstyle happy

Modified:
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVPrinter.java
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.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=1617066&r1=1617065&r2=1617066&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 Sun Aug 10
08:50:05 2014
@@ -236,8 +236,8 @@ public final class CSVFormat implements 
      * Default MySQL format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA
INFILE} operations.
      *
      * <p>
-     * This is a tab-delimited format with a LF character as the line separator. Values are
not quoted and special characters
-     * are escaped with '\'.
+     * This is a tab-delimited format with a LF character as the line separator. Values are
not quoted and special
+     * characters are escaped with '\'.
      * </p>
      *
      * <p>
@@ -958,8 +958,8 @@ public final class CSVFormat implements 
     /**
      * Sets the record separator of the format to the specified character.
      *
-     * <p><strong>Note:</strong> This setting is only used during printing
and does not affect parsing. Parsing currently
-     * only works for inputs with '\n', '\r' and "\r\n"</p>
+     * <p><strong>Note:</strong> This setting is only used during printing
and does not affect parsing. Parsing
+     * currently only works for inputs with '\n', '\r' and "\r\n"</p>
      *
      * @param recordSeparator
      *            the record separator to use for output.
@@ -973,8 +973,8 @@ public final class CSVFormat implements 
     /**
      * Sets the record separator of the format to the specified String.
      *
-     * <p><strong>Note:</strong> This setting is only used during printing
and does not affect parsing. Parsing currently
-     * only works for inputs with '\n', '\r' and "\r\n"</p>
+     * <p><strong>Note:</strong> This setting is only used during printing
and does not affect parsing. Parsing
+     * currently only works for inputs with '\n', '\r' and "\r\n"</p>
      *
      * @param recordSeparator
      *            the record separator to use for output.

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java?rev=1617066&r1=1617065&r2=1617066&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java Sun Aug 10
08:50:05 2014
@@ -324,7 +324,6 @@ public final class CSVParser implements 
      */
     public List<CSVRecord> getRecords() throws IOException {
         CSVRecord rec;
-        // can not use Java 7 diamond notation here, since JavaNCSS will fail, see https://jira.codehaus.org/browse/JAVANCSS-51
         List<CSVRecord> records = new ArrayList<CSVRecord>();
         while ((rec = this.nextRecord()) != null) {
             records.add(rec);
@@ -364,7 +363,8 @@ public final class CSVParser implements 
                     final String header = headerRecord[i];
                     final boolean containsHeader = hdrMap.containsKey(header);
                     final boolean emptyHeader = header == null || header.trim().isEmpty();
-                    if (containsHeader && (!emptyHeader || (emptyHeader &&
!this.format.getAllowMissingColumnNames()))) {
+                    if (containsHeader &&
+                            (!emptyHeader || (emptyHeader && !this.format.getAllowMissingColumnNames())))
{
                         throw new IllegalArgumentException("The header contains a duplicate
name: \"" + header +
                                 "\" in " + Arrays.toString(headerRecord));
                     }

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVPrinter.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVPrinter.java?rev=1617066&r1=1617065&r2=1617066&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVPrinter.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVPrinter.java Sun Aug
10 08:50:05 2014
@@ -427,8 +427,8 @@ public final class CSVPrinter implements
      * Prints all the objects in the given array handling nested collections/arrays as records.
      *
      * <p>If the given array only contains simple objects, this method will print a
single record like
-     * {@link #printRecord(Object...)}. If the given collections contains nested collections/arrays
those nested elements
-     * will each be printed as records using {@link #printRecord(Object...)}.</p>
+     * {@link #printRecord(Object...)}. If the given collections contains nested collections/arrays
those nested
+     * elements will each be printed as records using {@link #printRecord(Object...)}.</p>
      *
      * <p>Given the following data structure:</p>
      * <pre>

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java?rev=1617066&r1=1617065&r2=1617066&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java Sun Aug 10
08:50:05 2014
@@ -129,7 +129,7 @@ public final class CSVRecord implements 
      * </p>
      *
      * @return the number of this record.
-     * @see CSVParser#getCurrentLineNumber() 
+     * @see CSVParser#getCurrentLineNumber()
      */
     public long getRecordNumber() {
         return recordNumber;



Mime
View raw message