A-MoreOOP (added Tasklist.java, Storage.java, Parser.java and UI.java)

Author: andrea-twl

src/duke/.idea/.name

@@ -4,11 +4,10 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
-public class Deadline extends Task {
-    LocalDate by;
+public class Deadline extends TimedTask {
 
     Deadline() {
-
+        this.isDone = false;
     }
     static Deadline parseInput(String input) throws DukeIncompleteCommandException,
             DateTimeParseException {
@@ -27,7 +26,7 @@ static Deadline parseInput(String input) throws DukeIncompleteCommandException,
         }
         deadline.task = inputs[0].trim();
         deadline.isDone = false;
-        deadline.by = LocalDate.parse(inputs[1].trim());
+        deadline.date = LocalDate.parse(inputs[1].trim());
 
         return deadline;
     }
@@ -42,15 +41,15 @@ static Deadline fileReader(String line) {
         String[] lines = line.substring(7).trim().split("by: ");
         deadline.task = lines[0].substring(0, lines[0].length() - 2).trim();
         String dateString = lines[1].substring(0, lines[1].length() - 1);
-        deadline.by = LocalDate.parse(dateString.subSequence(0, dateString.length()));
+        deadline.date = LocalDate.parse(dateString.subSequence(0, dateString.length()));
         return deadline;
     }
     @Override
     public String toString() {
-        return String.format("DDLN%s (by: %s)" ,
-                super.toString(), by);
+        return String.format("DDLN%s (by: %s)" , super.toString(),
+                date.format(DateTimeFormatter.ofPattern("MMM d yyyy")));
     }
-    public String stringToSave() {
-        return String.format("DDLN%s (at: %s)" , super.toString(), by);
+    public String toFileString() {
+        return String.format("DDLN%s (by: %s)" , super.toString(), date);
     }
 }

src/duke/.idea/misc.xml

@@ -2,132 +2,22 @@
 
 import java.util.Scanner;
 import java.util.ArrayList;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.time.format.DateTimeParseException;
 
 public class Duke {
     public static void main(String[] args) {
-        ArrayList<Task> list = loadFile();
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println(logo);
-        System.out.println("Hello! I'm Duke! \n" +
-                "What would you like to do today? \n" +
-                "***********************************");
-
-        Scanner sc = new Scanner(System.in);
-        String input = sc.nextLine();
-        while (!input.equals("bye")) {
-            Task task;
-            try {
-                if (input.equals("list")) {
-                    displayList(list);
-                    System.out.println("\n");
-                } else if (input.contains("done")) {
-                    String[] command = input.split(" ");
-                    task = list.get(Integer.parseInt(command[1]) - 1);
-                    System.out.println("Good job! I've marked this task as done:\n    " +
-                            task.markDone() +
-                            "\n");
-                } else if (input.contains("delete")) {
-                    String[] command = input.split(" ");
-                    int index = Integer.parseInt(command[1]) - 1;
-                    task = list.get(index);
-                    System.out.println("Alright, I've deleted this task:\n    " +
-                            task);
-                    list.remove(index);
-                    saveFile(list);
-                    System.out.println("Now you have " + list.size() +
-                            " task(s) in the list. \n");
-                } else if (input.contains("todo") ||
-                        input.contains("deadline") ||
-                        input.contains("event")) {
-                    task = Task.parseInput(input);
-                    list.add(task);
-                    saveFile(task.stringToSave());
-                    System.out.println("Alright! I've added this task: \n   " +
-                            task + "\nNow you have " + list.size() +
-                            " task(s) in the list. \n");
-                } else {
-                    throw new DukeInvalidCommandException();
-                }
-            } catch (IndexOutOfBoundsException e) {
-                System.out.println("Oh no! This task does not exist. D:\n" );
-            } catch (DateTimeParseException e) {
-                System.out.println("Oh no! " +
-                        " Please key in the date in the format YYYY-MM-DD.\n");
-            } catch (Exception e) {
-                System.out.println(e.getMessage());
-            }
-            input = sc.nextLine();
-        }
-
-        sc.close();
-        System.out.println("Bye! Stay on task!");
-    }
-
-    static void displayList(ArrayList<Task> list) {
-        for(int i = 0; i < list.size(); i++) {
-            System.out.printf("%d. %s%n",i + 1, list.get(i).toString());
-        }
-    }
-
-    static Task fileToTask(String input) {
-        return Task.fileReader(input);
-    }
-
-    static ArrayList<Task> loadFile() {
         String path = "./data/duke.txt";
         String directory = "./data";
-        File d = new File(directory);
-        File f = new File(path);
-        ArrayList<Task> list = new ArrayList<>();
-        if (!d.exists()){
-            d.mkdirs();
-        }
-        try {
-            f.createNewFile();
-            Scanner sc = new Scanner(f);
-            while (sc.hasNext()) {
-                try {
-                    String line = sc.nextLine();
-                    Task task = fileToTask(line);
-                    list.add(task);
-                } catch (Exception e) {}
-            }
-        } catch (IOException e) {
-            System.out.println(e.getMessage());
-        }
-        return list;
-    }
 
-    static void saveFile(String input) {
-        String path = "./data/duke.txt";
-        try {
-            FileWriter fw = new FileWriter(path, true);
-            fw.write(input + System.lineSeparator());
-            fw.close();
-        } catch (IOException e) {
-        }
-    }
+        Storage storage = new Storage(path, directory);
+        TaskList taskList = new TaskList(storage);
+        taskList.loadList();
+        Parser parser = new Parser(taskList);
+        Ui.printWelcome();
+        parser.parseAll();
 
-    static void saveFile(ArrayList<Task> list) {
-        String path = "./data/duke.txt";
-        try {
-            FileWriter fw = new FileWriter(path);
-            for(Task t: list) {
-                fw.write(t.toString() + System.lineSeparator());
-            }
-            fw.close();
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
     }
+
 }
 
 

src/duke/.idea/modules.xml

@@ -3,7 +3,7 @@
 public class DukeIncompleteCommandException extends Exception {
     public String message;
     DukeIncompleteCommandException() {
-        this.message = "Oh no! Task cannot be empty. ):";
+        this.message = "Oh no! Task cannot be empty. ):\n";
     }
     DukeIncompleteCommandException(String message) {
         this.message = message;

src/duke/.idea/vcs.xml

@@ -1,7 +1,7 @@
 package duke;
 
 public class DukeInvalidCommandException extends Exception {
-    public String message = "Oh no! I don't know what that means. ):";
+    public String message = "Oh no! I don't know what that means. ):\n";
     DukeInvalidCommandException() {
     }
 

src/duke/.idea/workspace.xml

@@ -4,11 +4,10 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
-public class Event extends Task {
-    LocalDate at;
+public class Event extends TimedTask {
 
     Event() {
-
+        this.isDone = false;
     }
 
     static Event parseInput(String input) throws DukeIncompleteCommandException,
@@ -29,7 +28,7 @@ static Event parseInput(String input) throws DukeIncompleteCommandException,
 
         event.task = inputs[0].trim();
         event.isDone = false;
-        event.at = LocalDate.parse(inputs[1].trim());
+        event.date = LocalDate.parse(inputs[1].trim());
         return event;
     }
     static Event fileReader(String line) {
@@ -42,16 +41,16 @@ static Event fileReader(String line) {
         String[] lines = line.substring(7).trim().split("at: ");
         event.task = lines[0].substring(0, lines[0].length() - 2).trim();
         String dateString = lines[1].substring(0, lines[1].length() - 1);
-        event.at = LocalDate.parse(dateString.subSequence(0, dateString.length()));
+        event.date = LocalDate.parse(dateString.subSequence(0, dateString.length()));
         return event;
     }
 
     @Override
     public String toString() {
         return String.format("EVNT%s (at: %s)" , super.toString(),
-                at.format(DateTimeFormatter.ofPattern("MMM d yyyy")));
+                date.format(DateTimeFormatter.ofPattern("MMM d yyyy")));
     }
-    public String stringToSave() {
-        return String.format("EVNT%s (at: %s)" , super.toString(), at);
+    public String toFileString() {
+        return String.format("EVNT%s (at: %s)" , super.toString(), date);
     }
 }