From e4f0ad747c20f3b56f2a38f7ce1065a494e85df9 Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Fri, 24 Jul 2020 10:03:46 +0200
Subject: [PATCH] Common.UI JFX: Use filters for leaf detection, too
Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.../tooling/common/ui/javafx/control/treetableview/.ratings | 4 ++--
.../common/ui/javafx/control/treetableview/DynamicList.java | 3 ++-
.../ui/javafx/control/treetableview/DynamicTreeItem.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
index f19dcc6e3..238e57e7d 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
@@ -1,7 +1,7 @@
-DynamicList.java 7b5b1ce48c93292d9ee79ed58792d1157687ca3c YELLOW
+DynamicList.java 6206ef9150c1f4bf07102820ae2a647ec3fb882b YELLOW
DynamicListContentProvider.java 817cba44f246a361207a88ef9a4e1869215803f7 YELLOW
DynamicTreeContentProviderBase.java 6760a6dc5721175b1dada8f30fd9da05f7bcc4b3 GREEN
-DynamicTreeItem.java 53bb2886186c7cda1c3e1a9340b3df622089ff16 YELLOW
+DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 YELLOW
DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 YELLOW
DynamicTreeTableUIProviderBase.java f78c0f8b52fbc939166b3f94f7f6006cc0f4d32b GREEN
DynamicTreeTableViewer.java 048e242856e2ac56969711d2698bdbb2c4235704 YELLOW
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicList.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicList.java
index 7b5b1ce48..6206ef915 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicList.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicList.java
@@ -57,7 +57,8 @@ public class DynamicList<T> extends DynamicTreeItemBase<T> {
/** {@inheritDoc} */
@Override
public boolean isLeaf() {
- Collection<? extends Object> children = contentProvider.getChildren(getValue());
+ Collection<? extends Object> children =
+ contentProvider.getFilteredSortedChildren(getValue());
return children == null || children.isEmpty();
}
}
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeItem.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeItem.java
index 53bb28861..7486071d2 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeItem.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeItem.java
@@ -61,7 +61,8 @@ public class DynamicTreeItem<T> extends DynamicTreeItemBase<T> {
/** {@inheritDoc} */
@Override
public boolean isLeaf() {
- Collection<? extends Object> children = contentProvider.getChildren(getValue());
+ Collection<? extends Object> children =
+ contentProvider.getFilteredSortedChildren(getValue());
return children == null || children.isEmpty();
}
}
--
GitLab