noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved DictionaryEntry Equals method

Browse source
This commit is contained in:
law39 2020-05-01 14:40:53 +01:00
parent 4b43632364
commit 9b741d90db
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java
View file

@ -172,14 +172,10 @@ public class DictionaryEntry {
* @param entry Object that the DictionaryEntry object is comparing itself to.
* @return Returns true (if equal) or false (not equal).
*/
@Override
public boolean equals(Object entry) {
public boolean equals(DictionaryEntry entry) {
// Cast the object to be a DictionaryEntry.
DictionaryEntry otherEntry = (DictionaryEntry) entry;
// Check it they're equal by looking if they have equal 'welsh' or 'english' with the same 'wordType'.
return ((this.getWelsh().equalsIgnoreCase(otherEntry.getWelsh()) || this.getEnglish().equalsIgnoreCase(otherEntry.getWelsh())) &&
this.getWordType().equals(otherEntry.getWordType()));
return ((this.getWelsh().equalsIgnoreCase(entry.getWelsh()) || this.getEnglish().equalsIgnoreCase(entry.getWelsh())) &&
this.getWordType().equals(entry.getWordType()));
}
}