fix: plugin treeitems can be filtered

DropSnorz · Nov 17, 2021 · 7924343 · 7924343
1 parent 7075317
commit 7924343
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/PluginsController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/PluginsController.java
@@ -132,15 +132,15 @@ public TreeCell<Object> call(TreeView<Object> p) {
       if (searchTextField.getText() == null || searchTextField.getText().isEmpty()) {
         return null;
       }
-      return actor -> actor.toString().toLowerCase().contains(searchTextField.getText().toLowerCase());
+      return item -> item.toString().toLowerCase().contains(searchTextField.getText().toLowerCase());
     }, searchTextField.textProperty()));
 
     // Binds search property to plugin tree filter
     treeFileRootNode.predicateProperty().bind(Bindings.createObjectBinding(() -> {
       if (searchTextField.getText() == null || searchTextField.getText().isEmpty()) {
         return null;
       }
-      return actor -> actor.toString().toLowerCase().contains(searchTextField.getText().toLowerCase());
+      return item -> item.toString().toLowerCase().contains(searchTextField.getText().toLowerCase());
     }, searchTextField.textProperty()));
 
     syncButton.setOnAction(e -> {

diff --git a/owlplug-client/src/main/java/com/owlplug/core/ui/FilterableTreeItem.java b/owlplug-client/src/main/java/com/owlplug/core/ui/FilterableTreeItem.java
@@ -18,6 +18,7 @@
 
 package com.owlplug.core.ui;
 
+import java.util.Objects;
 import java.util.function.Predicate;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -41,10 +42,12 @@ public FilterableTreeItem(T value) {
         if (child instanceof FilterableTreeItem) {
           ((FilterableTreeItem<T>) child).predicateProperty().set(predicate.get());
         }
-        if (predicate.get() == null || !child.getChildren().isEmpty()) {
+        if (predicate.get() == null || !child.getChildren().isEmpty() || child.getValue() == null) {
           return true;
         }
+
         return predicate.get().test(child.getValue());
+
       };
       return p;
     }, predicate));