Standardize error messages

src/main/java/seedu/address/logic/commands/ClearCommand.java

@@ -2,14 +2,14 @@
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.messages.ClearMessages;
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 
 /**
  * Clears the address book.
  */
 public class ClearCommand extends Command {
-
     public static final String COMMAND_WORD = "/clear";
     public static final String MESSAGE_SUCCESS = "Woof! Cleared PoochPlanner successfully! 🐶";
 
@@ -18,6 +18,6 @@ public class ClearCommand extends Command {
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.setAddressBook(new AddressBook());
-        return new CommandResult(MESSAGE_SUCCESS);
+        return new CommandResult(ClearMessages.MESSAGE_CLEAR_POOCHPLANNER_SUCCESS);
     }
 }

src/main/java/seedu/address/logic/commands/DeleteCommand.java

@@ -39,7 +39,7 @@ public CommandResult execute(Model model) throws CommandException {
         model.deletePerson(personToDelete);
 
         return new CommandResult(String.format(DeleteMessages.MESSAGE_DELETE_PERSON_SUCCESS,
-                DeleteMessages.format(personToDelete)));
+                DeleteMessages.formatPerson(personToDelete)));
     }
 
     @Override

src/main/java/seedu/address/logic/commands/HelpCommand.java

@@ -16,10 +16,10 @@ public class HelpCommand extends Command {
     public static final String COMMAND_WORD = "/help";
     public static final String MESSAGE_USAGE = "Shows program usage instructions.\n"
             + "Example: /help ; command : exit";
-    public static final String MESSAGE_CONSTRAINTS = "Only accepts general, add, delete, edit,"
+    public static final String MESSAGE_CONSTRAINTS = "PoochPlanner only accepts general, add, delete, edit,"
             + " exit, search, list, note, pin, unpin, note, rate, redo, undo, remind, sort as"
             + " valid command type inputs.";
-    private String commandType;
+    private final String commandType;
     private final Logger logger = LogsCenter.getLogger(getClass());
 
 

src/main/java/seedu/address/logic/commands/ListCommand.java

@@ -3,22 +3,19 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
 
+import seedu.address.logic.messages.ListMessages;
 import seedu.address.model.Model;
 
 /**
  * Lists all persons in the address book to the user.
  */
 public class ListCommand extends Command {
-
     public static final String COMMAND_WORD = "/list";
 
-    public static final String MESSAGE_SUCCESS = "Listed all persons";
-
-
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-        return new CommandResult(MESSAGE_SUCCESS);
+        return new CommandResult(ListMessages.MESSAGE_LIST_CONTACTS_SUCCESS);
     }
 }

src/main/java/seedu/address/logic/commands/NoteCommand.java

