svn commit: r1397785 - in /commons/proper/csv/trunk/src: main/java/org/apache/commons/csv/CSVLexer.java main/java/org/apache/commons/csv/Lexer.java test/java/org/apache/commons/csv/CSVLexer1306663.java test/java/org/apache/commons/csv/CSVLexer1306667.java

[ggregory]

Author: ggregory
Date: Sat Oct 13 06:29:09 2012
New Revision: 1397785

URL: http://svn.apache.org/viewvc?rev=1397785&view=rev
Log:
Rename ivar to ignoreEmptyLines to match CSVFormat.

Modified:
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Lexer.java
    
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
    
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java

Modified: 
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java?rev=1397785&r1=1397784&r2=1397785&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java 
(original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java 
Sat Oct 13 06:29:09 2012
@@ -58,7 +58,7 @@ class CSVLexer extends Lexer {
         boolean eol = isEndOfLine(c);
 
         // empty line detection: eol AND (last char was EOL or beginning)
-        if (emptyLinesIgnored) {
+        if (ignoreEmptyLines) {
             while (eol && isStartOfLine(lastChar)) {
                 // go on char ahead ...
                 lastChar = c;

Modified: 
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Lexer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Lexer.java?rev=1397785&r1=1397784&r2=1397785&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Lexer.java 
(original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Lexer.java 
Sat Oct 13 06:29:09 2012
@@ -38,7 +38,7 @@ abstract class Lexer {
     private final Character commmentStart;
 
     final boolean ignoreSurroundingSpaces;
-    final boolean emptyLinesIgnored;
+    final boolean ignoreEmptyLines;
 
     final CSVFormat format;
 
@@ -53,7 +53,7 @@ abstract class Lexer {
         this.encapsulator = format.getEncapsulator();
         this.commmentStart = format.getCommentStart();
         this.ignoreSurroundingSpaces = format.getIgnoreSurroundingSpaces();
-        this.emptyLinesIgnored = format.getIgnoreEmptyLines();
+        this.ignoreEmptyLines = format.getIgnoreEmptyLines();
     }
 
     int getLineNumber() {

Modified: 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
URL: 
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java?rev=1397785&r1=1397784&r2=1397785&view=diff
==============================================================================
--- 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
 (original)
+++ 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
 Sat Oct 13 06:29:09 2012
@@ -64,7 +64,7 @@ class CSVLexer1306663 extends Lexer {
         c = in.readAgain();
 
         //  empty line detection: eol AND (last char was EOL or beginning)
-        if (emptyLinesIgnored) {
+        if (ignoreEmptyLines) {
             while (eol && isStartOfLine(lastChar)) {
                 // go on char ahead ...
                 lastChar = c;

Modified: 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
URL: 
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java?rev=1397785&r1=1397784&r2=1397785&view=diff
==============================================================================
--- 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
 (original)
+++ 
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
 Sat Oct 13 06:29:09 2012
@@ -58,7 +58,7 @@ class CSVLexer1306667 extends Lexer {
         c = in.readAgain();
 
         //  empty line detection: eol AND (last char was EOL or beginning)
-        if (emptyLinesIgnored) {
+        if (ignoreEmptyLines) {
             while (eol && isStartOfLine(lastChar)) {
                 // go on char ahead ...
                 lastChar = c;