Add Delete Command #93
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,72 @@ | ||
| package seedu.address.logic.commands; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import seedu.address.commons.core.index.Index; | ||
| import seedu.address.commons.util.ToStringBuilder; | ||
| import seedu.address.logic.Messages; | ||
| import seedu.address.logic.commands.exceptions.CommandException; | ||
| import seedu.address.model.Model; | ||
| import seedu.address.model.recipe.Recipe; | ||
|
|
||
| /** | ||
| * Deletes a recipe identified using it's displayed index from the recipe book. | ||
| */ | ||
| public class DeleteCommand extends Command { | ||
|
|
||
| public static final String COMMAND_WORD = "delete"; | ||
|
|
||
| public static final String MESSAGE_USAGE = COMMAND_WORD | ||
| + ": Deletes the recipe identified by the index number used in the displayed recipe list.\n" | ||
| + "Parameters: INDEX (must be a positive integer)\n" | ||
| + "Example: " + COMMAND_WORD + " 1"; | ||
|
|
||
| public static final String MESSAGE_DELETE_RECIPE_SUCCESS = "Deleted Recipe: %1$s"; | ||
|
|
||
| private final Index targetIndex; | ||
|
|
||
| public DeleteCommand(Index targetIndex) { | ||
| this.targetIndex = targetIndex; | ||
| } | ||
|
|
||
| @Override | ||
| public CommandResult execute(Model model) throws CommandException { | ||
| requireNonNull(model); | ||
| List<Recipe> lastShownList = model.getFilteredRecipeList(); | ||
|
|
||
| if (targetIndex.getOneBased() > lastShownList.size() || targetIndex.getOneBased() <= 0) { | ||
| throw new CommandException(Messages.MESSAGE_INVALID_RECIPE_DISPLAYED_INDEX); | ||
| } | ||
| Recipe deletedRecipe = lastShownList.get(targetIndex.getZeroBased()); | ||
| model.deleteRecipe(deletedRecipe); | ||
|
|
||
| return new CommandResult(String.format(MESSAGE_DELETE_RECIPE_SUCCESS, | ||
| targetIndex.getOneBased())); | ||
|
|
||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == this) { | ||
| return true; | ||
| } | ||
|
|
||
| // instanceof handles nulls | ||
| if (!(other instanceof DeleteCommand)) { | ||
| return false; | ||
| } | ||
|
|
||
| DeleteCommand otherDeleteCommand = (DeleteCommand) other; | ||
| return (targetIndex.equals(otherDeleteCommand.targetIndex)); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return new ToStringBuilder(this) | ||
| .add("targetIndex", targetIndex) | ||
| .toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,31 @@ | ||
| package seedu.address.logic.parser; | ||
|
|
||
| import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; | ||
|
|
||
| import seedu.address.commons.core.index.Index; | ||
| import seedu.address.logic.commands.DeleteCommand; | ||
| import seedu.address.logic.parser.exceptions.ParseException; | ||
|
|
||
|
|
||
| /** | ||
| * Parses input arguments and creates a new DeleteCommand object | ||
| */ | ||
| public class DeleteCommandParser implements Parser<DeleteCommand> { | ||
|
|
||
| /** | ||
| * Parses the given {@code String} of arguments in the context of the DeleteCommand | ||
| * and returns a DeleteCommand object for execution. | ||
| * @throws ParseException if the user input does not conform the expected format | ||
| */ | ||
| public DeleteCommand parse(String args) throws ParseException { | ||
| try { | ||
| String trimmedArgs = args.trim(); | ||
| Index index = ParserUtil.parseIndex(trimmedArgs); | ||
| return new DeleteCommand(index); | ||
| } catch (ParseException pe) { | ||
| throw new ParseException( | ||
| String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be fine not catching the exception here considering the exception was thrown in the previous level. It's a runtime exception so we don't necessarily need to catch it, same as other runtime exceptions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think throwing an exception is fine so that the code can catch and display the corresponding error if needed