Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Changed exception handling in CsvParser

This commit is contained in:
Robert von Burg 2015-07-10 10:47:44 +02:00
parent ffbce7aab6
commit 35bbb04d89
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ch/eitchnet/utils/csv/CsvParser.java
View File

@ -16,7 +16,6 @@
package ch.eitchnet.utils.csv; package ch.eitchnet.utils.csv;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
@ -53,6 +52,7 @@ public class CsvParser {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(this.inputStream))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(this.inputStream))) {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
lineNr++;
line = line.trim(); line = line.trim();
if (line.isEmpty()) if (line.isEmpty())
@ -64,7 +64,7 @@ public class CsvParser {
scanner.useDelimiter(";"); scanner.useDelimiter(";");
if (headerRead) { if (headerRead) {
int column = 0; int column = 0;
CsvRow row = new CsvRow(lineNr); CsvRow row = new CsvRow(lineNr - 1);
while (scanner.hasNext()) { while (scanner.hasNext()) {
row.addColumnValue(data.getHeaderAtIndex(column), scanner.next()); row.addColumnValue(data.getHeaderAtIndex(column), scanner.next());
column++; column++;
@ -77,11 +77,9 @@ public class CsvParser {
headerRead = true; headerRead = true;
} }
} }
lineNr++;
} }
} }
} catch (IOException e) { } catch (Exception e) {
throw new RuntimeException("Failed to read csv data at line " + lineNr + " due to " + e.getMessage(), e); throw new RuntimeException("Failed to read csv data at line " + lineNr + " due to " + e.getMessage(), e);
} }