From 7b2a64181f1d8d29931782af548184db2d7a1925 Mon Sep 17 00:00:00 2001 From: EugeneChanJiajun Date: Mon, 8 Apr 2024 19:59:08 +0800 Subject: [PATCH 1/2] Bug fix and userguide updates --- docs/UserGuide.md | 1 + .../errorhandlers/CheckParameters.java | 17 +++++++++++++++-- .../seedu/omnitravel/omnitravel/OmniTravel.java | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 2feb124846..18c2cae7f5 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -59,6 +59,7 @@ Expected outcome: ### Adding a general travel activity : `add` Adds a general travel activity into the travel activity list +* This is for activities that do not fall under the other activity types. EG. visiting a country. Format: `add DESCRIPTION /date YYYY-MM-DD /duration DURATION [/tag TAG]` diff --git a/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java b/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java index 800632e63e..20cf19b3b2 100644 --- a/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java +++ b/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java @@ -33,8 +33,6 @@ public static void addExceptions(String[] input, String commandType, String line "/date YYYY-MM-DD /duration DURATION" + " or add DESCRIPTION /date YYYY-MM-DD /duration DURATION /tag TAG"); } - - } /** @@ -152,4 +150,19 @@ public static void handleException(Exception exception) { Ui.printInterruptedError(); } } + + /** + * Checks the input that the users placed into the chatbot and checks if the input contains any ASCII characters. + * + * @param input Input line that users placed into the chatbot + * @throws OmniException if the input contains any non-ASCII characters + */ + public static void ASCIICheck(String input) throws OmniException { + for (int i = 0; i < input.length(); i++) { + char c = input.charAt(i); + if (c < 32 || c > 126) { + throw new OmniException("Input contains non-ASCII characters."); + } + } + } } diff --git a/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java b/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java index 5b4c42d6b8..fea963ded4 100644 --- a/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java +++ b/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java @@ -31,6 +31,7 @@ public static void main(String[] args) throws IOException { try { String line = in.nextLine(); assert line != null :"Input does not exist!"; + CheckParameters.ASCIICheck(line); String[] command = line.split(" "); logger.log(Level.INFO, command[0]); switch (command[0].toLowerCase()) { From 4bc2e5a4fc180b90b60fca3b4b2a0d49e136ac38 Mon Sep 17 00:00:00 2001 From: EugeneChanJiajun Date: Mon, 8 Apr 2024 20:03:35 +0800 Subject: [PATCH 2/2] Bug fix and userguide update --- .../java/seedu/omnitravel/errorhandlers/CheckParameters.java | 2 +- src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java b/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java index 20cf19b3b2..771e93df04 100644 --- a/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java +++ b/src/main/java/seedu/omnitravel/errorhandlers/CheckParameters.java @@ -157,7 +157,7 @@ public static void handleException(Exception exception) { * @param input Input line that users placed into the chatbot * @throws OmniException if the input contains any non-ASCII characters */ - public static void ASCIICheck(String input) throws OmniException { + public static void asciiCheck(String input) throws OmniException { for (int i = 0; i < input.length(); i++) { char c = input.charAt(i); if (c < 32 || c > 126) { diff --git a/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java b/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java index fea963ded4..68ed3fd787 100644 --- a/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java +++ b/src/main/java/seedu/omnitravel/omnitravel/OmniTravel.java @@ -31,7 +31,7 @@ public static void main(String[] args) throws IOException { try { String line = in.nextLine(); assert line != null :"Input does not exist!"; - CheckParameters.ASCIICheck(line); + CheckParameters.asciiCheck(line); String[] command = line.split(" "); logger.log(Level.INFO, command[0]); switch (command[0].toLowerCase()) {