diff --git a/recordList.txt b/recordList.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/seedu/duke/DIYProblemSet.java b/src/main/java/seedu/duke/DIYProblemSet.java index 4379f273a..9fa9b0716 100644 --- a/src/main/java/seedu/duke/DIYProblemSet.java +++ b/src/main/java/seedu/duke/DIYProblemSet.java @@ -12,7 +12,6 @@ public DIYProblemSet() { } public void addDIYProblemSet(Ui ui) { - Scanner scanner = new Scanner(System.in); ui.print("Please input your DIY problemSet: "); String description; String correctAnswer; @@ -21,9 +20,9 @@ public void addDIYProblemSet(Ui ui) { String quit = ""; while (!quit.equals("y")) { ui.print("input the description of the problem (e.g. 1+2*3): "); - description = scanner.nextLine(); + description = ui.readCommand(); ui.print("input the correct answer of the problem (e.g. 7): "); - correctAnswer = scanner.nextLine(); + correctAnswer = ui.readCommand(); boolean isValidAnswer = false; while (!isValidAnswer) { try { @@ -31,18 +30,18 @@ public void addDIYProblemSet(Ui ui) { isValidAnswer = true; } catch (NumberFormatException e) { ui.print("Invalid answer! Please input a number."); - correctAnswer = scanner.nextLine(); + correctAnswer = ui.readCommand(); } } ui.print("Input the explanations of the problem (e.g. 1+2*3=7): "); - explanations = scanner.nextLine(); + explanations = ui.readCommand(); Problem problem = new Problem(description,answer,explanations); problemSet.add(problem); ui.print("Have you finished adding problems? y/n: "); - quit = scanner.nextLine(); + quit = ui.readCommand(); while (!quit.equals("y") && !quit.equals("n")) { ui.print("input is invalid! Please input 'y' or 'n': "); - quit = scanner.nextLine(); + quit = ui.readCommand(); } } Record record = new Record(LocalDateTime.now(), 0.0, 0.0, problemSet, ProblemSetType.USER_DIY.getValue()); @@ -50,8 +49,5 @@ public void addDIYProblemSet(Ui ui) { ui.print("Record successfully saved!"); record.print(true); Ui.showLine(); - scanner.close(); } - - }