From 2ac20680806e621c7b1df33dd9fa252f1e6dd928 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Mon, 26 Jun 2017 17:05:36 +0200
Subject: [PATCH] Improved scanner datastructure

Signed-off-by: Jim Martens <github@2martens.de>
---
 07/src/de.dis2017/data/db/CSVScanner.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/07/src/de.dis2017/data/db/CSVScanner.java b/07/src/de.dis2017/data/db/CSVScanner.java
index adf42b0..a1481a5 100644
--- a/07/src/de.dis2017/data/db/CSVScanner.java
+++ b/07/src/de.dis2017/data/db/CSVScanner.java
@@ -12,14 +12,19 @@ public class CSVScanner {
      * @return a list of csv entries
      * @throws FileNotFoundException if file doesn't exist
      */
-    public List<String> scan() throws FileNotFoundException {
-        List<String> entries = new ArrayList<>();
+    public List<List<String>> scan() throws FileNotFoundException {
+        List<List<String>> entries = new ArrayList<>();
         
         Scanner scanner = new Scanner(new File("sales.csv"));
-        scanner.useDelimiter(";");
-        while (scanner.hasNext()) {
-            String current = scanner.next();
-            entries.add(current);
+        while (scanner.hasNextLine()) {
+            List<String> line = new ArrayList<>();
+            String line_str = scanner.nextLine();
+            Scanner line_scanner = new Scanner(line_str);
+            line_scanner.useDelimiter(";");
+            while (line_scanner.hasNext()) {
+                line.add(line_scanner.next());
+            }
+            entries.add(line);
         }
         scanner.close();