From fb8aa55289e8223c5c466b7c1e86a5f3c1147812 Mon Sep 17 00:00:00 2001 From: HM33-Stu <120201372+HM33-Stu@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:10:03 +0800 Subject: [PATCH 1/4] Amend error message for location and role to reflect default values --- src/main/java/seedu/address/model/internship/Location.java | 3 ++- src/main/java/seedu/address/model/internship/Role.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/seedu/address/model/internship/Location.java b/src/main/java/seedu/address/model/internship/Location.java index abce02da661..844f13c7273 100644 --- a/src/main/java/seedu/address/model/internship/Location.java +++ b/src/main/java/seedu/address/model/internship/Location.java @@ -7,7 +7,8 @@ * Represents an Internship's location in the internship data. */ public class Location { - public static final String MESSAGE_CONSTRAINTS = "Locations have to be either local, overseas, or remote"; + public static final String MESSAGE_CONSTRAINTS = "Locations have to be either local, overseas, or remote. " + + "Else, it will be set to the default value of UNKNOWN"; public static final String VALIDATION_REGEX = "(?i)local|remote|overseas|unknown"; diff --git a/src/main/java/seedu/address/model/internship/Role.java b/src/main/java/seedu/address/model/internship/Role.java index 73aeeff97ea..4435bdf2ada 100644 --- a/src/main/java/seedu/address/model/internship/Role.java +++ b/src/main/java/seedu/address/model/internship/Role.java @@ -9,7 +9,7 @@ public class Role { public static final String MESSAGE_CONSTRAINTS = - "Roles should not be blank!"; + "Roles should not be blank! Else, it will be set to the default value of " + "unknown role"; /* * Matches any characters that are not only whitespace From 3dc903ff25921a96ff33ec48ab515337b2782128 Mon Sep 17 00:00:00 2001 From: HM33-Stu <120201372+HM33-Stu@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:48:24 +0800 Subject: [PATCH 2/4] Checkstyle fix --- src/main/java/seedu/address/model/internship/Location.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seedu/address/model/internship/Location.java b/src/main/java/seedu/address/model/internship/Location.java index 844f13c7273..b5c73d4b621 100644 --- a/src/main/java/seedu/address/model/internship/Location.java +++ b/src/main/java/seedu/address/model/internship/Location.java @@ -7,8 +7,8 @@ * Represents an Internship's location in the internship data. */ public class Location { - public static final String MESSAGE_CONSTRAINTS = "Locations have to be either local, overseas, or remote. " + - "Else, it will be set to the default value of UNKNOWN"; + public static final String MESSAGE_CONSTRAINTS = "Locations have to be either local, overseas, or remote. " + + "Else, it will be set to the default value of UNKNOWN"; public static final String VALIDATION_REGEX = "(?i)local|remote|overseas|unknown"; From da02d5e7e6b0c0a522d8ef2afb1c28f5ee2d2c13 Mon Sep 17 00:00:00 2001 From: HM33-Stu <120201372+HM33-Stu@users.noreply.github.com> Date: Thu, 11 Apr 2024 01:09:32 +0800 Subject: [PATCH 3/4] Grammar fix --- src/main/java/seedu/address/model/internship/Location.java | 2 +- src/main/java/seedu/address/model/internship/Role.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seedu/address/model/internship/Location.java b/src/main/java/seedu/address/model/internship/Location.java index b5c73d4b621..27537b39d0c 100644 --- a/src/main/java/seedu/address/model/internship/Location.java +++ b/src/main/java/seedu/address/model/internship/Location.java @@ -7,7 +7,7 @@ * Represents an Internship's location in the internship data. */ public class Location { - public static final String MESSAGE_CONSTRAINTS = "Locations have to be either local, overseas, or remote. " + public static final String MESSAGE_CONSTRAINTS = "Locations have to be either unknown, local, overseas, or remote. " + "Else, it will be set to the default value of UNKNOWN"; public static final String VALIDATION_REGEX = "(?i)local|remote|overseas|unknown"; diff --git a/src/main/java/seedu/address/model/internship/Role.java b/src/main/java/seedu/address/model/internship/Role.java index 4435bdf2ada..7540f05a6d0 100644 --- a/src/main/java/seedu/address/model/internship/Role.java +++ b/src/main/java/seedu/address/model/internship/Role.java @@ -9,7 +9,7 @@ public class Role { public static final String MESSAGE_CONSTRAINTS = - "Roles should not be blank! Else, it will be set to the default value of " + "unknown role"; + "Roles should not be blank! Else, it will be set to the default value of " + "Unknown Role"; /* * Matches any characters that are not only whitespace From a50823c3f975c38af7b9b081ddabebd392859659 Mon Sep 17 00:00:00 2001 From: HM33-Stu <120201372+HM33-Stu@users.noreply.github.com> Date: Fri, 12 Apr 2024 05:20:01 +0800 Subject: [PATCH 4/4] Requested changes made --- src/main/java/seedu/address/model/internship/Location.java | 3 +-- src/main/java/seedu/address/model/internship/Role.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/seedu/address/model/internship/Location.java b/src/main/java/seedu/address/model/internship/Location.java index 27537b39d0c..e05751b5a9d 100644 --- a/src/main/java/seedu/address/model/internship/Location.java +++ b/src/main/java/seedu/address/model/internship/Location.java @@ -7,8 +7,7 @@ * Represents an Internship's location in the internship data. */ public class Location { - public static final String MESSAGE_CONSTRAINTS = "Locations have to be either unknown, local, overseas, or remote. " - + "Else, it will be set to the default value of UNKNOWN"; + public static final String MESSAGE_CONSTRAINTS = "Locations have to be either unknown, local, overseas, or remote."; public static final String VALIDATION_REGEX = "(?i)local|remote|overseas|unknown"; diff --git a/src/main/java/seedu/address/model/internship/Role.java b/src/main/java/seedu/address/model/internship/Role.java index 7540f05a6d0..6938f0e6f1d 100644 --- a/src/main/java/seedu/address/model/internship/Role.java +++ b/src/main/java/seedu/address/model/internship/Role.java @@ -8,8 +8,7 @@ */ public class Role { - public static final String MESSAGE_CONSTRAINTS = - "Roles should not be blank! Else, it will be set to the default value of " + "Unknown Role"; + public static final String MESSAGE_CONSTRAINTS = "Roles should not be blank!"; /* * Matches any characters that are not only whitespace