[Defensive] FindCommand #180
Merged
Conversation
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
jeannetoh99
approved these changes
Oct 28, 2020
| @@ -20,6 +20,7 @@ | |||
| public static final String MESSAGE_ACTIVITIES_LISTED_OVERVIEW = "%1$d activities listed!"; | |||
| public static final String MESSAGE_ACCOMMODATIONS_LISTED_OVERVIEW = "%1$d accommodations listed!"; | |||
| public static final String MESSAGE_FRIENDS_LISTED_OVERVIEW = "%1$d friends listed!"; | |||
| public static final String MESSAGE_TRAVELPLANS_LISTED_OVERVIEW = "%1$d travel plans listed!"; | |||
| public static final String WRONG_DIRECTORY = "You are currently in the wishlist which can only find activity.\n" | |||
| + "Please goto to a travelplan to edit friend, activity or accommodation"; | |||
There was a problem hiding this comment.
Is this a clearer phrasing?
"Please go to your desired travelplan to edit friend, activity or accommodation, using the goto command.";
|
|
||
| private final NameContainsKeywordsPredicate predicate; | ||
| private final int travelPlanObjectType; | ||
|
|
||
| /** | ||
| * Constructor for FindCommand | ||
| * | ||
| * @param predicate contains a list of strings to filter travel plan object list | ||
| * @param predicate contains a list of strings to filter travel plan object list |
There was a problem hiding this comment.
I think you accidentally added a big space here haha
Comment on lines
67
to
85
| if (this.travelPlanObjectType == ParserUtil.ACTIVITY_INDEX) { | ||
| model.updateFilteredActivityList(predicate); | ||
| message = MESSAGE_ACTIVITIES_LISTED_OVERVIEW; | ||
| size = model.getFilteredActivityList().size(); | ||
|
|
||
| } else if (this.travelPlanObjectType == 1) { //accommodation | ||
| } else if (this.travelPlanObjectType == ParserUtil.ACCOMMODATION_INDEX) { | ||
| model.updateFilteredAccommodationList(predicate); | ||
| message = MESSAGE_ACCOMMODATIONS_LISTED_OVERVIEW; | ||
| size = model.getFilteredAccommodationList().size(); | ||
|
|
||
|
|
||
| } else if (this.travelPlanObjectType == 2) { //friend | ||
| } else if (this.travelPlanObjectType == ParserUtil.FRIEND_INDEX) { | ||
| model.updateFilteredFriendList(predicate); | ||
| message = MESSAGE_FRIENDS_LISTED_OVERVIEW; | ||
| size = model.getFilteredFriendList().size(); | ||
|
|
||
| } else { | ||
| assert false; | ||
| } |
There was a problem hiding this comment.
Can use switch case but not a big problem.
lyeyixian
reviewed
Oct 28, 2020
|
|
||
| private final NameContainsKeywordsPredicate predicate; | ||
| private final int travelPlanObjectType; | ||
|
|
||
| /** | ||
| * Constructor for FindCommand | ||
| * | ||
| * @param predicate contains a list of strings to filter travel plan object list | ||
| * @param predicate contains a list of strings to filter travel plan object list |
There was a problem hiding this comment.
Why is there a huge whitespace here tho?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Include check to ensure wishlist can only find activity object
Assert valid inputs
close #163