[Rebecca Lau] iP

README.md

@@ -1,4 +1,4 @@
-# Duke project template
+# duke.Duke project template
 
 This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
 
@@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    1. If there are any further prompts, accept the defaults.
 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
    In the same dialog, set the **Project language level** field to the `SDK default` option.
-3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
+3. After that, locate the `src/main/java/duke.Duke.java` file, right-click it, and choose `Run duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
    ```
    Hello from
     ____        _        

duke.txt

@@ -1,4 +0,0 @@
-T | 1 | read book
-D | 0 | return book | June 6th
-E | 0 | project meeting | Aug 6th 2-4pm
-T | 1 | join sports club

src/main/java/Duke.java → src/main/java/duke/Duke.java

@@ -1,3 +1,8 @@
+package duke;
+
+import duke.command.Command;
+import duke.task.TaskList;
+
 import java.io.IOException;
 
 public class Duke {

src/main/java/DukeException.java → src/main/java/duke/DukeException.java

@@ -1,3 +1,5 @@
+package duke;
+
 public class DukeException extends Exception {
     public DukeException(String message) {
         super(message);

src/main/java/Parser.java → src/main/java/duke/Parser.java

@@ -1,3 +1,7 @@
+package duke;
+
+import duke.command.*;
+
 public class Parser {
     public static Command parse(String input) throws DukeException {
         if (input.equals("bye")) {

src/main/java/Storage.java → src/main/java/duke/Storage.java

@@ -1,9 +1,12 @@
+package duke;
+
+import duke.task.*;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Storage {
@@ -32,12 +35,12 @@ public void rewriteFile(TaskList ls) {
             String desc = task.getDesc();
             String addOns = task.addOns();
             if (type == "todo") {
-                writer.println("T" + (task.isDone ? " | 1 | " : " | 0 | ") + desc);
+                writer.println("T" + (task.checkIfDone() ? " | 1 | " : " | 0 | ") + desc);
             } else if (type == "deadline") {
-                writer.println("D" + (ls.getTask(i).isDone ? " | 1 | " : " | 0 | ")
+                writer.println("D" + (ls.getTask(i).checkIfDone() ? " | 1 | " : " | 0 | ")
                         + desc + " | " + addOns);
             } else if (type == "event") {
-                writer.println("E" + (task.isDone ? " | 1 | " : " | 0 | ")
+                writer.println("E" + (task.checkIfDone() ? " | 1 | " : " | 0 | ")
                         + desc + " | " + addOns);
             }
         }

src/main/java/Ui.java → src/main/java/duke/Ui.java

@@ -1,3 +1,8 @@
+package duke;
+
+import duke.task.Task;
+import duke.task.TaskList;
+
 import java.util.Scanner;
 
 public class Ui {
@@ -15,7 +20,7 @@ public void showWelcome() {
                 + "| |_| | |_| |   <  __/\n"
                 + "|____/ \\__,_|_|\\_\\___|\n";
         System.out.println("Hello from\n" + logo);
-        System.out.println("Hello! I'm Duke\n" + "What can I do for you?");
+        System.out.println("Hello! I'm duke.Duke\n" + "What can I do for you?");
     }
 
     public void goodbye() {

src/main/java/Command.java → src/main/java/duke/command/Command.java

@@ -1,3 +1,9 @@
+package duke.command;
+import duke.task.TaskList;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+
 public abstract class Command {
     public abstract void execute(TaskList ls, Ui ui, Storage storage) throws DukeException;
     public abstract boolean isExit();

src/main/java/DeadlineCommand.java → src/main/java/duke/command/DeadlineCommand.java

@@ -1,3 +1,10 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+import duke.task.Deadline;
+
 public class DeadlineCommand extends Command {
 
     private String input;

src/main/java/DeleteCommand.java → src/main/java/duke/command/DeleteCommand.java

@@ -1,3 +1,10 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+import duke.task.Task;
+
 public class DeleteCommand extends Command {
     private String input;
     private int taskNumber;

src/main/java/DoneCommand.java → src/main/java/duke/command/DoneCommand.java

@@ -1,3 +1,10 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+import duke.task.Task;
+
 public class DoneCommand extends Command {
     private String input;
     private int taskNumber;

src/main/java/ErrorCommand.java → src/main/java/duke/command/ErrorCommand.java

@@ -1,3 +1,9 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+
 public class ErrorCommand extends Command {
     @Override
     public void execute(TaskList ls, Ui ui, Storage storage) throws DukeException {

src/main/java/EventCommand.java → src/main/java/duke/command/EventCommand.java

@@ -1,3 +1,10 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+import duke.task.Event;
+
 public class EventCommand extends Command {
     private String input;
     private String taskDesc;

src/main/java/ExitCommand.java → src/main/java/duke/command/ExitCommand.java

@@ -1,3 +1,9 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+
 public class ExitCommand extends Command {
     @Override
     public void execute(TaskList ls, Ui ui, Storage storage) throws DukeException {

src/main/java/ListCommand.java → src/main/java/duke/command/ListCommand.java

@@ -1,3 +1,9 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+
 public class ListCommand extends Command {
 
     @Override

src/main/java/TodoCommand.java → src/main/java/duke/command/TodoCommand.java

@@ -1,3 +1,11 @@
+package duke.command;
+import duke.Ui;
+import duke.Storage;
+import duke.DukeException;
+import duke.task.TaskList;
+import duke.task.Todo;
+
+
 public class TodoCommand extends Command {
     private String input;
     private String taskDesc;

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

@@ -1,3 +1,6 @@
+package duke.task;
+import duke.DukeException;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -14,7 +17,7 @@ public Deadline(String description, String deadline) throws DukeException {
             LocalDate localDate = LocalDate.parse(deadline);
             this.date = localDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy"));
         } catch (DateTimeParseException e) {
-            throw new DukeException("Deadline should be in a yyyy-mm-dd format.");
+            throw new DukeException("duke.task.Deadline should be in a yyyy-mm-dd format.");
         }
 
         if (description.isEmpty() || description == "" || description == " ") {

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

@@ -1,3 +1,6 @@
+package duke.task;
+import duke.DukeException;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -14,7 +17,7 @@ public Event(String description, String at) throws DukeException {
             LocalDate localDate = LocalDate.parse(at);
             this.date = localDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy"));
         } catch (DateTimeParseException e) {
-            throw new DukeException("Event date should be in a yyyy-mm-dd format.");
+            throw new DukeException("duke.task.Event date should be in a yyyy-mm-dd format.");
         }
 
         if (description.isEmpty() || description == "" || description == " ") {

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

@@ -1,3 +1,5 @@
+package duke.task;
+
 abstract public class Task {
     protected String description;
     protected boolean isDone;
@@ -25,6 +27,10 @@ public void markAsDone() {
         System.out.println("Nice! I've marked this task as done: \n" + this.toString());
     }
 
+    public boolean checkIfDone() {
+        return this.isDone;
+    }
+
     public String getType() {
         return "";
     }

src/main/java/TaskList.java → src/main/java/duke/task/TaskList.java

@@ -1,5 +1,6 @@
+package duke.task;
+import duke.Ui;
 import java.util.ArrayList;
-import java.util.List;
 
 public class TaskList {
     private ArrayList<Task> tasklist;

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

@@ -1,3 +1,6 @@
+package duke.task;
+import duke.DukeException;
+
 public class Todo extends Task {
 
     public Todo(String description) throws DukeException {

text-ui-test/EXPECTED.TXT

@@ -5,7 +5,7 @@ Hello from
 | |_| | |_| |   <  __/
 |____/ \__,_|_|\_\___|
 
-Hello! I'm Duke
+Hello! I'm duke.Duke
 What can I do for you?
 Got it. I've added this task: 
 	[T][ ] borrow book

text-ui-test/runtest.bat

@@ -15,7 +15,7 @@ IF ERRORLEVEL 1 (
 REM no error here, errorlevel == 0
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT