From 8f4e8f66e19c78ce414cd946686547f42522c92c Mon Sep 17 00:00:00 2001
From: Carlos Galindo <carlos.s.galindo@gmail.com>
Date: Sun, 12 Jun 2016 00:50:51 +0200
Subject: [PATCH] Import from CSV (comma separated without commas in the
 values)

---
 .../es/kauron/jstudy/controller/Controller.java   | 15 ++++++++++++++-
 .../java/es/kauron/jstudy/model/TestItem.java     |  8 +++++---
 .../resources/es/kauron/jstudy/view/main.fxml     |  8 ++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/es/kauron/jstudy/controller/Controller.java b/src/main/java/es/kauron/jstudy/controller/Controller.java
index ebc4147..b7f43f9 100644
--- a/src/main/java/es/kauron/jstudy/controller/Controller.java
+++ b/src/main/java/es/kauron/jstudy/controller/Controller.java
@@ -61,7 +61,7 @@ public class Controller implements Initializable {
         chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("JStudy file", "*.jsdb"));
         File file = chooser.showOpenDialog(root.getScene().getWindow());
         if (file == null) return;
-        List<TestItem> aux = TestItem.loadFrom(file);
+        List<TestItem> aux = TestItem.loadFrom(file, TestItem.COLONS);
         if (aux != null) {
             tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux));
             tabPane.getSelectionModel().selectLast();
@@ -77,6 +77,19 @@ public class Controller implements Initializable {
         TestItem.saveTo(file, tabMap.get(tabPane.getSelectionModel().getSelectedItem()).getData());
     }
 
+    @FXML
+    private void onImportAction(ActionEvent event) {
+        FileChooser chooser = new FileChooser();
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Data files (.csv)", "*.csv"));
+        File file = chooser.showOpenDialog(root.getScene().getWindow());
+        if (file == null) return;
+        List<TestItem> aux = TestItem.loadFrom(file, TestItem.COMMA);
+        if (aux != null) {
+            tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux));
+            tabPane.getSelectionModel().selectLast();
+        }
+    }
+
     private Tab createTableTab(String name, List<TestItem> list) {
         try {
             Tab tab = new Tab(name);
diff --git a/src/main/java/es/kauron/jstudy/model/TestItem.java b/src/main/java/es/kauron/jstudy/model/TestItem.java
index c57c14a..d791797 100644
--- a/src/main/java/es/kauron/jstudy/model/TestItem.java
+++ b/src/main/java/es/kauron/jstudy/model/TestItem.java
@@ -10,6 +10,8 @@ import java.util.List;
 import java.util.Scanner;
 
 public class TestItem {
+    public static final String COMMA = ",", COLONS = "::";
+
     private StringProperty question, answer;
 
     public TestItem(SimpleStringProperty question, SimpleStringProperty answer) {
@@ -62,15 +64,15 @@ public class TestItem {
         }
     }
 
-    public static List<TestItem> loadFrom(File file) {
+    public static List<TestItem> loadFrom(File file, String separator) {
         List<TestItem> list = new ArrayList<>();
         try {
             Scanner in = new Scanner(file);
             while (in.hasNextLine()) {
                 String line = in.nextLine();
-                int index = line.indexOf("::");
+                int index = line.indexOf(separator);
                 String question = line.substring(0, index);
-                String answer   = line.substring(index + 2);
+                String answer   = line.substring(index + separator.length());
                 list.add(new TestItem(question, answer));
                 System.err.println(question + " :: " + answer);
             }
diff --git a/src/main/resources/es/kauron/jstudy/view/main.fxml b/src/main/resources/es/kauron/jstudy/view/main.fxml
index dd2e6fb..8866392 100644
--- a/src/main/resources/es/kauron/jstudy/view/main.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/main.fxml
@@ -24,6 +24,7 @@
                      <children>
                         <Button mnemonicParsing="false" onAction="#onNewAction" prefWidth="100.0" text="New table" />
                         <Button mnemonicParsing="false" onAction="#onLoadAction" prefWidth="100.0" text="Load file" />
+                        <Button layoutX="260.0" layoutY="187.0" mnemonicParsing="false" onAction="#onImportAction" prefWidth="100.0" text="Import data" />
                      </children>
                   </VBox>
               </content>
@@ -41,6 +42,7 @@
                         <KeyCodeCombination alt="UP" code="N" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator>
                   </MenuItem>
+                  <SeparatorMenuItem mnemonicParsing="false" />
               <MenuItem onAction="#onLoadAction" text="_Open">
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
@@ -51,6 +53,12 @@
                         <KeyCodeCombination alt="UP" code="S" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator>
                   </MenuItem>
+                  <SeparatorMenuItem mnemonicParsing="false" />
+                  <MenuItem onAction="#onImportAction" text="_Open">
+                     <accelerator>
+                        <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
+                     </accelerator>
+                  </MenuItem>
             </items>
           </Menu>
           <Menu text="_Options">