Finish up model package #75
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
Closed
lyeyixian
requested review from
jeannetoh99,
jiaweiteo,
timjkong and
underthehai
Fix some typos, javadocs and import statement issues Update NameContainsKeywordsPredicate to work properly
|
I think I'm done for now? Hopes everything works. |
jeannetoh99
reviewed
Oct 6, 2020
src/main/java/seedu/address/model/commons/NameContainsKeywordsPredicate.java
Outdated
Show resolved
Hide resolved
| */ | ||
| public class NameContainsKeywordsPredicate implements Predicate<Activity> { | ||
| public class NameContainsKeywordsPredicate implements Predicate<TravelPlanObject> { |
There was a problem hiding this comment.
Maybe here can also implement Predicate, then we can overload the test method with test(TravelPlan tp) as well?
There was a problem hiding this comment.
I updated it. But I don't know if it works, can help me check?
jeannetoh99
requested changes
Oct 6, 2020
| */ | ||
| public class NameContainsKeywordsPredicate implements Predicate<Activity> { | ||
| public class NameContainsKeywordsPredicate implements Predicate<Object> { |
There was a problem hiding this comment.
I meant implements Predicate<TravelPlanObject>, Predicate<TravelPlan> since a class can implement more than one interfaces.
Comment on lines
+20
to
+30
| public boolean test(Object obj) { | ||
| if (obj instanceof TravelPlan) { | ||
| return keywords.stream() | ||
| .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(((TravelPlan) obj).getName().name, keyword)); | ||
| } else if (obj instanceof TravelPlanObject) { | ||
| return keywords.stream() | ||
| .anyMatch(keyword -> | ||
| StringUtil.containsWordIgnoreCase(((TravelPlanObject) obj).getName().name, keyword)); | ||
| } else { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
As for this, 2 separate (overloaded) test methods:
public boolean test(TravelPlan travelPlan) and public boolean test(TravelPlanObject tpObject)
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.
Don't merge first, I haven't finish yet