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

Fixed table highlighting

Browse source 
Fixed live search table highlighting bug which caused random highlighted rows to appear
This commit is contained in:
law39 2020-04-21 22:30:13 +01:00
parent 60e85fe782
commit f281d46ffa
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dev/20200421/law39/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/DictionaryController.java
View file

@ -136,14 +136,18 @@ public class DictionaryController implements Initializable {
searchBox.textProperty().addListener((observable, oldValue, newValue) -> {
filteredList.setPredicate(dictionaryEntry -> {
// If filter text is empty, display all dictionary entries
if (newValue == null || newValue.isEmpty()) {
table.refresh(); // This fixes the table highlighting issue
if (newValue == null || newValue.isEmpty()) { // If filter text is empty, display all dictionary entries
return true;
}
// need all same case for compare.
String lowerCaseFilter = newValue.toLowerCase();
if (dictionaryEntry.getWelsh().toLowerCase().contains(lowerCaseFilter)) {
return true; // Filter matches Welsh
} else if (dictionaryEntry.getEnglish().toLowerCase().contains(lowerCaseFilter)) {
@ -151,7 +155,9 @@ public class DictionaryController implements Initializable {
}else if (dictionaryEntry.getWordType().toLowerCase().contains(lowerCaseFilter)) {
return true; // Filter matches Word Type
}
return false; // No match
});
});