Merge pull request #92 from jeffsieu/branch-Refactor-Task-IsDone

Refactor Task::getIsDone to Task::isDone
AY2122S1-CS2103-F09-2 · Oct 26, 2021 · e753d27 · e753d27
2 parents 044a776 + 3f88baf
commit e753d27
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/task/DoneTaskCommand.java b/src/main/java/seedu/address/logic/commands/task/DoneTaskCommand.java
@@ -46,7 +46,7 @@ public CommandResult execute(Model model) throws CommandException {
                 task.getDescription().orElse(null),
                 task.getTimestamp().orElse(null),
                 task.getTags(),
-                !task.getIsDone());
+                !task.isDone());
         this.completedTask = completedTask;
         model.setTask(task,
                 completedTask);

diff --git a/src/main/java/seedu/address/logic/commands/task/EditTaskCommand.java b/src/main/java/seedu/address/logic/commands/task/EditTaskCommand.java
@@ -81,7 +81,7 @@ private static Task createEditedTask(Task taskToEdit, EditTaskDescriptor editTas
                 updatedDescription,
                 updatedTimestamp,
                 updatedTags,
-                taskToEdit.getIsDone());
+                taskToEdit.isDone());
     }
 
     @Override

diff --git a/src/main/java/seedu/address/model/task/Task.java b/src/main/java/seedu/address/model/task/Task.java
@@ -70,7 +70,7 @@ public Set<Tag> getTags() {
         return tags;
     }
 
-    public boolean getIsDone() {
+    public boolean isDone() {
         return isDone;
     }
 

diff --git a/src/main/java/seedu/address/model/task/filters/DoneTaskFilter.java b/src/main/java/seedu/address/model/task/filters/DoneTaskFilter.java
@@ -10,7 +10,7 @@ class DoneTaskFilter extends TaskFilter {
     }
 
     private DoneTaskFilter(boolean isInverted) {
-        super(Task::getIsDone, isInverted);
+        super(Task::isDone, isInverted);
     }
 
     @Override

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTask.java b/src/main/java/seedu/address/storage/JsonAdaptedTask.java
@@ -50,7 +50,7 @@ public JsonAdaptedTask(Task source) {
         title = source.getTitle();
         description = source.getDescription().orElse("null");
         timestamp = source.getTimestamp().map(Timestamp::toString).orElse("null");
-        if (source.getIsDone()) {
+        if (source.isDone()) {
             isDone = "Done";
         } else {
             isDone = "Not Done";

diff --git a/src/main/java/seedu/address/ui/TaskCard.java b/src/main/java/seedu/address/ui/TaskCard.java
@@ -68,7 +68,7 @@ public TaskCard(Task task, int oneIndex, TaskListPanel.TaskEditor taskEditor) {
         }
 
         isCompleted.setText("");
-        isCompleted.setSelected(task.getIsDone());
+        isCompleted.setSelected(task.isDone());
         isCompleted.selectedProperty().addListener((observableValue, oldValue, newValue) -> {
             Task newTask = new Task(
                 task.getTitle(),

diff --git a/src/test/java/seedu/address/testutil/TaskBuilder.java b/src/test/java/seedu/address/testutil/TaskBuilder.java
@@ -40,7 +40,7 @@ public TaskBuilder(Task taskToCopy) {
         title = taskToCopy.getTitle();
         description = taskToCopy.getDescription().orElse(null);
         timestamp = taskToCopy.getTimestamp().orElse(null);
-        isDone = taskToCopy.getIsDone();
+        isDone = taskToCopy.isDone();
         tags = new HashSet<>(taskToCopy.getTags());
     }