@@ -25,7 +25,7 @@ public class NoteCommand extends Command {
     public static final String COMMAND_WORD = "/note";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Adds note to person.\n"
+            + ": Adds note to a contact in PoochPlanner.\n"
             + "Parameters: "
             + PREFIX_NAME + "NAME"
             + PREFIX_NOTE + "NOTE"

src/main/java/seedu/address/logic/messages/ClearMessages.java

@@ -0,0 +1,5 @@
+package seedu.address.logic.messages;
+
+public class ClearMessages extends Messages {
+    public static final String MESSAGE_CLEAR_POOCHPLANNER_SUCCESS = "Woof! Cleared PoochPlanner successfully! \uD83D\uDC36";
+}

src/main/java/seedu/address/logic/messages/DeleteMessages.java

@@ -12,6 +12,4 @@ public class DeleteMessages extends Messages {
             + "Delete requires a name field. %1$s\uD83D\uDC3E";
     public static final String MESSAGE_DELETE_INVALID_PARAMETERS = "Failed to delete Pooch Contact - "
             + "%1$s \uD83D\uDC3E";
-
-
 }

src/main/java/seedu/address/logic/messages/EditMessages.java

@@ -15,8 +15,8 @@ public class EditMessages extends Messages {
     public static final String MESSAGE_EDIT_NAME = "Failed to edit Pooch Contact - "
             + "Edit detect duplicate name fields. %1$s \uD83D\uDC3E";
     public static final String MESSAGE_EDIT_INVALID_NAME = "Failed to edit Pooch Contact. %1$s \uD83D\uDC3E";
-    public static final String MESSAGE_EDITING_NAME = "Failed to edit Pooch Contact."
-            + "Editing Pooch Contact names is not allowed \uD83D\uDC3E";
+    public static final String MESSAGE_EDITING_NAME = "Failed to edit Pooch Contact - "
+            + "Editing Pooch Contact names is not allowed . %1$s \uD83D\uDC3E";
     public static final String MESSAGE_EDIT_INVALID_FIELD = "Failed to edit Pooch Contact - "
             + "%1$s \uD83D\uDC3E";
     public static final String MESSAGE_EDIT_NO_DIFFERENCE = "Failed to edit Pooch Contact - "

src/main/java/seedu/address/logic/messages/HelpMessages.java

@@ -34,9 +34,10 @@ public class HelpMessages extends Messages {
     public static final String MESSAGES_SHOWING_CLEAR_HELP_MESSAGE =
             "Opened help window for clear command.";
     public static final String MESSAGES_INVALID_COMMAND_TYPE = "Invalid command type given.";
-
     public static final String MESSAGE_HELP_MISSING_COMMAND = "Failed to give help - "
-            + "Help requires a command field. \uD83D\uDC3E";
+            + "Help requires a command field. %1$s\uD83D\uDC3E";
+    public static final String MESSAGE_HELP_INVALID_PARAMETERS = "Failed to display help window - "
+            + "%1$s \uD83D\uDC3E";
 
     public static final String USERGUIDE_URL = "https://ay2324s2-cs2103t-w10-2.github.io/tp/UserGuide.html";
 

src/main/java/seedu/address/logic/messages/ListMessages.java

@@ -0,0 +1,6 @@
+package seedu.address.logic.messages;
+
+public class ListMessages extends Messages {
+    public static final String MESSAGE_LIST_CONTACTS_SUCCESS = "Woof! Listed all contacts! \uD83D\uDC36";
+
+}

src/main/java/seedu/address/logic/messages/Messages.java

@@ -17,8 +17,9 @@ public class Messages {
 
     public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command. Use command `/help` to see command list";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
-    public static final String MESSAGE_INVALID_FIELD_FORMAT = "Invalid field detected : %1$s";
-    public static final String MESSAGE_MISSING_FIELD_FORMAT = "Missing field detected : %1$s";
+    public static final String MESSAGE_INVALID_FIELD_FORMAT = "Invalid field detected : %1$s \uD83D\uDC3E";
+    public static final String MESSAGE_UNKNOWN_FIELD_FORMAT = "Unknown field detected : %1$s \uD83D\uDC3E";
+    public static final String MESSAGE_MISSING_FIELD_FORMAT = "Missing field detected : %1$s \uD83D\uDC3E";
     public static final String FAILED_TO_ADD = "Failed to add Pooch Contact - \n";
     public static final String FAILED_TO_EDIT = "Failed to edit Pooch Contact - \n";
     public static final String FAILED_TO_EDIT_WITH_NAME = "Failed to edit Pooch Contact - \n"

src/main/java/seedu/address/logic/messages/NoteMessages.java

@@ -5,18 +5,15 @@
  */
 public class NoteMessages extends Messages {
     public static final String MESSAGE_ADD_NOTE_SUCCESS =
-            "Woof! Added note to Pooch Contact %1$s successfully! \uD83D\uDC36";
-
+            "Woof! Added note to %1$s successfully! \uD83D\uDC36";
     public static final String MESSAGE_NOTE_NAME_NOT_FOUND = "Failed to add note to Pooch Contact - "
             + "Name does not exist in our address book \uD83D\uDC3E";
-
     public static final String MESSAGE_NOTE_NOT_SPECIFIED = "Failed to add note to Pooch Contact - "
             + "Note is not specified \uD83D\uDC3E";
-
     public static final String MESSAGE_NAME_NOT_SPECIFIED = "Failed to add note to Pooch Contact - "
             + "Name is not specified \uD83D\uDC3E";
-
     public static final String MESSAGE_DEADLINE_NOT_SPECIFIED = "Failed to add note to Pooch Contact - "
             + "Deadline is not specified \uD83D\uDC3E";
-
+    public static final String MESSAGE_NOTE_INVALID_PARAMETERS = "Failed to add note to Pooch Contact - "
+            + "%1$s \uD83D\uDC3E";
 }

src/main/java/seedu/address/logic/messages/PinMessages.java

@@ -5,7 +5,7 @@
  */
 public class PinMessages {
     public static final String MESSAGE_PIN_PERSON_SUCCESS = "Woof! Pinned %1$s successfully! \uD83D\uDC36";
-    public static final String MESSAGE_PIN_INVALID_NAME = "Failed to pin Pooch Contact. %1$s \uD83D\uDC3E";
+    public static final String MESSAGE_PIN_INVALID_NAME = "Failed to pin Pooch Contact - %1$s \uD83D\uDC3E";
     public static final String MESSAGE_PIN_NAME_NOT_FOUND = "Failed to pin Pooch Contact - "
             + "Name does not exist in our address book \uD83D\uDC3E";
     public static final String MESSAGE_PIN_MISSING_NAME = "Failed to pin Pooch Contact - "

src/main/java/seedu/address/logic/messages/RedoMessages.java

@@ -4,7 +4,7 @@
  * Container for user redo command visible messages.
  */
 public class RedoMessages extends Messages {
-    public static final String MESSAGE_REDO_SUCCESS = "Woof! Redo successfully! \uD83D\uDC36";
-    public static final String MESSAGE_REDO_FAIL = "Woof! There is no more future state to redo!";
+    public static final String MESSAGE_REDO_SUCCESS = "Woof! Redo successful! \uD83D\uDC36";
+    public static final String MESSAGE_REDO_FAIL = "Woof! There is no more future state to redo! \uD83D\uDC36";
 
 }

src/main/java/seedu/address/logic/messages/RemindMessages.java

@@ -4,5 +4,5 @@
  * Container for user remind command visible messages.
  */
 public class RemindMessages extends Messages {
-    public static final String MESSAGE_REMIND_PERSON_SUCCESS = "Woof! %1$s contacts found! \uD83D\uDC36";
+    public static final String MESSAGE_REMIND_PERSON_SUCCESS = "Woof! %1$s contact(s) found! \uD83D\uDC36";
 }

src/main/java/seedu/address/logic/messages/SearchMessages.java

@@ -4,9 +4,9 @@
  * Container for user search command visible messages.
  */
 public class SearchMessages extends Messages {
-    public static final String MESSAGE_SEARCH_PERSON_SUCCESS = "Woof! %1$s contacts found! \uD83D\uDC36";
+    public static final String MESSAGE_SEARCH_PERSON_SUCCESS = "Woof! %1$s contact(s) found! \uD83D\uDC36";
     public static final String MESSAGE_SEARCH_MISSING_FIELD = "Failed to find Pooch Contact - "
             + "Search requires a name / phone / address / email / product / employment field. \uD83D\uDC3E";
     public static final String MESSAGE_SEARCH_INVALID_FIELD = "Failed to find Pooch Contact - "
-            + "Pooch doesn't recognise the field \uD83D\uDC3E";
+            + "PoochPlanner doesn't recognise the field \uD83D\uDC3E";
 }

src/main/java/seedu/address/logic/messages/UndoMessages.java

@@ -4,7 +4,7 @@
  * Container for user undo command visible messages.
  */
 public class UndoMessages extends Messages {
-    public static final String MESSAGE_UNDO_SUCCESS = "Woof! Undo successfully! \uD83D\uDC36";
-    public static final String MESSAGE_UNDO_FAIL = "Woof! There is no more previous state to undo!";
+    public static final String MESSAGE_UNDO_SUCCESS = "Woof! Undo successful! \uD83D\uDC36";
+    public static final String MESSAGE_UNDO_FAIL = "Woof! There is no more previous state to undo! \uD83D\uDC36";
 
 }

src/main/java/seedu/address/logic/messages/UnpinMessages.java

@@ -6,7 +6,7 @@
  */
 public class UnpinMessages {
     public static final String MESSAGE_UNPIN_PERSON_SUCCESS = "Woof! Unpinned %1$s successfully! \uD83D\uDC36";
-    public static final String MESSAGE_UNPIN_INVALID_NAME = "Failed to unpin Pooch Contact. %1$s \uD83D\uDC3E";
+    public static final String MESSAGE_UNPIN_INVALID_NAME = "Failed to unpin Pooch Contact - %1$s \uD83D\uDC3E";
     public static final String MESSAGE_UNPIN_NAME_NOT_FOUND = "Failed to unpin Pooch Contact - "
             + "Name does not exist in our address book \uD83D\uDC3E";
     public static final String MESSAGE_UNPIN_MISSING_NAME = "Failed to unpin Pooch Contact - "

src/main/java/seedu/address/logic/parser/AddMaintainerCommandParser.java

@@ -18,6 +18,7 @@
 
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.commands.AddMaintainerCommand;
+import seedu.address.logic.messages.AddMessages;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Commission;
@@ -62,22 +63,27 @@ public AddMaintainerCommand parse(String args) throws ParseException {
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
                 PREFIX_SKILL, PREFIX_COMMISSION);
-        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
-        Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
-        Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
-        Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
 
-        Tag tag = new Tag("maintainer");
-        Set<Tag> tags = new HashSet<>();
-        tags.add(tag);
-        Skill skill = ParserUtil.parseSkill(argMultimap.getValue(PREFIX_SKILL).get());
-        Commission commission = ParserUtil.parseCommission(argMultimap.getValue(PREFIX_COMMISSION).get());
+        try {
+            Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).orElseThrow());
+            Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).orElseThrow());
+            Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).orElseThrow());
+            Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).orElseThrow());
+            String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
+            Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
+            Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
 
