- Remove trailing spaces.

- Add missing final keywords.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509069 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

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

@@ -53,7 +53,7 @@
 public class CSVFormat implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * Returns true if the given character is a line break character.
      *
@@ -66,7 +66,7 @@ public class CSVFormat implements Serializable {
     static boolean isLineBreak(final Character c) {
         return c != null && isLineBreak(c.charValue());
     }
-    
+
     private final char delimiter;
     private final Character quoteChar;
     private final Quote quotePolicy;
@@ -324,8 +324,8 @@ public Character getEscape() {
     }
 
     /**
-     * Returns a copy of the header array. 
-     * 
+     * Returns a copy of the header array.
+     *
      * @return a copy of the header array
      */
     public String[] getHeader() {
@@ -362,7 +362,7 @@ public boolean getIgnoreSurroundingSpaces() {
      * <li>
      * <strong>Writing:</strong> Writes {@code null} as the given {@code nullString} when writing records.</li>
      * </ul>
-     * 
+     *
      * @return the String to convert to and from {@code null}. No substitution occurs if {@code null}
      */
     public String getNullString() {
@@ -454,11 +454,11 @@ public boolean isQuoting() {
 
 	/**
 	 * Parses the specified content.
-	 * 
+	 *
 	 * <p>
 	 * See also the various static parse methods on {@link CSVParser}.
 	 * </p>
-	 * 
+	 *
 	 * @param in
 	 *            the input stream
 	 * @return a parser over a stream of {@link #CSVRecord}s.
@@ -528,9 +528,9 @@ void validate() throws IllegalStateException {
         if (escape == null && quotePolicy == Quote.NONE) {
             throw new IllegalStateException("No quotes mode set but no escape character is set");
         }
-        
+
         if (header != null) {
-            Set<String> set = new HashSet<String>(header.length);
+            final Set<String> set = new HashSet<String>(header.length);
             set.addAll(Arrays.asList(header));
             if (set.size() != header.length) {
                 throw new IllegalStateException("The header contains duplicate names: " + Arrays.toString(header));
@@ -621,18 +621,18 @@ public CSVFormat withEscape(final Character escape) {
 
     /**
      * Sets the header of the format. The header can either be parsed automatically from the input file with:
-     * 
+     *
      * <pre>
      * CSVFormat format = aformat.withHeader();</pre>
-     * 
+     *
      * or specified manually with:
-     * 
+     *
      * <pre>
      * CSVFormat format = aformat.withHeader(&quot;name&quot;, &quot;email&quot;, &quot;phone&quot;);</pre>
-     * 
+     *
      * @param header
      *            the header, <tt>null</tt> if disabled, empty if parsed automatically, user specified otherwise.
-     * 
+     *
      * @return A new CSVFormat that is equal to this but with the specified header
      * @see #withSkipHeaderRecord(boolean)
      */

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

@@ -86,11 +86,11 @@ Token nextToken(final Token token) throws IOException {
         }
 
         if (isStartOfLine(lastChar) && isCommentStart(c)) {
-            String line = in.readLine();
+            final String line = in.readLine();
             if (line == null) {
                 token.type = EOF;
                 // don't set token.isReady here because no content
-                return token;                
+                return token;
             }
             final String comment = line.trim();
             token.content.append(comment);

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

@@ -37,15 +37,15 @@
 
 /**
  * Parses CSV files according to the specified configuration.
- * 
+ *
  * Because CSV appears in many different dialects, the parser supports many configuration settings by allowing the
  * specification of a {@link CSVFormat}.
- * 
+ *
  * <p>
  * To parse a CSV input with tabs as separators, '"' (double-quote) as an optional value encapsulator, and comments
  * starting with '#', you write:
  * </p>
- * 
+ *
  * <pre>
  * Reader in = new StringReader(&quot;a\tb\nc\td&quot;);
  * Iterable&lt;CSVRecord&gt; parser = CSVFormat.DEFAULT
@@ -56,11 +56,11 @@
  *     ...
  *  }
  * </pre>
- * 
+ *
  * <p>
  * To parse CSV input in a given format like Excel, you write:
  * </p>
- * 
+ *
  * <pre>
  * Reader in = new StringReader("a;b\nc;d");
  * Iterable&lt;CSVRecord&gt; parser = CSVFormat.EXCEL.parse(in);
@@ -71,7 +71,7 @@
  * <p>
  * You may also get a List of records:
  * </p>
- * 
+ *
  * <pre>
  * Reader in = new StringReader(&quot;a;b\nc;d&quot;);
  * CSVParser parser = new CSVParser(in, CSVFormat.EXCEL);
@@ -83,18 +83,18 @@
  * <p>
  * Internal parser state is completely covered by the format and the reader-state.
  * </p>
- * 
+ *
  * <p>
  * see <a href="package-summary.html">package documentation</a> for more details
  * </p>
- * 
+ *
  * @version $Id$
  */
 public class CSVParser implements Iterable<CSVRecord>, Closeable {
 
     /**
      * Creates a parser for the given {@link File}.
-     * 
+     *
      * @param file
      *            a CSV file
      * @param format
@@ -109,11 +109,11 @@ public static CSVParser parseFile(File file, final CSVFormat format) throws IOEx
 
     /**
      * Creates a parser for the given resource.
-     * 
+     *
      * <p>
      * If you do not read all records from the given source, you should call {@link #close()} on the parser.
      * </p>
-     * 
+     *
      * @param resource
      *            a resource path
      * @param charset
@@ -128,7 +128,7 @@ public static CSVParser parseFile(File file, final CSVFormat format) throws IOEx
      */
     public static CSVParser parseResource(String resource, Charset charset, ClassLoader classLoader,
             final CSVFormat format) throws IOException {
-        URL url = classLoader.getResource(resource);
+        final URL url = classLoader.getResource(resource);
         if (url == null) {
             throw new IllegalArgumentException("Resource cannot be found: " + resource);
         }
@@ -137,11 +137,11 @@ public static CSVParser parseResource(String resource, Charset charset, ClassLoa
 
     /**
      * Creates a parser for the given resource.
-     * 
+     *
      * <p>
      * If you do not read all records from the given source, you should call {@link #close()} on the parser.
      * </p>
-     * 
+     *
      * @param resource
      *            a resource path
      * @param charset
@@ -153,7 +153,7 @@ public static CSVParser parseResource(String resource, Charset charset, ClassLoa
      *             If an I/O error occurs
      */
     public static CSVParser parseResource(String resource, Charset charset, final CSVFormat format) throws IOException {
-        URL url = ClassLoader.getSystemResource(resource);
+        final URL url = ClassLoader.getSystemResource(resource);
         if (url == null) {
             throw new IllegalArgumentException("System resource cannot be found: " + resource);
         }
@@ -162,7 +162,7 @@ public static CSVParser parseResource(String resource, Charset charset, final CS
 
     /**
      * Creates a parser for the given {@link String} using the default format {@link CSVFormat#DEFAULT}.
-     * 
+     *
      * @param string
      *            a CSV string
      * @return a new parser
@@ -175,7 +175,7 @@ public static CSVParser parseString(String string) throws IOException {
 
     /**
      * Creates a parser for the given {@link String}.
-     * 
+     *
      * @param string
      *            a CSV string
      * @param format
@@ -190,12 +190,12 @@ public static CSVParser parseString(String string, final CSVFormat format) throw
 
     /**
      * Creates a parser for the given URL.
-     * 
+     *
      * <p>
      * If you do not read all records from the given {@code url}, you should call {@link #close()} on the parser, unless
      * you close the {@code url}.
      * </p>
-     * 
+     *
      * @param url
      *            a URL
      * @param charset
@@ -230,12 +230,12 @@ public static CSVParser parseURL(URL url, Charset charset, final CSVFormat forma
 
     /**
      * CSV parser using the default format {@link CSVFormat#DEFAULT}.
-     * 
+     *
      * <p>
      * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,
      * unless you close the {@code reader}.
      * </p>
-     * 
+     *
      * @param input
      *            a Reader containing "csv-formatted" input
      * @throws IllegalArgumentException
@@ -249,12 +249,12 @@ public CSVParser(final Reader input) throws IOException {
 
     /**
      * Customized CSV parser using the given {@link CSVFormat}
-     * 
+     *
      * <p>
      * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,
      * unless you close the {@code reader}.
      * </p>
-     * 
+     *
      * @param reader
      *            a Reader containing CSV-formatted input
      * @param format
@@ -283,7 +283,7 @@ private void addRecordValue() {
 
     /**
      * Closes resources.
-     * 
+     *
      * @throws IOException
      *             If an I/O error occurs
      */
@@ -297,7 +297,7 @@ public void close() throws IOException {
      * Returns the current line number in the input stream.
      * <p/>
      * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the record number.
-     * 
+     *
      * @return current line number
      */
     public long getCurrentLineNumber() {
@@ -308,7 +308,7 @@ public long getCurrentLineNumber() {
      * Returns a copy of the header map that iterates in column order.
      * <p>
      * The map keys are column names. The map values are 0-based indices.
-     * 
+     *
      * @return a copy of the header map that iterates in column order.
      */
     public Map<String, Integer> getHeaderMap() {
@@ -319,7 +319,7 @@ public Map<String, Integer> getHeaderMap() {
      * Returns the current record number in the input stream.
      * <p/>
      * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the line number.
-     * 
+     *
      * @return current line number
      */
     public long getRecordNumber() {
@@ -331,7 +331,7 @@ public long getRecordNumber() {
      * entries.
      * <p/>
      * The returned content starts at the current parse-position in the stream.
-     * 
+     *
      * @return list of {@link CSVRecord} entries, may be empty
      * @throws IOException
      *             on parse error or input read-failure
@@ -350,7 +350,7 @@ public List<CSVRecord> getRecords() throws IOException {
      */
     private Map<String, Integer> initializeHeader() throws IOException {
         Map<String, Integer> hdrMap = null;
-        String[] formatHeader = this.format.getHeader();
+        final String[] formatHeader = this.format.getHeader();
         if (formatHeader != null) {
             hdrMap = new LinkedHashMap<String, Integer>();
 
@@ -436,7 +436,7 @@ public void remove() {
 
     /**
      * Parses the next record from the current point in the stream.
-     * 
+     *
      * @return the record as an array of values, or <tt>null</tt> if the end of the stream has been reached
      * @throws IOException
      *             on parse error or input read-failure

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

@@ -49,7 +49,7 @@ final class Constants {
 
     /** According to RFC 4180, line breaks are delimited by CRLF */
     static final String CRLF = "\r\n";
-    
+
     /**
      * Unicode line separator.
      */

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

@@ -41,7 +41,7 @@ final class ExtendedBufferedReader extends BufferedReader {
 
     /** The count of EOLs (CR/LF/CRLF) seen so far */
     private long eolCounter = 0;
-    
+
     private boolean closed;
 
     /**
@@ -163,7 +163,7 @@ public boolean isClosed() {
 
 	/**
 	 * Closes the stream.
-	 * 
+	 *
 	 * @throws IOException
 	 *             If an I/O error occurs
 	 */

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

@@ -151,7 +151,7 @@ boolean readEndOfLine(int ch) throws IOException {
     boolean isClosed() {
     	return in.isClosed();
     }
-    
+
     /**
      * @return true if the given char is a whitespace character
      */
@@ -201,7 +201,7 @@ private boolean isMetaChar(final int ch) {
 
     /**
      * Closes resources.
-     * 
+     *
 	 * @throws IOException
 	 *             If an I/O error occurs
      */

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

@@ -65,7 +65,7 @@ void reset() {
 
     /**
      * Eases IDE debugging.
-     * 
+     *
      * @return a string helpful for debugging.
      */
     @Override