Commits

Anonymous committed a9c2066

Fixing TableColumn / TreeTableColumn NPEs that cause the build to fail due to junit tests.

Comments (0)

Files changed (2)

javafx-ui-controls/src/javafx/scene/control/TableColumn.java

         new SimpleObjectProperty<Callback<TableColumn<S,T>, TableCell<S,T>>>(
             this, "cellFactory", (Callback<TableColumn<S,T>, TableCell<S,T>>) ((Callback) DEFAULT_CELL_FACTORY)) {
                 @Override protected void invalidated() {
-                    Map properties = getTableView().getProperties();
+                    TableView table = getTableView();
+                    if (table == null) return;
+                    Map properties = table.getProperties();
                     if (properties.containsKey(TableViewSkinBase.RECREATE)) {
                         properties.remove(TableViewSkinBase.RECREATE);
                     }

javafx-ui-controls/src/javafx/scene/control/TreeTableColumn.java

         new SimpleObjectProperty<Callback<TreeTableColumn<S,T>, TreeTableCell<S,T>>>(
             this, "cellFactory", (Callback<TreeTableColumn<S,T>, TreeTableCell<S,T>>) ((Callback) DEFAULT_CELL_FACTORY)) {
                 @Override protected void invalidated() {
-                    Map properties = getTreeTableView().getProperties();
+                    TreeTableView table = getTreeTableView();
+                    if (table == null) return;
+                    Map properties = table.getProperties();
                     if (properties.containsKey(TableViewSkinBase.RECREATE)) {
                         properties.remove(TableViewSkinBase.RECREATE);
                     }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.