functional/ControlsTests/src/javafx/scene/control/test/treeview/TreeViewNewApp.java

@@ -31,10 +31,12 @@
 import javafx.event.EventHandler;
 import javafx.geometry.Orientation;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.test.treetable.ResetButtonNames;
+import static javafx.scene.control.test.treetable.ResetButtonNames.HARD_RESET_BUTTON_ID;

+import static javafx.scene.control.test.treetable.ResetButtonNames.SOFT_RESET_BUTTON_ID;

 import static javafx.scene.control.test.treeview.TreeViewConstants.ROOT_NAME;
 import javafx.scene.control.test.utils.CommonPropertiesScene;
 import javafx.scene.control.test.utils.ptables.NodeControllerFactory;
 import javafx.scene.control.test.utils.ptables.NodeControllerFactory.NodesStorage;
 import javafx.scene.control.test.utils.ptables.PropertiesTable;

@@ -129,21 +131,23 @@
             tb.addCounter(EDIT_CANCEL_COUNTER);
 
             tabPane = new TabPaneWithControl("TreeView", tb);
             getControlOverItem(ROOT_NAME);
 
-            Button hardResetButton = ButtonBuilder.create().id(HARD_RESET_BUTTON_ID).text("Hard reset").build();
+            Button hardResetButton = new Button("Hard reset");

+            hardResetButton.setId(HARD_RESET_BUTTON_ID);

             hardResetButton.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     HBox hb = (HBox) getRoot();
                     hb.getChildren().clear();
                     prepareMainSceneStructure();
                     prepareScene();
                 }
             });
 
-            Button softResetButton = ButtonBuilder.create().id(SOFT_RESET_BUTTON_ID).text("Soft reset").build();
+            Button softResetButton = new Button("Soft reset");

+            softResetButton.setId(SOFT_RESET_BUTTON_ID);

             softResetButton.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     refreshProcedure(2);
                     testedControl.getRoot().setValue(ROOT_NAME);
                     TreeItem someNewOneTreeItem = new TreeItem();

@@ -401,12 +405,15 @@
             return vb;
         }
 
         private HBox getScrollToHBox() {
             HBox hb = new HBox();
-            Button button = ButtonBuilder.create().text("ScrollTo").id(SCROLL_TO_BUTTON_ID).build();
-            final TextField tf = TextFieldBuilder.create().text("0").id(SCROLL_TO_TEXT_FIELD_ID).prefWidth(50).build();
+            Button button = new Button("ScrollTo");

+            button.setId(SCROLL_TO_BUTTON_ID);

+            final TextField tf = new TextField("0");

+            tf.setId(SCROLL_TO_TEXT_FIELD_ID);

+            tf.setPrefWidth(50);

 
             button.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     testedControl.scrollTo(Integer.parseInt(tf.getText()));
                 }

@@ -416,12 +423,16 @@
             return hb;
         }
 
         private HBox getEditHBox() {
             HBox hb = new HBox();
-            Button button = ButtonBuilder.create().text("Edit").id(EDIT_BUTTON_ID).build();
-            final TextField tf = TextFieldBuilder.create().promptText("name").id(EDIT_TEXT_FIELD_ID).prefWidth(50).build();
+            Button button = new Button("Edit");

+            button.setId(EDIT_BUTTON_ID);

+            final TextField tf = new TextField();

+            tf.setPromptText("name");

+            tf.setId(EDIT_TEXT_FIELD_ID);

+            tf.setPrefWidth(50);

 
             button.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     testedControl.edit(searchTreeItem(tf.getText()));
                 }

@@ -432,15 +443,12 @@
         }
 
         private VBox setEventHandlersHBox() {
             VBox vb = new VBox();
 
-            Button btn = ButtonBuilder.create()
-                    .text("Set onEdit event hadlers")
-                    .id(BTN_SET_ON_EDIT_EVENT_HANDLERS)
-                    .build();
-
+            Button btn = new Button("Set onEdit event hadlers");

+            btn.setId(BTN_SET_ON_EDIT_EVENT_HANDLERS);

             btn.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     testedControl.setOnEditStart(new EventHandler() {
                         public void handle(Event t) {
                             tb.incrementCounter(EDIT_START_COUNTER);

@@ -459,15 +467,12 @@
                         }
                     });
                 }
             });
 
-            Button btnAddFactory = ButtonBuilder.create()
-                    .text("Set cell factory for editing")
-                    .id(SET_CELL_FACTORY_FOR_EDITING)
-                    .build();
-
+            Button btnAddFactory = new Button("Set cell factory for editing");

+            btnAddFactory.setId(SET_CELL_FACTORY_FOR_EDITING);

             btnAddFactory.setOnAction(new EventHandler<ActionEvent>() {
                 public void handle(ActionEvent t) {
                     testedControl.setCellFactory(new Callback<TreeView<String>, TreeCell<String>>() {
                         @Override
                         public TreeCell<String> call(TreeView<String> p) {