Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9E7AF6F2 for ; Sat, 23 Mar 2013 12:49:00 +0000 (UTC) Received: (qmail 35578 invoked by uid 500); 23 Mar 2013 12:48:58 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 35022 invoked by uid 500); 23 Mar 2013 12:48:53 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 34986 invoked by uid 99); 23 Mar 2013 12:48:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Mar 2013 12:48:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Mar 2013 12:48:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 750522388847; Sat, 23 Mar 2013 12:48:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1460136 - /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java Date: Sat, 23 Mar 2013 12:48:24 -0000 To: commits@commons.apache.org From: britter@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130323124824.750522388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: britter Date: Sat Mar 23 12:48:24 2013 New Revision: 1460136 URL: http://svn.apache.org/r1460136 Log: Method names should start with a verb Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.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=1460136&r1=1460135&r2=1460136&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 Mar 23 12:48:24 2013 @@ -112,7 +112,7 @@ final class CSVLexer extends Lexer { token.type = EORECORD; } else if (isQuoteChar(c)) { // consume encapsulated token - encapsulatedTokenLexer(token); + parseEncapsulatedToken(token); } else if (isEndOfFile(c)) { // end of file return EOF() // noop: tkn.content.append(""); @@ -121,14 +121,14 @@ final class CSVLexer extends Lexer { } else { // next token must be a simple token // add removed blanks when not ignoring whitespace chars... - simpleTokenLexer(token, c); + parseSimpleToken(token, c); } } return token; } /** - * A simple token lexer + * Parsed a simple token. *

* Simple token are tokens which are not surrounded by encapsulators. A simple token might contain escaped * delimiters (as \, or \;). The token is finished when one of the following conditions become true: @@ -146,7 +146,7 @@ final class CSVLexer extends Lexer { * @throws IOException * on stream access error */ - private Token simpleTokenLexer(final Token tkn, int c) throws IOException { + private Token parseSimpleToken(final Token tkn, int c) throws IOException { // Faster to use while(true)+break than while(tkn.type == INVALID) while (true) { if (readEndOfLine(c)) { @@ -176,7 +176,7 @@ final class CSVLexer extends Lexer { } /** - * An encapsulated token lexer + * Parses an encapsulated token. *

* Encapsulated tokens are surrounded by the given encapsulating-string. The encapsulator itself might be included * in the token using a doubling syntax (as "", '') or using escaping (as in \", \'). Whitespaces before and after @@ -195,7 +195,7 @@ final class CSVLexer extends Lexer { * @throws IOException * on invalid state: EOF before closing encapsulator or invalid character before delimiter or EOL */ - private Token encapsulatedTokenLexer(final Token tkn) throws IOException { + private Token parseEncapsulatedToken(final Token tkn) throws IOException { // save current line number in case needed for IOE final long startLineNumber = getLineNumber(); int c;