Merge pull request #33 from EugeneChanJiajun/master

Add parser and exceptions

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

@@ -6,45 +6,68 @@ public class Duke {
 
     private Ui ui = new Ui();
     public static void main(String[] args) {
-
         new Duke().runBot();
         boolean userSaysBye = false;
-        TravelActivityList travelActivityList = new TravelActivityList();
+        TravelActivityList list = new TravelActivityList();
         String line;
         Scanner in = new Scanner(System.in);
         while (!userSaysBye) {
             line = in.nextLine();
-            if (line.equals("list")) {
-                // Prints the all the tasks in the list
-                System.out.println("Here are the travel activities in your list:");
-                travelActivityList.listTravelActivities();
-            } else if (line.startsWith("add")){
-                // Adds a travel activity into the list
-                String[] sentence = line.split(" ");
-                // Checks if the description of the task is empty
-                TravelActivity newTask = new TravelActivity(sentence[1]);
-                travelActivityList.addTravelActivity(newTask);
-                System.out.println("I added a new travel activity");
-                System.out.println(newTask);
-
-            } else if(line.startsWith("delete")){
-                // Deletes the task in the list
-                String[] sentence = line.split(" ");
-                // Checks if the description of the task is empty or non-numerical
-
-                int taskNumber = Integer.parseInt(sentence[1]);
-                travelActivityList.removeTravelActivity(taskNumber);
-            } else if(line.startsWith("find")) {
-                String[] taskName = line.split(" ");
-                travelActivityList.searchTask(taskName[1]);
-            }
-            else if(line.startsWith("bye")){
+            String[] command = line.split(" ");
+
+            switch (command[0].toLowerCase()) {
+            case "list":
+                Ui.printLine();
+                Parser.getList(list);
+                Ui.printLine();
+                break;
+            case "add":
+                try {
+                    Ui.printLine();
+                    Parser.addCommand(line, command, list);
+                    Ui.printLine();
+                }
+                catch (OmniException exception){
+                    Ui.printLine();
+                    System.out.println("Warning! " + exception.getMessage());
+                }
+                break;
+            case "delete":
+                try {
+                    Ui.printLine();
+                    Parser.deleteCommand(command, list);
+                    Ui.printLine();
+                }
+                catch (OmniException exception){
+                    Ui.printLine();
+                    System.out.println("Warning! " + exception.getMessage());
+                }
+                break;
+            case "find":
+                try {
+                    Ui.printLine();
+                    Parser.findCommand(command, list);
+                    Ui.printLine();
+                }
+                catch (OmniException exception){
+                    Ui.printLine();
+                    System.out.println("Warning! " + exception.getMessage());
+                }
+                break;
+            case "bye":
+                Ui.printLine();
+                System.out.println("Hope to see you again soon. Bye!");
+                Ui.printLine();
                 userSaysBye = true;
-            }
+                break;
+            default:
+                Ui.printLine();
+                System.out.println("This is not a valid command");
+                Ui.printLine();
 
+            }
         }
     }
-
     public void runBot(){
         ui.printGreeting();
     }

src/main/java/seedu/duke/OmniException.java

@@ -0,0 +1,7 @@
+package seedu.duke;
+
+public class OmniException extends Exception {
+    public OmniException(String errorMessage){
+        super(errorMessage);
+    }
+}

src/main/java/seedu/duke/Parser.java

@@ -0,0 +1,37 @@
+package seedu.duke;
+
+public class Parser {
+    public static void getList(TravelActivityList list){
+        System.out.println("Here are the travel activities in your list:");
+        list.listTravelActivities();
+    }
+
+    public static void addCommand(String line, String[] command, TravelActivityList list) throws OmniException{
+        if (command.length >= 2) {
+            TravelActivity newActivity = new TravelActivity(line.substring(4));
+            list.addTravelActivity(newActivity);
+            System.out.println("I added a new travel activity");
+            System.out.println(newActivity);
+        } else {
+            throw new OmniException("The description of add cannot be empty!");
+        }
+    }
+
+    public static void deleteCommand(String[] command, TravelActivityList list) throws OmniException {
+        if (command.length == 2){
+            int listNumber = Integer.parseInt(command[1]);
+            list.removeTravelActivity(listNumber);
+        } else {
+            throw new OmniException("Please specify which task to delete");
+        }
+    }
+
+    public static void findCommand(String[] command, TravelActivityList list) throws OmniException{
+        if (command.length == 2) {
+            String keyword = command[1];
+            list.searchKeyword(keyword);
+        } else {
+            throw new OmniException("Please specify which keyword you want to find!");
+        }
+    }
+}

src/main/java/seedu/duke/TravelActivityList.java

@@ -66,7 +66,7 @@ public String getDescription(String plan){
         return "cant be found";
     }
 
-    public void searchTask (String taskName) {
+    public void searchKeyword (String taskName) {
         ArrayList<TravelActivity> temporaryArray = new ArrayList<TravelActivity>();;
         int temporaryArrayCounter = 0;
         boolean isFound = false;

src/main/java/seedu/duke/Ui.java

@@ -10,24 +10,28 @@ public class Ui {
      * Prints the greetings
      */
     public void printGreeting() {
+        printLine();
         System.out.println(" ____  _      _      _  _____  ____  ____  _     _____ _    \n" +
                 "/  _ \\/ \\__/|/ \\  /|/ \\/__ __\\/  __\\/  _ \\/ \\ |\\/  __// \\   \n" +
                 "| / \\|| |\\/||| |\\ ||| |  / \\  |  \\/|| / \\|| | //|  \\  | |   \n" +
                 "| \\_/|| |  ||| | \\||| |  | |  |    /| |-||| \\// |  /_ | |_/\\\n" +
                 "\\____/\\_/  \\|\\_/  \\|\\_/  \\_/  \\_/\\_\\\\_/ \\|\\__/  \\____\\\\____/)");
         System.out.println("Hello");
         System.out.println("How may I assist you?");
+        printLine();
     }
 
     /**
      * Prints the farewell greetings
      */
     public void printBye(){
+        printLine();
         System.out.println("Thank you for using Omnitravel");
         System.out.println("We hope to see you again! Goodbye!");
+        printLine();
     }
 
-    public void printLine(){
+    public static void printLine(){
         System.out.println("____________________________________________________________");
     }
 

text-ui-test/EXPECTED.TXT

@@ -1,9 +1,9 @@
-Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
-
-What is your name?
-Hello James Gosling
+____________________________________________________________
+ ____  _      _      _  _____  ____  ____  _     _____ _
+/  _ \/ \__/|/ \  /|/ \/__ __\/  __\/  _ \/ \ |\/  __// \
+| / \|| |\/||| |\ ||| |  / \  |  \/|| / \|| | //|  \  | |
+| \_/|| |  ||| | \||| |  | |  |    /| |-||| \// |  /_ | |_/\
+\____/\_/  \|\_/  \|\_/  \_/  \_/\_\\_/ \|\__/  \____\\____/)
+Hello
+How may I assist you?
+____________________________________________________________

text-ui-test/input.txt

@@ -1 +0,0 @@
-James Gosling

text-ui-test/runtest.sh

@@ -10,9 +10,9 @@ cd text-ui-test
 
 java  -jar $(find ../build/libs/ -mindepth 1 -print -quit) < input.txt > ACTUAL.TXT
 
-cp EXPECTED.TXT EXPECTED-UNIX.TXT
-dos2unix EXPECTED-UNIX.TXT ACTUAL.TXT
-diff EXPECTED-UNIX.TXT ACTUAL.TXT
+#cp EXPECTED.TXT EXPECTED-UNIX.TXT
+#dos2unix EXPECTED-UNIX.TXT ACTUAL.TXT
+diff EXPECTED.TXT ACTUAL.TXT
 if [ $? -eq 0 ]
 then
     echo "Test passed!"