From c911fc6ac5653274fe5cb169c3d1eada7c585732 Mon Sep 17 00:00:00 2001 From: jamesebond Date: Wed, 8 Nov 2023 14:53:25 +0800 Subject: [PATCH 1/5] Minor Bug Fix --- .../address/logic/parser/DeleteStallCommandParser.java | 10 ++++++---- .../java/seedu/address/logic/parser/ParserUtil.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/seedu/address/logic/parser/DeleteStallCommandParser.java b/src/main/java/seedu/address/logic/parser/DeleteStallCommandParser.java index 08f292772d0..52391f72802 100644 --- a/src/main/java/seedu/address/logic/parser/DeleteStallCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/DeleteStallCommandParser.java @@ -1,6 +1,7 @@ package seedu.address.logic.parser; import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static seedu.address.logic.Messages.MESSAGE_INVALID_STALL_DISPLAYED_INDEX; import static seedu.address.logic.parser.CliSyntax.PREFIX_ITEM; import static seedu.address.logic.parser.CliSyntax.PREFIX_STALL; @@ -30,14 +31,15 @@ public DeleteStallCommand parse(String args) throws ParseException { || !argMultimap.getPreamble().isEmpty()) { throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteStallCommand.MESSAGE_USAGE)); } + argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_STALL, PREFIX_ITEM); + Index stallIndex; try { - argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_STALL, PREFIX_ITEM); - Index stallIndex = ParserUtil.parseStallIndex(argMultimap.getValue(PREFIX_STALL).get()); - return new DeleteStallCommand(stallIndex); + stallIndex = ParserUtil.parseStallIndex(argMultimap.getValue(PREFIX_STALL).get()); } catch (ParseException pe) { throw new ParseException( - String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteStallCommand.MESSAGE_USAGE), pe); + String.format(MESSAGE_INVALID_STALL_DISPLAYED_INDEX, DeleteStallCommand.MESSAGE_USAGE), pe); } + return new DeleteStallCommand(stallIndex); } /** diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java index 279ce7c021e..e6cb79a4bf0 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java @@ -103,7 +103,7 @@ public static ItemName parseItemName(String itemName) throws ParseException { public static Index parseStallIndex(String oneBasedIndex) throws ParseException { String trimmedIndex = oneBasedIndex.trim(); if (!StringUtil.isNonZeroUnsignedInteger(trimmedIndex)) { - throw new ParseException(MESSAGE_INVALID_STALL_INDEX); + throw new ParseException(String.format(MESSAGE_INVALID_STALL_INDEX)); } return Index.fromOneBased(Integer.parseInt(trimmedIndex)); } From 6b89b90cd9ae635287b6cdc9b48594df3e564fa4 Mon Sep 17 00:00:00 2001 From: jamesebond Date: Wed, 8 Nov 2023 23:13:10 +0800 Subject: [PATCH 2/5] Bug fix --- .../address/logic/parser/DeleteStallCommandParserTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java index b1f6d7ef5f9..b64a9b05588 100644 --- a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java @@ -1,6 +1,7 @@ package seedu.address.logic.parser; import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static seedu.address.logic.Messages.MESSAGE_INVALID_STALL_DISPLAYED_INDEX; import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; import static seedu.address.logic.parser.CliSyntax.PREFIX_STALL; import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; @@ -31,7 +32,7 @@ public void parse_validArgs_returnsDeleteCommand() { @Test public void parse_invalidArgs_throwsParseException() { String userInput = PREAMBLE_WHITESPACE + " " + PREFIX_STALL + "a"; - assertParseFailure(parser, userInput, String.format(MESSAGE_INVALID_COMMAND_FORMAT, + assertParseFailure(parser, userInput, String.format(MESSAGE_INVALID_STALL_DISPLAYED_INDEX, DeleteStallCommand.MESSAGE_USAGE)); } } From 9c1f15f4d61395378debc1c2bc0b70b44c52a709 Mon Sep 17 00:00:00 2001 From: jamesebond Date: Wed, 8 Nov 2023 23:16:03 +0800 Subject: [PATCH 3/5] no message --- .../seedu/address/logic/parser/DeleteStallCommandParserTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java index b64a9b05588..fdfae0ade81 100644 --- a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java @@ -1,6 +1,5 @@ package seedu.address.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import static seedu.address.logic.Messages.MESSAGE_INVALID_STALL_DISPLAYED_INDEX; import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; import static seedu.address.logic.parser.CliSyntax.PREFIX_STALL; From e257983b3c41b6c4acdae7bfcf5b0b2e3ed2033b Mon Sep 17 00:00:00 2001 From: jamesebond Date: Wed, 8 Nov 2023 23:16:14 +0800 Subject: [PATCH 4/5] Revert "no message" This reverts commit 9c1f15f4d61395378debc1c2bc0b70b44c52a709. --- .../seedu/address/logic/parser/DeleteStallCommandParserTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java index fdfae0ade81..b64a9b05588 100644 --- a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java @@ -1,5 +1,6 @@ package seedu.address.logic.parser; +import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import static seedu.address.logic.Messages.MESSAGE_INVALID_STALL_DISPLAYED_INDEX; import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; import static seedu.address.logic.parser.CliSyntax.PREFIX_STALL; From 6ae798d8d1a9825f3bca1fc08a2396c7790c345b Mon Sep 17 00:00:00 2001 From: jamesebond Date: Wed, 8 Nov 2023 23:16:41 +0800 Subject: [PATCH 5/5] Bug Fix --- .../seedu/address/logic/parser/DeleteStallCommandParserTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java index b64a9b05588..fdfae0ade81 100644 --- a/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/DeleteStallCommandParserTest.java @@ -1,6 +1,5 @@ package seedu.address.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import static seedu.address.logic.Messages.MESSAGE_INVALID_STALL_DISPLAYED_INDEX; import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; import static seedu.address.logic.parser.CliSyntax.PREFIX_STALL;