-        Maintainer person = new Maintainer(name, phone, email, address, note, tags, skill, commission, rating);
+            Tag tag = new Tag("maintainer");
+            Set<Tag> tags = new HashSet<>();
+            tags.add(tag);
+            Skill skill = ParserUtil.parseSkill(argMultimap.getValue(PREFIX_SKILL).orElseThrow());
+            Commission commission = ParserUtil.parseCommission(argMultimap.getValue(PREFIX_COMMISSION).orElseThrow());
 
-        return new AddMaintainerCommand(person);
+            Maintainer person = new Maintainer(name, phone, email, address, note, tags, skill, commission, rating);
+
+            return new AddMaintainerCommand(person);
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(AddMessages.MESSAGE_ADD_INVALID_PARAMETERS, pe.getMessage()));
+        }
     }
 }

src/main/java/seedu/address/logic/parser/AddStaffCommandParser.java

@@ -18,6 +18,7 @@
 
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.commands.AddStaffCommand;
+import seedu.address.logic.messages.AddMessages;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
@@ -62,21 +63,26 @@ public AddStaffCommand parse(String args) throws ParseException {
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
                 PREFIX_SALARY, PREFIX_EMPLOYMENT);
-        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
-        Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
-        Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
-        Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
-        Tag tag = new Tag("staff");
-        Set<Tag> tags = new HashSet<>();
-        tags.add(tag);
-        Employment employment = ParserUtil.parseEmployment(argMultimap.getValue(PREFIX_EMPLOYMENT).get());
-        Salary salary = ParserUtil.parseSalary(argMultimap.getValue(PREFIX_SALARY).get());
 
