Merge pull request nus-cs2113-AY2324S1#27 from Brian030601/master

Connect Calendar with Duke

Author: Brian030601

data/flashcard.txt

@@ -2,3 +2,6 @@ d | a | - | - | -
 dfdf | dfdf | - | - | -
 dfdf | asdfdf | - | - | -
 ddf | dfdf | - | - | -
+hello | bye | - | - | -
+hello | bye | - | - | -
+end program | hello | - | - | -

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

@@ -4,6 +4,8 @@
 
 import seedu.duke.flashcard.Flashcard;
 import seedu.duke.flashcard.FlashcardComponent;
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.CalendarManager;
 
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -15,7 +17,36 @@ public static void main(String[] args) {
         new Duke().run();
     }
 
-    private void run() {
+    private void runCalendar() {
+        System.out.print("Enter your command: ");
+
+        CalendarManager manager = new CalendarManager();
+
+        Scanner scanner = new Scanner(System.in);
+        String input;
+        boolean isDone = false;
+
+        while (!isDone) {
+            input = scanner.nextLine();
+
+            if (input.equals("end program")) {
+                System.out.println("Bye bye");
+                break;
+            } else if (input.equals("flashcard")) {
+                runFlashcard();
+            } else if (manager.validCommand(input)) {
+                manager.startCalendar(input);
+            } else {
+                System.out.println("Invalid command! Enter a valid command.");
+            }
+
+        }
+
+    }
+
+    private void runFlashcard() {
+        System.out.print("Enter your command: ");
+
         FlashcardComponent fc = new FlashcardComponent(new ArrayList<Flashcard>());
 
         Scanner scanner = new Scanner(System.in);
@@ -31,6 +62,22 @@ private void run() {
                 System.out.println("    Invalid command! Sorry; please try again.");
             }
         }
+    }
 
+    private void run() {
+        String flashcardOrCalendar;
+        Scanner scanner = new Scanner(System.in);
+
+        System.out.print("Do you choose flashcard or calendar? ");
+        flashcardOrCalendar = scanner.nextLine();
+
+        if (flashcardOrCalendar.equals("flashcard")) {
+            runFlashcard();
+        } else if (flashcardOrCalendar.equals("calendar")) {
+            runCalendar();
+        } else {
+            System.out.println("Invalid command! Sorry; please try again.");
+            run();
+        }
     }
 }

src/main/java/seedu/duke/calendar/Calendar.java

@@ -2,8 +2,6 @@
 
 package seedu.duke.calendar;
 
-
-
 public class Calendar {
     EventList eventList;
 }

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

@@ -1,4 +1,4 @@
-//@@author kherlenbayasgalan
+//@@ kherlenbayasgalan & jingxizhu
 
 package seedu.duke.calendar;
 

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -1,5 +1,10 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
+import seedu.duke.calendar.command.EventCommand;
+import seedu.duke.calendar.command.UnknownCommand;
+
 import java.util.Scanner;
 
 public class CalendarManager {
@@ -15,10 +20,18 @@ public CalendarManager() {
         scanner = new Scanner(System.in);
     }
 
-    public void start() {
+    public boolean validCommand(String input) {
+        EventCommand command = calendarCommandParser.parseInput(input);
+
+        return !(command instanceof UnknownCommand);
+    }
+
+    public void startCalendar(String input) {
         calendarUi.begin();
-        String userCommand = scanner.nextLine();
-        calendarCommandParser.parseInput(userCommand);
+        EventCommand command = calendarCommandParser.parseInput(input);
+        assert !(command instanceof seedu.duke.calendar.command.UnknownCommand) :
+                "Command cannot be " + "unknown";
+        calendarCommandParser.parseInput(input);
     }
 
 }

src/main/java/seedu/duke/calendar/command/EventCommand.java

@@ -2,7 +2,8 @@
 
 package seedu.duke.calendar.command;
 
-
+import seedu.duke.calendar.EventList;
+import java.util.Scanner;
 
 public abstract class EventCommand {
     public abstract void execute(Scanner scanner, EventList eventList);