Merge https://github.com/AY1920S1-CS2113T-F10-3/main

# Conflicts:
#	src/main/java/command/Parser.java
#	src/main/java/command/Storage.java

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Sep 12 23:08:24 CST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

src/main/java/Duke.java

@@ -1,3 +1,9 @@
+import command.Parser;
+import command.Storage;
+import common.TaskList;
+import task.Task;
+import ui.Ui;
+
 import java.util.ArrayList;
 
 /**

src/main/java/Parser.java → src/main/java/command/Parser.java

@@ -1,3 +1,13 @@
+package command;
+
+import common.DukeException;
+import common.TaskList;
+import task.Deadline;
+import task.Event;
+import task.Task;
+import task.Todo;
+import ui.Ui;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,7 +33,7 @@ public static boolean parse(String input, TaskList tasklist, Ui ui, Storage stor
             if (isBye(input)) {
                 //print bye message
                 ui.byeMessage();
-                ui.in.close();
+                ui.getIn().close();
                 return true;
 
             } else if (isList(input)) {
@@ -76,7 +86,7 @@ private static void processFind(String input, TaskList tasklist, Ui ui) {
             TaskList findlist = new TaskList();
             String[] splitspace = input.split(" ", 2);
             for (Task tasks : tasklist.returnArrayList()) {
-                if (tasks.description.contains(splitspace[1])) {
+                if (tasks.getDescription().contains(splitspace[1])) {
                     findlist.addTask(tasks);
                 }
             }

src/main/java/Storage.java → src/main/java/command/Storage.java

@@ -1,9 +1,13 @@
+package command;
+
 import java.io.ObjectOutputStream;
 import java.io.FileOutputStream;
 import java.io.EOFException;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+
+import task.Task;
 import java.util.ArrayList;
 
 /**

src/main/java/DukeException.java → src/main/java/common/DukeException.java

@@ -1,3 +1,5 @@
+package common;
+
 /**
  * A class for exceptions specific to Duke.
  */

src/main/java/TaskList.java → src/main/java/common/TaskList.java

@@ -1,3 +1,7 @@
+package common;
+
+import task.Task;
+
 import java.util.ArrayList;
 
 /**

src/main/java/Deadline.java → src/main/java/task/Deadline.java

@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**

src/main/java/Event.java → src/main/java/task/Event.java

@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**

src/main/java/Task.java → src/main/java/task/Task.java

@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**
@@ -38,4 +40,7 @@ public String getStatusIcon() {
     public void setDone() {
         this.isDone = true;
     }
+    public String getDescription() {
+        return this.description;
+    }
 }

src/main/java/Todo.java → src/main/java/task/Todo.java

@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**

src/main/java/Ui.java → src/main/java/ui/Ui.java

@@ -1,3 +1,8 @@
+package ui;
+
+import common.TaskList;
+import task.Task;
+
 import java.util.Scanner;
 
 /**
@@ -108,4 +113,7 @@ public void exceptionMessage(String message) {
         System.out.println(message);
         System.out.print(line);
     }
+    public Scanner getIn(){
+        return this.in;
+    }
 }