# HG changeset patch # User andrey.rusakov@oracle.com # Date 1464002933 -10800 # Mon May 23 14:28:53 2016 +0300 # Node ID 96f1a413f81ec591ee38e2733fba65de97eb24fc # Parent 45f42124f7b4b15820a87684efad4b3ccc71865d 8088078: [Chart] "Insert Series" can not work as expected after we remove all data summary: Fixed error while adding new series to empty table or when no series selected. diff --git a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/XYDataVisualizer.java b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/XYDataVisualizer.java --- a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/XYDataVisualizer.java +++ b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/XYDataVisualizer.java @@ -198,7 +198,9 @@ while (node != null && !(node instanceof TreeTableRow) && !(node instanceof TreeTableCell)) { node = node.getParent(); } - if (node instanceof TreeTableCell) { + if (node == null) { + getSelectionModel().clearSelection(); + } else if (node instanceof TreeTableCell) { TreeTableCell tc = (TreeTableCell) node; if (tc.getItem() == null) { getSelectionModel().clearSelection(); @@ -237,10 +239,8 @@ insertSeriesMenuitem.setDisable(!isEditable()); insertSeriesMenuitem.setOnAction((ActionEvent t) -> { TreeItem> selectedItem = getSelectionModel().getSelectedItem(); - if (selectedItem == null) { - return; - } - Object value = selectedItem.getValue().getValue(); + Object value = selectedItem == null ? chart.getData() + : selectedItem.getValue().getValue(); if (value instanceof ObservableList) { ObservableList parentList = (ObservableList) value; insertSeries(parentList.size(), parentList);