From 50ffe8aab6a3e9514419490b3f946814fee4217d Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Thu, 12 Mar 2015 00:20:11 -0500 Subject: [PATCH] Hooked up the Cancellation button, because sometimes in the future things actually work. --- .../jace/config/ConfigurationUIController.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/jace/config/ConfigurationUIController.java b/src/main/java/jace/config/ConfigurationUIController.java index 1509fd2..99c0ac2 100644 --- a/src/main/java/jace/config/ConfigurationUIController.java +++ b/src/main/java/jace/config/ConfigurationUIController.java @@ -15,7 +15,6 @@ import java.util.regex.Pattern; import javafx.beans.Observable; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Node; import javafx.scene.control.CheckBox; @@ -74,7 +73,8 @@ public class ConfigurationUIController { @FXML void cancelConfig(MouseEvent event) { - throw new RuntimeException("Not implemented yet"); + Configuration.buildTree(); + resetDeviceTree(); } @FXML @@ -100,13 +100,11 @@ public class ConfigurationUIController { private void getExpandedNodes(String prefix, TreeItem root, Set expanded) { if (root == null) return; - for (TreeItem item : root.getChildren()) { - if (item.isExpanded()) { - String name = prefix+item.toString(); - expanded.add(name); - getExpandedNodes(name+DELIMITER, item, expanded); - } - } + root.getChildren().stream().filter((item) -> (item.isExpanded())).forEach((item) -> { + String name = prefix+item.toString(); + expanded.add(name); + getExpandedNodes(name+DELIMITER, item, expanded); + }); } private void setExpandedNodes(String prefix, TreeItem root, Set expanded) {