[Rushagrid] Duke Increments

src/main/java/Deadline.java

@@ -1,14 +1,14 @@
 import java.util.Date;
 
 public class Deadline extends Task {
-    protected Date by;
+    private Date by;
 
-    public Deadline(String description, Date by) {
+    Deadline(String description, Date by) {
         super(description);
         this.by = by;
     }
 
-    public Date getBy() {
+    Date getBy() {
         return this.by;
     }
 

src/main/java/Duke.java

@@ -1,4 +1,3 @@
-import java.io.FileNotFoundException;
 import java.text.ParseException;
 
 /**
@@ -15,7 +14,7 @@ public class Duke {
      * Initializes the Duke application and the storage file.
      */
 
-    Duke() throws FileNotFoundException {
+    Duke() {
         ui = new Ui();
         Storage storage = new Storage("../duke.txt");
         taskList = new TaskList(Storage.load());

src/main/java/Storage.java

@@ -12,7 +12,7 @@
  * Deals with loading tasks from the file and saving tasks in the file
  */
 
-public class Storage {
+class Storage {
 
     private static File file;
 
@@ -26,56 +26,64 @@ public class Storage {
      * @return taskList
      */
 
-    static ArrayList<Task> load() throws FileNotFoundException {
-
+    static ArrayList<Task> load() {
         ArrayList<Task> taskList = new ArrayList<>();
         try {
             Scanner sc = new Scanner(file);
             while (sc.hasNext()) {
-
                 String[] task = sc.nextLine().split("\\|");
-                String taskType = task[0].trim();
-                boolean isTaskDone = task[2].trim().equals("1");
-
-                switch (taskType) {
-                    case "T":
-                        Todo newTask = new Todo(task[2].trim());
-                        if (isTaskDone) newTask.markAsDone();
-                        taskList.add(newTask);
-                        break;
-                    case "E":
-                        String eventDescription = task[2].trim();
-                        String at = task[3].trim();
-                        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HHmm");
-                        Event newEvent = new Event(eventDescription, sdf.parse(at));
-                        if (isTaskDone) newEvent.markAsDone();
-                        taskList.add(newEvent);
-                        break;
-                    case "D":
-                        String deadlineDescription = task[2].trim();
-                        String by = task[3].trim();
-                        SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy HHmm");
-                        Deadline newDeadline = new Deadline(deadlineDescription, sdf2.parse(by));
-                        if (isTaskDone) newDeadline.markAsDone();
-                        taskList.add(newDeadline);
-                        break;
-                    default:
+                updateData(taskList, task);
                 }
-            }
-        } catch (FileNotFoundException | ParseException err) {
-            System.out.println(err.getMessage());
+        } catch (FileNotFoundException | ParseException e) {
+            System.out.println(e.getMessage());
         }
         return taskList;
     }
 
     /**
-     * Saves the current taskList onto the hard drive
+     * Update the taskList that will later be loaded
      *
-     * @param taskList
+     * @param taskList The record of tasks to be updated
+     * @param task An array split into sections within the task
      */
 
+    private static void updateData(ArrayList<Task> taskList, String[] task) throws ParseException {
+        String taskType = task[0].trim();
+        boolean isTaskDone = task[1].trim().equals("1");
+
+        switch (taskType) {
+            case "T":
+                Todo newTask = new Todo(task[2].trim());
+                if (isTaskDone) newTask.markAsDone();
+                taskList.add(newTask);
+                break;
+            case "E":
+                String eventDescription = task[2].trim();
+                String at = task[3].trim();
+                SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HHmm");
+                Event newEvent = new Event(eventDescription, sdf.parse(at));
+                if (isTaskDone) newEvent.markAsDone();
+                taskList.add(newEvent);
+                break;
+            case "D":
+                String deadlineDescription = task[2].trim();
+                String by = task[3].trim();
+                SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy HHmm");
+                Deadline newDeadline = new Deadline(deadlineDescription, sdf2.parse(by));
+                if (isTaskDone) newDeadline.markAsDone();
+                taskList.add(newDeadline);
+                break;
+            default:
+        }
+    }
+
+    /**
+     * Saves the current taskList onto the hard drive
+     *
+     * @param taskList The record of tasks to be saved
+     */
 
-    public static void saveTaskList(List<Task> taskList) {
+    static void saveTaskList(List<Task> taskList) {
         try {
             FileWriter fw = new FileWriter(file);
             for (Task task : taskList) {

src/main/java/Task.java

@@ -1,25 +1,25 @@
 public class Task {
-    protected String description;
-    protected boolean isDone;
+    private String description;
+    private boolean isDone;
 
-    public Task(String description) {
+    Task(String description) {
         this.description = description;
         this.isDone = false;
     }
 
-    public String getStatusIcon() {
+    String getStatusIcon() {
         return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols
     }
 
-    public void markAsDone() {
+    void markAsDone() {
         this.isDone = true;
     }
 
-    public boolean isDone() {
+    boolean isDone() {
         return this.isDone;
     }
 
-    public String getDescription() {
+    String getDescription() {
         return this.description;
     }
 

src/main/java/Ui.java

@@ -7,10 +7,6 @@ String getOutput() {
         return this.output;
     }
 
-    String greet() { //duke greet
-        return "Hello! I'm Duke.\n" + "What can I do for you?\n";
-    }
-
     void setToFarewell() {
         output = "Bye. Hope to see you again soon!";
     }
@@ -66,7 +62,7 @@ void setToFind(ArrayList<Task> relatedTasks, TaskList taskList, String findWord)
         output = "Here are the matching tasks in your list:\n";
         for (int i = 0; i < relatedTasks.size(); i++) {
             int num = i + 1;
-            output += num + "." + relatedTasks.get(i);
+            output += num + "." + relatedTasks.get(i) + "\n";
         }
     }