From 1355d460cb5e34a3a36ba9194251cf5c834268be Mon Sep 17 00:00:00 2001 From: lerxuann Date: Sun, 5 Nov 2023 12:13:04 +0800 Subject: [PATCH 1/3] Fix bugs in find and delete commands --- .../java/seedu/address/logic/parser/DeleteCommandParser.java | 4 ++-- .../java/seedu/address/logic/parser/FindCommandParser.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java b/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java index 0b5790f3781..e0c4146efe7 100644 --- a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java @@ -29,8 +29,8 @@ public DeleteCommand parse(String args) throws ParseException { argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_GROUPTAG); // check if either n/ or g/ are present - if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_GROUPTAG) - || !argMultimap.getPreamble().isEmpty()) { + if ((!arePrefixesPresent(argMultimap, PREFIX_NAME) || !argMultimap.getPreamble().isEmpty()) + && !arePrefixesPresent(argMultimap, PREFIX_GROUPTAG)) { throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE)); } diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/seedu/address/logic/parser/FindCommandParser.java index 7b6e0fe2dca..6c5d8561405 100644 --- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/FindCommandParser.java @@ -32,8 +32,8 @@ public FindCommand parse(String args) throws ParseException { argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_GROUPTAG); // check if either n/ or g/ are present - if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_GROUPTAG) - || !argMultimap.getPreamble().isEmpty()) { + if ((!arePrefixesPresent(argMultimap, PREFIX_NAME) || !argMultimap.getPreamble().isEmpty()) + && !arePrefixesPresent(argMultimap, PREFIX_GROUPTAG)) { throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE)); } From 28dc4b0d474c63186480e032f4c66b7453e04846 Mon Sep 17 00:00:00 2001 From: lerxuann Date: Sun, 5 Nov 2023 12:21:19 +0800 Subject: [PATCH 2/3] Fix stacking error message in listgroup command --- src/main/java/seedu/address/logic/commands/ListGroupCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/seedu/address/logic/commands/ListGroupCommand.java b/src/main/java/seedu/address/logic/commands/ListGroupCommand.java index 7f171080750..3f428fa6bee 100644 --- a/src/main/java/seedu/address/logic/commands/ListGroupCommand.java +++ b/src/main/java/seedu/address/logic/commands/ListGroupCommand.java @@ -23,6 +23,7 @@ public class ListGroupCommand extends Command { @Override public CommandResult execute(Model model) { requireNonNull(model); + MESSAGE_SUCCESS.setLength(0); MESSAGE_SUCCESS.append("Groups in address book:\n"); ObservableList groupList = model.getFilteredGroupList(); groupList.stream().forEach( From c852de5ad4866cf72c3e0e7de797f9e1aec65ad8 Mon Sep 17 00:00:00 2001 From: lerxuann Date: Sun, 5 Nov 2023 12:35:28 +0800 Subject: [PATCH 3/3] Change name of application to ProjectPRO --- src/main/resources/view/MainWindow.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index be9790fda84..ecc030437d6 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -13,7 +13,7 @@ + title="ProjectPRO" minWidth="450" minHeight="600" onCloseRequest="#handleExit">