From e530fa01c19cef9e3646ebe031dda4cc4cd81954 Mon Sep 17 00:00:00 2001
From: lijiayu980606 <lijiayu0017@163.com>
Date: Thu, 12 Sep 2019 23:38:05 +0800
Subject: [PATCH] Completed A-Packages: Java Packages

---
 data/duke.txt                                 | Bin 188 -> 58 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +++--
 src/main/java/Duke.java                       |   6 ++++++
 src/main/java/{ => command}/Parser.java       |  14 ++++++++++++--
 src/main/java/{ => command}/Storage.java      |   4 ++++
 src/main/java/{ => common}/DukeException.java |   2 ++
 src/main/java/{ => common}/TaskList.java      |   4 ++++
 src/main/java/{ => task}/Deadline.java        |   2 ++
 src/main/java/{ => task}/Event.java           |   2 ++
 src/main/java/{ => task}/Task.java            |   5 +++++
 src/main/java/{ => task}/Todo.java            |   2 ++
 src/main/java/{ => ui}/Ui.java                |   8 ++++++++
 12 files changed, 50 insertions(+), 4 deletions(-)
 rename src/main/java/{ => command}/Parser.java (96%)
 rename src/main/java/{ => command}/Storage.java (97%)
 rename src/main/java/{ => common}/DukeException.java (94%)
 rename src/main/java/{ => common}/TaskList.java (97%)
 rename src/main/java/{ => task}/Deadline.java (97%)
 rename src/main/java/{ => task}/Event.java (97%)
 rename src/main/java/{ => task}/Task.java (92%)
 rename src/main/java/{ => task}/Todo.java (97%)
 rename src/main/java/{ => ui}/Ui.java (96%)

diff --git a/data/duke.txt b/data/duke.txt
index 9b26984dce8834860a67dd0f1cd479c12f7f091d..665a8492e104a67e962def8efdf29300b4a78bae 100644
GIT binary patch
delta 14
TcmdnPXf?rzgQ1*-0SGDp8CU|f

delta 145
zcmcE8!#KgHo~4|Hfq{XgxQKxzBtIozYvs`m#aWB~F)=VyfP@l@vo{KeG;oJMu47_g
zieg~PEOyDyOZ8#kPDw3JF3Kz@$;{6yVG#1kN-Rs%&q>Tn*AFf!%FIi*t|(wAVPGyQ
S%_}ZssAFKl!Qn<oRR93K&nrm)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4b7e1f3d38..32e9677e01 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 52ae81e722..66d6803ae1 100644
--- a/src/main/java/Duke.java
+++ b/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;
 
 /**
diff --git a/src/main/java/Parser.java b/src/main/java/command/Parser.java
similarity index 96%
rename from src/main/java/Parser.java
rename to src/main/java/command/Parser.java
index 028b60f6c4..36fe62f1dc 100644
--- a/src/main/java/Parser.java
+++ b/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)) {
@@ -77,7 +87,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);
                 }
             }
diff --git a/src/main/java/Storage.java b/src/main/java/command/Storage.java
similarity index 97%
rename from src/main/java/Storage.java
rename to src/main/java/command/Storage.java
index 7a907b9820..81231d5b6e 100644
--- a/src/main/java/Storage.java
+++ b/src/main/java/command/Storage.java
@@ -1,3 +1,7 @@
+package command;
+
+import task.Task;
+
 import java.io.*;
 import java.util.ArrayList;
 
diff --git a/src/main/java/DukeException.java b/src/main/java/common/DukeException.java
similarity index 94%
rename from src/main/java/DukeException.java
rename to src/main/java/common/DukeException.java
index 2d313e1e4a..92e6343e58 100644
--- a/src/main/java/DukeException.java
+++ b/src/main/java/common/DukeException.java
@@ -1,3 +1,5 @@
+package common;
+
 /**
  * A class for exceptions specific to Duke.
  */
diff --git a/src/main/java/TaskList.java b/src/main/java/common/TaskList.java
similarity index 97%
rename from src/main/java/TaskList.java
rename to src/main/java/common/TaskList.java
index 926e8bca1b..035cb4a2de 100644
--- a/src/main/java/TaskList.java
+++ b/src/main/java/common/TaskList.java
@@ -1,3 +1,7 @@
+package common;
+
+import task.Task;
+
 import java.util.ArrayList;
 
 /**
diff --git a/src/main/java/Deadline.java b/src/main/java/task/Deadline.java
similarity index 97%
rename from src/main/java/Deadline.java
rename to src/main/java/task/Deadline.java
index b23c26c046..a274fb7a52 100644
--- a/src/main/java/Deadline.java
+++ b/src/main/java/task/Deadline.java
@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/main/java/Event.java b/src/main/java/task/Event.java
similarity index 97%
rename from src/main/java/Event.java
rename to src/main/java/task/Event.java
index 4ff56eaf7d..225c6d803f 100644
--- a/src/main/java/Event.java
+++ b/src/main/java/task/Event.java
@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/main/java/Task.java b/src/main/java/task/Task.java
similarity index 92%
rename from src/main/java/Task.java
rename to src/main/java/task/Task.java
index 2b1b72640b..02796b2dae 100644
--- a/src/main/java/Task.java
+++ b/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;
+    }
 }
diff --git a/src/main/java/Todo.java b/src/main/java/task/Todo.java
similarity index 97%
rename from src/main/java/Todo.java
rename to src/main/java/task/Todo.java
index 3db085afa9..4c72f83a64 100644
--- a/src/main/java/Todo.java
+++ b/src/main/java/task/Todo.java
@@ -1,3 +1,5 @@
+package task;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/main/java/Ui.java b/src/main/java/ui/Ui.java
similarity index 96%
rename from src/main/java/Ui.java
rename to src/main/java/ui/Ui.java
index 89f2a832b7..f820fd41aa 100644
--- a/src/main/java/Ui.java
+++ b/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;
+    }
 }