mirror of
https://github.com/apache/commons-csv.git
synced 2025-02-17 15:35:46 +00:00
Sort methods in AB order.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1383924 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
473727be26
commit
25f4b3e998
@ -122,22 +122,14 @@ public class CSVParser implements Iterable<CSVRecord> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses the CSV input according to the given format and returns the content as an array of {@link CSVRecord}
|
||||
* entries.
|
||||
* Returns the current line number in the input stream.
|
||||
* <p/>
|
||||
* The returned content starts at the current parse-position in the stream.
|
||||
* ATTENTION: in case your csv has multiline-values the returned number does not correspond to the record-number
|
||||
*
|
||||
* @return list of {@link CSVRecord} entries, may be empty
|
||||
* @throws IOException
|
||||
* on parse error or input read-failure
|
||||
* @return current line number
|
||||
*/
|
||||
public List<CSVRecord> getRecords() throws IOException {
|
||||
List<CSVRecord> records = new ArrayList<CSVRecord>();
|
||||
CSVRecord rec;
|
||||
while ((rec = getRecord()) != null) {
|
||||
records.add(rec);
|
||||
}
|
||||
return records;
|
||||
public int getLineNumber() {
|
||||
return lexer.getLineNumber();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -189,6 +181,25 @@ public class CSVParser implements Iterable<CSVRecord> {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses the CSV input according to the given format and returns the content as an array of {@link CSVRecord}
|
||||
* 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
|
||||
*/
|
||||
public List<CSVRecord> getRecords() throws IOException {
|
||||
List<CSVRecord> records = new ArrayList<CSVRecord>();
|
||||
CSVRecord rec;
|
||||
while ((rec = getRecord()) != null) {
|
||||
records.add(rec);
|
||||
}
|
||||
return records;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the name to index mapping if the format defines a header.
|
||||
*/
|
||||
@ -226,6 +237,14 @@ public class CSVParser implements Iterable<CSVRecord> {
|
||||
return new Iterator<CSVRecord>() {
|
||||
private CSVRecord current;
|
||||
|
||||
private CSVRecord getNextRecord() {
|
||||
try {
|
||||
return getRecord();
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasNext() {
|
||||
if (current == null) {
|
||||
current = getNextRecord();
|
||||
@ -249,28 +268,9 @@ public class CSVParser implements Iterable<CSVRecord> {
|
||||
return next;
|
||||
}
|
||||
|
||||
private CSVRecord getNextRecord() {
|
||||
try {
|
||||
return getRecord();
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void remove() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current line number in the input stream.
|
||||
* <p/>
|
||||
* ATTENTION: in case your csv has multiline-values the returned number does not correspond to the record-number
|
||||
*
|
||||
* @return current line number
|
||||
*/
|
||||
public int getLineNumber() {
|
||||
return lexer.getLineNumber();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user