phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parent highlighting

Browse Source
This commit is contained in:
Clément Fournier 2019-02-21 14:23:39 +01:00
parent fc48f93e92
commit 99e8924198
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/AstTreeView.java
View File

@ -9,12 +9,10 @@ import static net.sourceforge.pmd.util.fxdesigner.util.DesignerIteratorUtil.pare
import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import org.reactfx.EventSource;
import org.reactfx.EventStreams;
import org.reactfx.SuspendableEventStream;
import org.reactfx.value.Var;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
@ -33,7 +31,6 @@ import javafx.scene.control.TreeView;
public class AstTreeView extends TreeView<Node> implements NodeSelectionSource {
private final Var<Consumer<Node>> onNodeClickedHandler = Var.newSimpleVar(n -> {});
private final TreeViewWrapper<Node> myWrapper = new TreeViewWrapper<>(this);
private ASTTreeItem selectedTreeItem;
@ -49,6 +46,10 @@ public class AstTreeView extends TreeView<Node> implements NodeSelectionSource {
initNodeSelectionHandling(root, selectionEvents, false);
// this needs to be done even if the selection originates from this node
EventStreams.changesOf(getSelectionModel().selectedItemProperty())
.subscribe(item -> highlightFocusNodeParents((ASTTreeItem) item.getOldValue(), (ASTTreeItem) item.getNewValue()));
// push a node selection event whenever...
// * The selection changes
EventStreams.valuesOf(getSelectionModel().selectedItemProperty())
@ -90,8 +91,6 @@ public class AstTreeView extends TreeView<Node> implements NodeSelectionSource {
selectionEvents.suspendWhile(() -> selectionModel.select(found));
}
highlightFocusNodeParents(selectedTreeItem, found);
selectedTreeItem = found;
getFocusModel().focus(selectionModel.getSelectedIndex());
@ -135,11 +134,6 @@ public class AstTreeView extends TreeView<Node> implements NodeSelectionSource {
}
public Var<Consumer<Node>> onNodeClickedHandlerProperty() {
return onNodeClickedHandler;
}
@Override
public DesignerRoot getDesignerRoot() {
return designerRoot;