From 8cdf5d483efb2a45221934125b0b4b88206b7c6f Mon Sep 17 00:00:00 2001 From: Statspadders Date: Thu, 26 Jan 2023 19:43:20 +0800 Subject: [PATCH] A-Packages Divide classes into packages. Put all classes into duke package, organize commands in duke.command --- src/main/java/Command.java | 8 -------- src/main/java/CommandNotFound.java | 11 ----------- src/main/java/Duke.java | 7 ++++--- src/main/java/ListCommand.java | 10 ---------- src/main/java/{ => duke}/Deadline.java | 2 ++ src/main/java/{ => duke}/Event.java | 4 +++- src/main/java/{ => duke}/Parser.java | 4 ++++ src/main/java/{ => duke}/Storage.java | 5 +++++ src/main/java/{ => duke}/Task.java | 2 ++ src/main/java/{ => duke}/TaskList.java | 4 ++++ src/main/java/{ => duke}/Todo.java | 4 ++++ src/main/java/{ => duke}/Ui.java | 4 ++++ .../java/{ => duke/command}/AddCommand.java | 11 ++++++++--- src/main/java/duke/command/Command.java | 14 ++++++++++++++ src/main/java/duke/command/CommandNotFound.java | 17 +++++++++++++++++ .../java/{ => duke/command}/DeleteCommand.java | 11 +++++++++-- .../java/{ => duke/command}/ExitCommand.java | 8 +++++++- src/main/java/duke/command/ListCommand.java | 16 ++++++++++++++++ .../java/{ => duke/command}/MarkCommand.java | 8 +++++++- 19 files changed, 110 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/Command.java delete mode 100644 src/main/java/CommandNotFound.java delete mode 100644 src/main/java/ListCommand.java rename src/main/java/{ => duke}/Deadline.java (92%) rename src/main/java/{ => duke}/Event.java (88%) rename src/main/java/{ => duke}/Parser.java (95%) rename src/main/java/{ => duke}/Storage.java (93%) rename src/main/java/{ => duke}/Task.java (92%) rename src/main/java/{ => duke}/TaskList.java (90%) rename src/main/java/{ => duke}/Todo.java (85%) rename src/main/java/{ => duke}/Ui.java (94%) rename src/main/java/{ => duke/command}/AddCommand.java (54%) create mode 100644 src/main/java/duke/command/Command.java create mode 100644 src/main/java/duke/command/CommandNotFound.java rename src/main/java/{ => duke/command}/DeleteCommand.java (58%) rename src/main/java/{ => duke/command}/ExitCommand.java (58%) create mode 100644 src/main/java/duke/command/ListCommand.java rename src/main/java/{ => duke/command}/MarkCommand.java (58%) diff --git a/src/main/java/Command.java b/src/main/java/Command.java deleted file mode 100644 index eb789381b2..0000000000 --- a/src/main/java/Command.java +++ /dev/null @@ -1,8 +0,0 @@ -public abstract class Command { - - public abstract void execute(TaskList tasks,Ui ui,Storage storage); - - public boolean isExit() { - return false; - } -} diff --git a/src/main/java/CommandNotFound.java b/src/main/java/CommandNotFound.java deleted file mode 100644 index 0798f79270..0000000000 --- a/src/main/java/CommandNotFound.java +++ /dev/null @@ -1,11 +0,0 @@ -public class CommandNotFound extends Command{ - - public CommandNotFound() { - - } - - @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { - ui.showCommandNotFound(); - } -} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a6f8d83ff2..2114cdffc8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,7 +1,8 @@ -import java.util.*; +import duke.*; +import duke.command.Command; + import java.io.*; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; + public class Duke { private Ui ui; private Storage storage; diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java deleted file mode 100644 index 9ff6c3b636..0000000000 --- a/src/main/java/ListCommand.java +++ /dev/null @@ -1,10 +0,0 @@ -public class ListCommand extends Command{ - - public ListCommand() { - - } - @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { - tasks.print(); - } -} diff --git a/src/main/java/Deadline.java b/src/main/java/duke/Deadline.java similarity index 92% rename from src/main/java/Deadline.java rename to src/main/java/duke/Deadline.java index 3ab636ed4e..8fd693fc93 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -1,3 +1,5 @@ +package duke; + import java.time.LocalDateTime; public class Deadline extends Task { diff --git a/src/main/java/Event.java b/src/main/java/duke/Event.java similarity index 88% rename from src/main/java/Event.java rename to src/main/java/duke/Event.java index 9941688608..e3b716f071 100644 --- a/src/main/java/Event.java +++ b/src/main/java/duke/Event.java @@ -1,7 +1,9 @@ +package duke; + import java.time.LocalDateTime; import java.util.concurrent.atomic.AtomicLong; -public class Event extends Task{ +public class Event extends Task { protected LocalDateTime from; protected LocalDateTime to; diff --git a/src/main/java/Parser.java b/src/main/java/duke/Parser.java similarity index 95% rename from src/main/java/Parser.java rename to src/main/java/duke/Parser.java index e9369763fa..b31ba0efb3 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,3 +1,7 @@ +package duke; + +import duke.command.*; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.NoSuchElementException; diff --git a/src/main/java/Storage.java b/src/main/java/duke/Storage.java similarity index 93% rename from src/main/java/Storage.java rename to src/main/java/duke/Storage.java index 544e57a0bb..fbdac9720e 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/duke/Storage.java @@ -1,3 +1,8 @@ +package duke; + +import duke.Deadline; +import duke.Event; + import java.io.*; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/src/main/java/Task.java b/src/main/java/duke/Task.java similarity index 92% rename from src/main/java/Task.java rename to src/main/java/duke/Task.java index 8d12bc40fc..a8c8174766 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/Task.java @@ -1,3 +1,5 @@ +package duke; + public class Task { private boolean mark; private String value; diff --git a/src/main/java/TaskList.java b/src/main/java/duke/TaskList.java similarity index 90% rename from src/main/java/TaskList.java rename to src/main/java/duke/TaskList.java index 8be1424abf..222662baa9 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -1,3 +1,7 @@ +package duke; + +import duke.Task; + import java.util.ArrayList; public class TaskList { private ArrayList list; diff --git a/src/main/java/Todo.java b/src/main/java/duke/Todo.java similarity index 85% rename from src/main/java/Todo.java rename to src/main/java/duke/Todo.java index d6ec938997..f8ffdea1a8 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/duke/Todo.java @@ -1,3 +1,7 @@ +package duke; + +import duke.Task; + public class Todo extends Task { public Todo(String value,boolean mark) { diff --git a/src/main/java/Ui.java b/src/main/java/duke/Ui.java similarity index 94% rename from src/main/java/Ui.java rename to src/main/java/duke/Ui.java index 36992f5a48..aec7bfcbae 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/duke/Ui.java @@ -1,3 +1,7 @@ +package duke; + +import duke.Task; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/AddCommand.java b/src/main/java/duke/command/AddCommand.java similarity index 54% rename from src/main/java/AddCommand.java rename to src/main/java/duke/command/AddCommand.java index 4b4bcf2428..db0fbda702 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/duke/command/AddCommand.java @@ -1,6 +1,11 @@ -import java.io.FileWriter; +package duke.command; -public class AddCommand extends Command{ +import duke.Storage; +import duke.TaskList; +import duke.Ui; +import duke.Task; + +public class AddCommand extends Command { private Task task; @@ -9,7 +14,7 @@ public AddCommand(Task t) { } @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) { tasks.add(this.task); ui.customMessage("Added : " + task.getValue()); ui.showNumberOfListings(tasks.size()); diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java new file mode 100644 index 0000000000..1483699e6b --- /dev/null +++ b/src/main/java/duke/command/Command.java @@ -0,0 +1,14 @@ +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + +public abstract class Command { + + public abstract void execute(TaskList tasks, Ui ui, Storage storage); + + public boolean isExit() { + return false; + } +} diff --git a/src/main/java/duke/command/CommandNotFound.java b/src/main/java/duke/command/CommandNotFound.java new file mode 100644 index 0000000000..18da16509e --- /dev/null +++ b/src/main/java/duke/command/CommandNotFound.java @@ -0,0 +1,17 @@ +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + +public class CommandNotFound extends Command { + + public CommandNotFound() { + + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + ui.showCommandNotFound(); + } +} diff --git a/src/main/java/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java similarity index 58% rename from src/main/java/DeleteCommand.java rename to src/main/java/duke/command/DeleteCommand.java index c3b7b9cb6e..40bd70ba95 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/duke/command/DeleteCommand.java @@ -1,4 +1,11 @@ -public class DeleteCommand extends Command { +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + + +public class DeleteCommand extends Command { private int index; @@ -7,7 +14,7 @@ public DeleteCommand(int index) { } @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) { ui.customMessage("Noted. I've removed this task: \n"); ui.customMessage(tasks.get(index)); tasks.remove(index); diff --git a/src/main/java/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java similarity index 58% rename from src/main/java/ExitCommand.java rename to src/main/java/duke/command/ExitCommand.java index ff38d3ba48..6c3338a282 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/duke/command/ExitCommand.java @@ -1,3 +1,9 @@ +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + public class ExitCommand extends Command { boolean exit; @@ -9,7 +15,7 @@ public boolean isExit() { return this.exit; } @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) { ui.byeMessage(); } diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java new file mode 100644 index 0000000000..cfe67fc010 --- /dev/null +++ b/src/main/java/duke/command/ListCommand.java @@ -0,0 +1,16 @@ +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + +public class ListCommand extends Command { + + public ListCommand() { + + } + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + tasks.print(); + } +} diff --git a/src/main/java/MarkCommand.java b/src/main/java/duke/command/MarkCommand.java similarity index 58% rename from src/main/java/MarkCommand.java rename to src/main/java/duke/command/MarkCommand.java index 310c188b4c..c66276b48b 100644 --- a/src/main/java/MarkCommand.java +++ b/src/main/java/duke/command/MarkCommand.java @@ -1,3 +1,9 @@ +package duke.command; + +import duke.Storage; +import duke.TaskList; +import duke.Ui; + public class MarkCommand extends Command { private int index; @@ -6,7 +12,7 @@ public MarkCommand(int index) { this.index = index - 1; } @Override - public void execute(TaskList tasks,Ui ui,Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) { tasks.mark(index); ui.showMarkSucess(tasks.get(index)); }