Merge pull request #30 from daryltay415/master

Update Ui class

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

@@ -4,9 +4,10 @@
 
 public class Duke {
 
+    private Ui ui = new Ui();
     public static void main(String[] args) {
 
-        printGreeting();
+        new Duke().runBot();
         boolean userSaysBye = false;
         TravelActivityList travelActivityList = new TravelActivityList();
         String line;
@@ -16,13 +17,13 @@ public static void main(String[] args) {
             if (line.equals("list")) {
                 // Prints the all the tasks in the list
                 System.out.println("Here are the travel activities in your list:");
-                travelActivityList.listTasks();
+                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.addTask(newTask);
+                travelActivityList.addTravelActivity(newTask);
                 System.out.println("I added a new travel activity");
                 System.out.println(newTask);
 
@@ -32,7 +33,7 @@ public static void main(String[] args) {
                 // Checks if the description of the task is empty or non-numerical
 
                 int taskNumber = Integer.parseInt(sentence[1]);
-                travelActivityList.removeTask(taskNumber);
+                travelActivityList.removeTravelActivity(taskNumber);
             } else if(line.startsWith("find")) {
                 String[] taskName = line.split(" ");
                 travelActivityList.searchTask(taskName[1]);
@@ -44,11 +45,11 @@ else if(line.startsWith("bye")){
         }
     }
 
-    public static void printGreeting() {
-        System.out.println("Hello");
-        System.out.println("How may I assist you?");
-
+    public void runBot(){
+        ui.printGreeting();
     }
+
+
 }
 
 

src/main/java/seedu/duke/TravelActivity.java

@@ -22,6 +22,10 @@ public void setTaskStatus(boolean taskIsDone){
         this.taskIsDone = taskIsDone;
     }
 
+    /**
+     * Gets the description of the travel activity
+     * @return The description of the travel activity
+     */
     public String getPlan(){
         return travelActivity;
     }

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

@@ -5,7 +5,7 @@ public class TravelActivityList {
     /** Array of travel activity */
     private ArrayList<TravelActivity> travelActivities;
 
-    /** Number of TravelActivitys */
+    /** Number of TravelActivities */
     private int noOfTasks = 0;
     public TravelActivityList() {
         travelActivities = new ArrayList<>();
@@ -15,15 +15,15 @@ public TravelActivityList() {
      * Adds travel activity to the travel activity list
      * @param travelActivity The travel activity
      */
-    public void addTask(TravelActivity travelActivity){
+    public void addTravelActivity(TravelActivity travelActivity){
         travelActivities.add(travelActivity);
         noOfTasks += 1;
     }
 
     /**
-     * Prints out all the task
+     * Prints out all the travel activities
      */
-    public void listTasks(){
+    public void listTravelActivities(){
         int taskCount = 0;
         for (TravelActivity task: travelActivities) {
             if (task == null) {
@@ -35,19 +35,18 @@ public void listTasks(){
     }
 
     /**
-     * returns the number of tasks in the list
-     * @return the number of tasks
+     * returns the number of travel activities in the list
+     * @return the number of travel activities
      */
-    public int getNoOfTasks(){
+    public int getNoOfTravelActivities(){
         return noOfTasks;
     }
 
     /**
-     * Removes task from the task list
-     *
-     * @param taskNumber The task number
+     * Removes travel activity from the travel activity list
+     * @param taskNumber The travel activity number on the list
      */
-    public void removeTask(int taskNumber){
+    public void removeTravelActivity(int taskNumber){
         int indexOfTask = taskNumber - 1;
         TravelActivity removedTask = travelActivities.get(indexOfTask);
         travelActivities.remove(indexOfTask);
@@ -57,6 +56,7 @@ public void removeTask(int taskNumber){
 
     }
 
+
     public String getDescription(String plan){
         for(TravelActivity travelActivity: travelActivities){
             if(travelActivity.getPlan().equals(plan)){

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

@@ -0,0 +1,38 @@
+package seedu.duke;
+
+
+/**
+ * Represents the user interface of the Omnitravel bot
+ * It contains all the responses of the Omnitravel bot to the user's commands
+ */
+public class Ui {
+    /**
+     * Prints the greetings
+     */
+    public void printGreeting() {
+        System.out.println(" ____  _      _      _  _____  ____  ____  _     _____ _    \n" +
+                "/  _ \\/ \\__/|/ \\  /|/ \\/__ __\\/  __\\/  _ \\/ \\ |\\/  __// \\   \n" +
+                "| / \\|| |\\/||| |\\ ||| |  / \\  |  \\/|| / \\|| | //|  \\  | |   \n" +
+                "| \\_/|| |  ||| | \\||| |  | |  |    /| |-||| \\// |  /_ | |_/\\\n" +
+                "\\____/\\_/  \\|\\_/  \\|\\_/  \\_/  \\_/\\_\\\\_/ \\|\\__/  \\____\\\\____/)");
+        System.out.println("Hello");
+        System.out.println("How may I assist you?");
+    }
+
+    /**
+     * Prints the farewell greetings
+     */
+    public void printBye(){
+        System.out.println("Thank you for using Omnitravel");
+        System.out.println("We hope to see you again! Goodbye!");
+    }
+
+    public void printLine(){
+        System.out.println("____________________________________________________________");
+    }
+
+
+
+
+
+}

src/test/java/seedu/duke/DukeTest.java

@@ -10,39 +10,39 @@ class DukeTest {
     @Test
     public void addTest() {
         TravelActivityList travelActivityList = new TravelActivityList();
-        travelActivityList.addTask(new TravelActivity("visit museum"));
+        travelActivityList.addTravelActivity(new TravelActivity("visit museum"));
         assertEquals("visit museum", travelActivityList.getDescription("visit museum"));
     }
 
     @Test
     public void deleteTest() {
         //add the plan
         TravelActivityList travelActivityList = new TravelActivityList();
-        travelActivityList.addTask(new TravelActivity("visit museum"));
+        travelActivityList.addTravelActivity(new TravelActivity("visit museum"));
         assertEquals("visit museum", travelActivityList.getDescription("visit museum"));
         //delete the plan
-        travelActivityList.removeTask(1);
+        travelActivityList.removeTravelActivity(1);
         assertEquals("cant be found", travelActivityList.getDescription("visit museum"));
     }
 
     @Test
     public void getNoTasksTest() {
         //add the first plan
         TravelActivityList travelActivityList = new TravelActivityList();
-        travelActivityList.addTask(new TravelActivity("visit museum"));
+        travelActivityList.addTravelActivity(new TravelActivity("visit museum"));
         assertEquals("visit museum", travelActivityList.getDescription("visit museum"));
         //add the second and third plan
-        travelActivityList.addTask(new TravelActivity("go to beach"));
+        travelActivityList.addTravelActivity(new TravelActivity("go to beach"));
         assertEquals("go to beach", travelActivityList.getDescription("go to beach"));
-        travelActivityList.addTask(new TravelActivity("shopping"));
+        travelActivityList.addTravelActivity(new TravelActivity("shopping"));
         assertEquals("shopping", travelActivityList.getDescription("shopping"));
         //check number of tasks
-        assertEquals(3, travelActivityList.getNoOfTasks());
+        assertEquals(3, travelActivityList.getNoOfTravelActivities());
         //delete the first plan
-        travelActivityList.removeTask(1);
+        travelActivityList.removeTravelActivity(1);
         assertEquals("cant be found", travelActivityList.getDescription("visit museum"));
         //check number of tasks
-        assertEquals(2, travelActivityList.getNoOfTasks());
+        assertEquals(2, travelActivityList.getNoOfTravelActivities());