From 1b591c58227ee3772962c0ce47e03a017fa72f6d Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Fri, 4 Sep 2020 13:54:45 +0200
Subject: [PATCH] RED
Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../common/ui/javafx/control/treetableview/.ratings | 2 +-
.../control/treetableview/DynamicTreeTableViewer.java | 9 ++++++---
2 files changed, 7 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 85017eff6..f38d826ac 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
@@ -5,7 +5,7 @@ DynamicTreeContentProviderBase.java 0f6e0a6894752d135847608bc45efa504972bb28 GRE
DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN
DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
DynamicTreeTableUIProviderBase.java f78c0f8b52fbc939166b3f94f7f6006cc0f4d32b GREEN
-DynamicTreeTableViewer.java 129fdcd259e5b7f2528dfeb407676528dcc694be YELLOW
+DynamicTreeTableViewer.java db08e6b04250afd44c08fe653c00fc0d5ce4f478 RED
DynamicTreeUIProviderBase.java e9b68607683de279d0cb8712a28dc131c5c33ece GREEN
DynamicTreeViewer.java 8c20c0941bd299afce1cf237c8e29e21821c2631 GREEN
DynamicTreeViewerBase.java a2013538b62d86f6a09efdf2cd78babac2072484 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableViewer.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableViewer.java
index 129fdcd25..db08e6b04 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableViewer.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableViewer.java
@@ -16,6 +16,7 @@
package org.fortiss.tooling.common.ui.javafx.control.treetableview;
import static java.lang.Integer.MAX_VALUE;
+import static javafx.scene.control.cell.CheckBoxTreeTableCell.forTreeTableColumn;
import java.util.Collection;
import java.util.function.Supplier;
@@ -28,7 +29,6 @@ import javafx.scene.control.TreeTableColumn;
import javafx.scene.control.TreeTableRow;
import javafx.scene.control.TreeTableView;
import javafx.scene.control.TreeTableView.TreeTableViewSelectionModel;
-import javafx.scene.control.cell.CheckBoxTreeTableCell;
import javafx.scene.input.TransferMode;
import javafx.util.Callback;
@@ -42,6 +42,8 @@ import javafx.util.Callback;
* a column is removed the index provided to the label provider might not be correct anymore.
* <P>
* Furthermore, the selection model is currently fixed to be row selection.
+ *
+ * @author hoelzl
*/
public final class DynamicTreeTableViewer<T> extends DynamicTreeViewerBase<T> {
/** The {@link TreeTableView} control to be managed. */
@@ -128,7 +130,7 @@ public final class DynamicTreeTableViewer<T> extends DynamicTreeViewerBase<T> {
});
rootItem.update();
- // expand to reveal (+1 if root node is not shown
+ // expand to reveal (+1 if root node is not shown)
expandItem(rootItem, showRoot ? revealLevel : revealLevel + 1);
}
@@ -197,12 +199,13 @@ public final class DynamicTreeTableViewer<T> extends DynamicTreeViewerBase<T> {
int num = view.getColumns().size();
TreeTableColumn<T, Boolean> column = new TreeTableColumn<>(headerLabel);
column.setPrefWidth(prefWidth);
- column.setCellFactory(CheckBoxTreeTableCell.forTreeTableColumn(column));
+ column.setCellFactory(forTreeTableColumn(column));
uiProvider.applyToCheckboxColumn(num, column);
view.getColumns().add(column);
return column;
}
+ // TODO (SB): Remove this deprecated method since it is only referenced in the "DSE playground"?
/**
* Adds a column to the table part of the view. The labels, context menus and icons are shown as
* defined in the {@link DynamicTreeTableUIProviderBase}.
--
GitLab