-        Staff person = new Staff(name, phone, email, address, note, tags, salary, employment, rating);
+        try {
+            Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).orElseThrow());
+            Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).orElseThrow());
+            Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).orElseThrow());
+            Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).orElseThrow());
+            String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
+            Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
+            Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
+            Tag tag = new Tag("staff");
+            Set<Tag> tags = new HashSet<>();
+            tags.add(tag);
+            Employment employment = ParserUtil.parseEmployment(argMultimap.getValue(PREFIX_EMPLOYMENT).orElseThrow());
+            Salary salary = ParserUtil.parseSalary(argMultimap.getValue(PREFIX_SALARY).orElseThrow());
 
-        return new AddStaffCommand(person);
+            Staff person = new Staff(name, phone, email, address, note, tags, salary, employment, rating);
+
+            return new AddStaffCommand(person);
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(AddMessages.MESSAGE_ADD_INVALID_PARAMETERS, pe.getMessage()));
+        }
     }
 }

src/main/java/seedu/address/logic/parser/AddSupplierCommandParser.java

@@ -18,6 +18,7 @@
 
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.commands.AddSupplierCommand;
+import seedu.address.logic.messages.AddMessages;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
@@ -59,21 +60,26 @@ public AddSupplierCommand parse(String args) throws ParseException {
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
                 PREFIX_PRODUCT, PREFIX_PRICE);
-        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
-        Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
-        Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
-        Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
-        Tag tag = new Tag("supplier");
-        Set<Tag> tags = new HashSet<>();
-        tags.add(tag);
-        Price price = ParserUtil.parsePrice(argMultimap.getValue(PREFIX_PRICE).get());
-        Product product = ParserUtil.parseProduct(argMultimap.getValue(PREFIX_PRODUCT).get());
 
-        Supplier person = new Supplier(name, phone, email, address, note, tags, product, price, rating);
+        try {
+            Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).orElseThrow());
+            Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).orElseThrow());
+            Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).orElseThrow());
+            Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).orElseThrow());
+            String noteContent = argMultimap.getValue(PREFIX_NOTE).orElse("No note here");
+            Note note = noteContent.equals("No note here") ? new Note(noteContent) : ParserUtil.parseNote(noteContent);
+            Rating rating = ParserUtil.parseRating(argMultimap.getValue(PREFIX_RATING).orElse("0"));
+            Tag tag = new Tag("supplier");
+            Set<Tag> tags = new HashSet<>();
+            tags.add(tag);
+            Price price = ParserUtil.parsePrice(argMultimap.getValue(PREFIX_PRICE).orElseThrow());
+            Product product = ParserUtil.parseProduct(argMultimap.getValue(PREFIX_PRODUCT).orElseThrow());
 
-        return new AddSupplierCommand(person);
+            Supplier person = new Supplier(name, phone, email, address, note, tags, product, price, rating);
+
+            return new AddSupplierCommand(person);
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(AddMessages.MESSAGE_ADD_INVALID_PARAMETERS, pe.getMessage()));
+        }
     }
 }