Skip to content

Commit

Permalink
Merge branch 'master' into branch-A-CodeQuality
Browse files Browse the repository at this point in the history
  • Loading branch information
szelongq committed Sep 8, 2021
2 parents 8b8c55c + 51866b8 commit e524958
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/main/java/duke/Duke.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,28 @@ private String executeCommand(String userInput) throws DukeException {
default:
throw new UnsupportedOperationException(); // Error
}
assert false; // Execution should not reach this point
return "";
}

private String addNewTask(Task newTask) {
assert newTask != null; // Task to be added cannot be null
tasks.addTask(newTask);
storage.saveTasks(tasks);
return ui.printAddTask(tasks, newTask);
}

private String completeTask(int taskNum) {
// TaskNum should be within 1 to the size of the TaskList
assert taskNum > 0 && taskNum <= tasks.getSize(): taskNum;
tasks.completeTask(taskNum);
storage.saveTasks(tasks);
return ui.printCompleteTask(tasks.getTask(taskNum));
}

private String deleteTask(int taskNum) {
// TaskNum should be within 1 to the size of the TaskList
assert taskNum > 0 && taskNum <= tasks.getSize(): taskNum;
Task deletedTask = tasks.deleteTask(taskNum);
storage.saveTasks(tasks);
return ui.printDeleteTask(tasks, deletedTask);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/duke/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public static Task parseNewTask(String userInput) throws MissingInputException {

return new Event(eventName, eventDateTime);
default:
return null; // Error
assert false; // Undefined task type input
return null;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/Storage.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private Task loadTask(String savedTask) {
loadedTask = new Event(taskDesc, eventDateTime, isTaskDone);
break;
default:
break; // Error
assert false; // Undefined task type input
}
saveDataScanner.close();

Expand Down

0 comments on commit e524958

Please sign in to comment.