From 992c0645e0b4d9436593f39c3bcff77328adb37c Mon Sep 17 00:00:00 2001
From: "Gary D. Gregory" <ggregory@apache.org>
Date: Sat, 13 Oct 2012 06:29:09 +0000
Subject: [PATCH] Rename ivar to ignoreEmptyLines to match CSVFormat.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1397785 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/commons/csv/CSVLexer.java        | 2 +-
 src/main/java/org/apache/commons/csv/Lexer.java           | 4 ++--
 src/test/java/org/apache/commons/csv/CSVLexer1306663.java | 2 +-
 src/test/java/org/apache/commons/csv/CSVLexer1306667.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/CSVLexer.java b/src/main/java/org/apache/commons/csv/CSVLexer.java
index 3fe18ca9..7d1b2554 100644
--- a/src/main/java/org/apache/commons/csv/CSVLexer.java
+++ b/src/main/java/org/apache/commons/csv/CSVLexer.java
@@ -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;
diff --git a/src/main/java/org/apache/commons/csv/Lexer.java b/src/main/java/org/apache/commons/csv/Lexer.java
index e412400c..d3857f0e 100644
--- a/src/main/java/org/apache/commons/csv/Lexer.java
+++ b/src/main/java/org/apache/commons/csv/Lexer.java
@@ -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() {
diff --git a/src/test/java/org/apache/commons/csv/CSVLexer1306663.java b/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
index a0cb148a..79cd13e1 100644
--- a/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
+++ b/src/test/java/org/apache/commons/csv/CSVLexer1306663.java
@@ -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;
diff --git a/src/test/java/org/apache/commons/csv/CSVLexer1306667.java b/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
index 13f861bb..d32ca090 100644
--- a/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
+++ b/src/test/java/org/apache/commons/csv/CSVLexer1306667.java
@@ -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;