1
0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00

Merge pull request #1713 from millmanorama/develop

fix NPE caused by faulty reordering of steps in constructor
This commit is contained in:
Richard Cordovano
2015-11-12 09:55:29 -05:00

View File

@@ -111,7 +111,6 @@ public class DetailViewPane extends AbstractVisualizationPane<DateTime, EventClu
public DetailViewPane(TimeLineController controller, Pane partPane, Pane contextPane, Region bottomLeftSpacer) {
super(controller, partPane, contextPane, bottomLeftSpacer);
settingsNodes = new ArrayList<>(new DetailViewSettingsPane().getChildrenUnmodifiable());
//initialize chart;
chart = new EventDetailsChart(controller, dateAxis, verticalAxis, selectedNodes);
@@ -119,6 +118,8 @@ public class DetailViewPane extends AbstractVisualizationPane<DateTime, EventClu
chart.setData(dataSets);
setCenter(chart);
settingsNodes = new ArrayList<>(new DetailViewSettingsPane().getChildrenUnmodifiable());
//bind layout fo axes and spacers
dateAxis.setTickLabelGap(0);
dateAxis.setAutoRanging(false);
@@ -398,7 +399,7 @@ public class DetailViewPane extends AbstractVisualizationPane<DateTime, EventClu
private SeparatorMenuItem descVisibilitySeparatorMenuItem;
DetailViewSettingsPane() {
FXMLConstructor.construct(this, "DetailViewSettingsPane.fxml"); // NON-NLS
FXMLConstructor.construct(DetailViewSettingsPane.this, "DetailViewSettingsPane.fxml"); // NON-NLS
}
@FXML