From 279d5f2902d0d099756ece3552d6c31309e6a4f0 Mon Sep 17 00:00:00 2001
From: Scrubbius <ice_devil1995@hotmail.com>
Date: Tue, 6 Nov 2018 18:51:47 +0800
Subject: [PATCH] Update importvolunteercsv to read delimiters for csv in
 bracer and commas Update exportvolunteercsv to have compatibility with the
 import format

---
 .../address/logic/commands/ExportVolunteerCsvCommand.java   | 6 +++---
 .../address/logic/commands/ImportVolunteerCsvCommand.java   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seedu/address/logic/commands/ExportVolunteerCsvCommand.java b/src/main/java/seedu/address/logic/commands/ExportVolunteerCsvCommand.java
index eaba4aa04d99..8e2b5d49d2e8 100644
--- a/src/main/java/seedu/address/logic/commands/ExportVolunteerCsvCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ExportVolunteerCsvCommand.java
@@ -104,11 +104,11 @@ private void createVolunteerCsv(ObservableList<Volunteer> list,
 
         //appending column titles
         sb.append("Name" + csvSplit);
+        sb.append("Gender" + csvSplit);
+        sb.append("Birthday" + csvSplit);
         sb.append("Phone" + csvSplit);
-        sb.append("Address" + csvSplit);
         sb.append("Email" + csvSplit);
-        sb.append("Birthday" + csvSplit);
-        sb.append("Gender" + csvSplit);
+        sb.append("Address" + csvSplit);
         sb.append("Tags" + csvSplit);
         sb.append("VolunteerID");
         sb.append(System.getProperty("line.separator"));
diff --git a/src/main/java/seedu/address/logic/commands/ImportVolunteerCsvCommand.java b/src/main/java/seedu/address/logic/commands/ImportVolunteerCsvCommand.java
index 605b3a07a22b..1f43dc685cf2 100644
--- a/src/main/java/seedu/address/logic/commands/ImportVolunteerCsvCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ImportVolunteerCsvCommand.java
@@ -78,10 +78,12 @@ public CommandResult execute(Model model, CommandHistory history) throws Command
         try {
             String currLine;
             while ((currLine = br.readLine()) != null) {
-                String[] arrayLine = currLine.split(",");
+                String[] arrayLine = currLine.split(",(?=([^\"]*\"[^\"]*\")*[^\"]*$)");
                 String args = "";
                 for (String i : arrayLine) {
-                    args += i + " ";
+                    if (String i != null){
+                        args += i + " ";
+                    }
                 }
                 args = args.trim();
                 ArgumentMultimap argMultimap =