Author: ggregory Date: Sat Oct 13 17:11:42 2012 New Revision: 1397898 URL: http://svn.apache.org/viewvc?rev=1397898&view=rev Log: Let the line number count be a long.
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/CSVParser.java commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.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/CSVLexer1.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=1397898&r1=1397897&r2=1397898&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 17:11:42 2012 @@ -192,7 +192,7 @@ class CSVLexer extends Lexer { */ private Token encapsulatedTokenLexer(final Token tkn) throws IOException { // save current line number in case needed for IOE - final int startLineNumber = getLineNumber(); + final long startLineNumber = getLineNumber(); int c; while (true) { c = in.read(); 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=1397898&r1=1397897&r2=1397898&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 Sat Oct 13 17:11:42 2012 @@ -139,7 +139,7 @@ public class CSVParser implements Iterab * * @return current line number */ - public int getLineNumber() { + public long getLineNumber() { return lexer.getLineNumber(); } Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java?rev=1397898&r1=1397897&r2=1397898&view=diff ============================================================================== --- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java (original) +++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java Sat Oct 13 17:11:42 2012 @@ -38,7 +38,7 @@ class ExtendedBufferedReader extends Buf private int lastChar = UNDEFINED; /** The line counter */ - private int lineCounter = 0; + private long lineCounter; /** * Created extended buffered reader using default buffer-size @@ -145,7 +145,7 @@ class ExtendedBufferedReader extends Buf * * @return the current-line-number (or -1) */ - int getLineNumber() { + long getLineNumber() { return lineCounter; } } 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=1397898&r1=1397897&r2=1397898&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 17:11:42 2012 @@ -67,7 +67,7 @@ abstract class Lexer { return c == null ? DISABLED : c.charValue(); } - int getLineNumber() { + long getLineNumber() { return in.getLineNumber(); } Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java?rev=1397898&r1=1397897&r2=1397898&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java Sat Oct 13 17:11:42 2012 @@ -192,7 +192,7 @@ class CSVLexer1 extends Lexer { */ private Token encapsulatedTokenLexer(final Token tkn, int c) throws IOException { // save current line - final int startLineNumber = getLineNumber(); + final long startLineNumber = getLineNumber(); // ignore the given delimiter // assert c == delimiter; while (true) { 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=1397898&r1=1397897&r2=1397898&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 17:11:42 2012 @@ -182,7 +182,7 @@ class CSVLexer1306663 extends Lexer { */ private Token encapsulatedTokenLexer(final Token tkn) throws IOException { // save current line - final int startLineNumber = getLineNumber(); + final long startLineNumber = getLineNumber(); // ignore the given delimiter // assert c == delimiter; int 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=1397898&r1=1397897&r2=1397898&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 17:11:42 2012 @@ -182,7 +182,7 @@ class CSVLexer1306667 extends Lexer { */ private Token encapsulatedTokenLexer(final Token tkn) throws IOException { // save current line - final int startLineNumber = getLineNumber(); + final long startLineNumber = getLineNumber(); // ignore the given delimiter // assert c == delimiter; int c;