Merge branch 'master' into master

Author: Brian030601

build.gradle

@@ -41,7 +41,7 @@ checkstyle {
     toolVersion = '10.2'
 }
 
-run{
+run {
     standardInput = System.in
     enableAssertions = true
 }

data/flashcard.txt

@@ -5,3 +5,4 @@ ddf | dfdf | - | - | -
 hello | bye | - | - | -
 hello | bye | - | - | -
 end program | hello | - | - | -
+hello | world | - | - | -

src/main/java/seedu/duke/Duke.java

@@ -4,8 +4,8 @@
 
 import seedu.duke.flashcard.Flashcard;
 import seedu.duke.flashcard.FlashcardComponent;
-import seedu.duke.calendar.Event;
 import seedu.duke.calendar.CalendarManager;
+import seedu.duke.calendar.Event;
 
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -18,7 +18,7 @@ public static void main(String[] args) {
     }
 
     private void runCalendar() {
-        System.out.print("Enter your command: ");
+        System.out.println("Enter your command: ");
 
         CalendarManager manager = new CalendarManager(new ArrayList<Event>());
 
@@ -72,7 +72,7 @@ private void run() {
         String flashcardOrCalendar;
         Scanner scanner = new Scanner(System.in);
 
-        System.out.print("Do you choose flashcard or calendar? ");
+        System.out.println("Do you choose flashcard or calendar? ");
         flashcardOrCalendar = scanner.nextLine();
 
         if (flashcardOrCalendar.equals("flashcard")) {

src/main/java/seedu/duke/flashcard/FlashcardComponent.java

@@ -27,7 +27,6 @@ public FlashcardComponent(ArrayList<Flashcard> flashcards) {
         storage = new FlashcardStorage("./data/flashcard.txt");
         try {
             flashcardList = storage.loadFlashcards();
-            System.out.println("Loading existed File");
         } catch (FileNotFoundException e){
             System.out.println("Making New file");
             flashcardList = new FlashcardList(flashcards);

src/main/java/seedu/duke/flashcard/FlashcardDirectory.java

@@ -20,12 +20,12 @@ public FlashcardDirectory(){
         file = new File(path);
         if(!file.exists()){
             if(file.mkdir()){
-                System.out.println("Created data directory");
+                System.out.println("    Created data directory");
             } else{
-                System.out.println("Failed to create directory");
+                System.out.println("    Failed to create directory");
             }
         } else{
-            System.out.println("Using data directory");
+            System.out.println("    Using data directory");
         }
     }
 
@@ -41,7 +41,7 @@ public void listFlashcardFiles(){
             System.out.println("No files exist");
         } else{
             for(String flashcardFile : flashcardFiles){
-                System.out.println(flashcardFile);
+                System.out.println("        "+flashcardFile);
             }
         }
     }

src/main/java/seedu/duke/flashcard/FlashcardList.java

@@ -15,6 +15,11 @@ public ArrayList<Flashcard> getFlashcards() {
         return flashcards;
     }
 
+    // @@author junhyeong0411
+    public int getSize(){
+        return flashcards.size();
+    }
+
 
     public void add(Flashcard flashcard) {
         flashcards.add(flashcard);

src/main/java/seedu/duke/flashcard/FlashcardStorage.java

@@ -33,6 +33,9 @@ public boolean isStorageAvailable(){
      * @return Flashcard object
      */
     private Flashcard loadFlashcard(String[] tokens){
+
+        assert tokens.length == 5: "Token length should be 5";
+
         String frontText = tokens[0].trim();
         String backText = tokens[1].trim();
         String[] tags = tokens[2].trim().split("/");
@@ -82,11 +85,16 @@ public FlashcardList loadFlashcards() throws FileNotFoundException{
             flashcardList.add(loadFlashcard(flashTokens));
         }
 
+        System.out.println(String.format(
+                "    There are currently %d flashcards in the savefile",
+                flashcardList.getSize()));
+
         return flashcardList;
 
     }
 
     public void saveFlashcards(ArrayList<Flashcard> flashcardList) {
+
         try {
             FileWriter fw = new FileWriter(path);
 

text-ui-test/ACTUAL.TXT

@@ -0,0 +1,2 @@
+Do you choose flashcard or calendar? 
+Enter your command: 

text-ui-test/EXPECTED-UNIX.TXT

@@ -0,0 +1,2 @@
+Do you choose flashcard or calendar? 
+Enter your command: 

text-ui-test/EXPECTED.TXT

@@ -1 +1,2 @@
-Enter the front page text:
+Do you choose flashcard or calendar? 
+Enter your command: