Skip to content

Commit 92b71ca

Browse files
committed
Handle selection reset
1 parent 60b6ca2 commit 92b71ca

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/DesignerUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ public static Optional<String> stackTraceToXPath(Throwable e) {
307307

308308

309309
public static RelatedNodesSelector getDefaultRelatedNodesSelector() {
310-
return node -> node instanceof ScopedNode ? getNameOccurrences((ScopedNode) node) : Collections.emptyList();
310+
return node -> node instanceof ScopedNode ? getNameOccurrences((ScopedNode) node)
311+
: Collections.emptyList();
311312
}
312313

313314
private static List<Node> getNameOccurrences(ScopedNode node) {

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/NodeEditionCodeArea.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,11 @@ public void setFocusNode(final Node node, DataHolder options) {
315315
// editor is only restyled if the selection has changed
316316
Platform.runLater(() -> styleNodes(node == null ? emptyList() : singleton(node), StyleLayerIds.FOCUS, true));
317317

318-
Platform.runLater(() -> relatedNodesSelector.ifPresent(selector -> {
319-
List<Node> nodes = selector.getHighlightedNodesWhenSelecting(node);
320-
highlightRelatedNodes(Objects.requireNonNull(nodes,
321-
"RelatedNodesSelection for language "
322-
+ globalLanguageProperty().getValue().getName()
323-
+ " returned null"));
324-
}));
318+
if (node == null) {
319+
highlightRelatedNodes(emptyList());
320+
} else {
321+
Platform.runLater(() -> highlightRelatedNodes(relatedNodesSelector.getValue().getHighlightedNodesWhenSelecting(node)));
322+
}
325323
}
326324

327325

0 commit comments

Comments
 (0)