From 68d9188bc0a9c2e6da878cf53263d2c6344d9057 Mon Sep 17 00:00:00 2001 From: "SKYLER\\User" Date: Wed, 14 Oct 2020 09:36:33 +0800 Subject: [PATCH 1/2] Updated Logging and Assertion for weisiong Features 2:AddFunction --- build.gradle | 4 ++ .../java/seedu/duke/command/AddCommand.java | 38 ++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0c5528fb5..e69846f877 100644 --- a/build.gradle +++ b/build.gradle @@ -44,3 +44,7 @@ checkstyle { run{ standardInput = System.in } + +run { + enableAssertions = true +} \ No newline at end of file diff --git a/src/main/java/seedu/duke/command/AddCommand.java b/src/main/java/seedu/duke/command/AddCommand.java index 9fd0c76010..633e551a1b 100644 --- a/src/main/java/seedu/duke/command/AddCommand.java +++ b/src/main/java/seedu/duke/command/AddCommand.java @@ -9,6 +9,14 @@ import seedu.duke.user.User; import seedu.duke.user.UserList; +import java.io.IOException; +import java.util.ArrayList; +import java.util.logging.FileHandler; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; +import java.util.logging.SimpleFormatter; + /** * Adds an event to the task list. */ @@ -18,20 +26,33 @@ public AddCommand(String input) { super(input); } + private static Logger logger = Logger.getLogger("LogAddCommand"); + @Override public void execute(UserList users, Ui ui, User nowUser/*, Storage storage*/) throws DukeException { //Lec /day /time /location + setupInputLogger(); if (nowUser != null) { String[] parsedInputs = input.split(" /", 4); String[] timeInputs = parsedInputs[2].split("-", 2); - String day = parsedInputs[1].toLowerCase(); + + assert timeInputs[0].length() == 4 : "Wrong Start time format specified"; + assert timeInputs[1].length() == 4 : "Wrong End time format specified"; + assert day.length() == 3 : "Wrong format of day entered"; + + logger.log(Level.INFO,"Timetable name successfully added: " + parsedInputs[0]); + logger.log(Level.INFO,"Day successfully add: " + parsedInputs[1]); + logger.log(Level.INFO,"Time successfully add: " + parsedInputs[2]); + logger.log(Level.INFO,"Location successfully add: " + parsedInputs[3] + "\n"); for (int i = 0; i < users.getTotalUserCount(); i++) { if ((users.getUser(i + 1).getName().equals(nowUser.getName()))) { Event newEvent = new Event(parsedInputs[0], parsedInputs[3], timeInputs[0], timeInputs[1]); ui.printEvent(newEvent, day); (users.getUser(i + 1).getTimetable()).getTimetable(day).add(newEvent); + ArrayList timetable = (users.getUser(i + 1).getTimetable()).getTimetable(day); + logger.log(Level.INFO, "day" + "timetable successfully add: " + timetable + "\n"); } } //((Timetable) currentUser.getTimetable()) @@ -39,7 +60,22 @@ public void execute(UserList users, Ui ui, User nowUser/*, Storage storage*/) th //ui.printEvent(newEvent, date); //storage.write(tasks); } else { + logger.log(Level.WARNING,"Not logged in" + "\n"); throw new DukeException("Sorry! You are not Logged in to any account :-("); } } + + private void setupInputLogger() { + LogManager.getLogManager().reset(); + logger.setLevel(Level.ALL); + try { + FileHandler fh = new FileHandler("AddCommand.log",true); + fh.setLevel(Level.INFO); + fh.setFormatter(new SimpleFormatter()); + logger.addHandler(fh); + + } catch (IOException e) { + logger.log(Level.SEVERE,"File logging not working"); + } + } } \ No newline at end of file From 608a3cbf2fc8f8740e96826e7f91334f2a922671 Mon Sep 17 00:00:00 2001 From: weisiong24 <60384540+weisiong24@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:46:08 +0800 Subject: [PATCH 2/2] Update build.gradle --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index e69846f877..b0c5528fb5 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,3 @@ checkstyle { run{ standardInput = System.in } - -run { - enableAssertions = true -} \ No newline at end of file