--- old/./build.xml 2017-02-15 15:57:34.959250085 +0300
+++ new/./build.xml 2017-02-15 15:57:34.875249303 +0300
@@ -1,5 +1,5 @@
-
+
+
+
@@ -63,9 +63,9 @@
-
+
--- old/./detect_javafx.xml 2017-02-15 15:57:35.195252284 +0300
+++ new/./detect_javafx.xml 2017-02-15 15:57:35.139251762 +0300
@@ -9,24 +9,21 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
\ No newline at end of file
+
--- old/functional/ControlsTests/build.xml 2017-02-15 15:57:35.495255079 +0300
+++ new/functional/ControlsTests/build.xml 2017-02-15 15:57:35.383254035 +0300
@@ -1,5 +1,5 @@
-
Builds, tests, and runs the project ControlsTests.
-
+
-
+
-
+
@@ -48,7 +48,7 @@
-
+
Must set test.subdir with short name of root dir of tests; eg ListView
@@ -58,8 +58,8 @@
-
-
+
+
@@ -68,15 +68,15 @@
-
-
+
+
-
+
@@ -89,18 +89,18 @@
-
-
+
+
-
-
+
+
-
+
--- old/functional/ControlsTests/coverage.fcov 2017-02-15 15:57:35.715257128 +0300
+++ new/functional/ControlsTests/coverage.fcov 2017-02-15 15:57:35.663256644 +0300
@@ -1,96 +1,96 @@
-javafx.scene.control.ScrollPane.prefViewportWidth.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortWidthOptionTest();FULL
-javafx.scene.control.ColorPicker.value.GET;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
-com.sun.javafx.scene.control.Pagination.currentpageindex.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
-com.sun.javafx.scene.control.Pagination.pageindicatorcount.GET;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
-javafx.scene.control.Button.cancelButton.SET;javafx.scene.control.test.ButtonsTest.cancelButtonTest();FULL
-javafx.scene.control.Button.text.GET;javafx.scene.control.test.ButtonsTest.binding();FULL
-javafx.scene.control.MenuItem.onHidden.GET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-com.sun.javafx.scene.control.Pagination.pageindicatorcount.BIND;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
-javafx.scene.control.Button.defaultButton.BIND;javafx.scene.control.test.ButtonsTest.defaultButtonTest();FULL
-javafx.scene.control.ScrollPane.hmin.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMinOptionTest();FULL
-javafx.scene.control.Button.cancelButton.GET;javafx.scene.control.test.ButtonsTest.cancelButtonTest();FULL
-javafx.scene.control.MenuItem.onHidden.SET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-javafx.scene.control.CheckBox.indeterminate.SET;javafx.scene.control.test.ChecksTest.checks();FULL
-javafx.scene.control.CheckBox.selected.GET;javafx.scene.control.test.tableview.TableViewApp.getControlsContainer(),javafx.scene.control.test.ChecksTest.checks();FULL
-javafx.scene.control.Button.text.SET;javafx.scene.control.test.ButtonsTest.binding();FULL
-javafx.scene.control.Tooltip.activated.GET;javafx.scene.control.test.TooltipTest.enabled();FULL
-javafx.scene.control.ChoiceBox.showing.BIND;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-javafx.scene.control.SingleSelectionModel.selectedItem.BIND;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-javafx.scene.control.ChoiceBox.showing.GET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-com.sun.javafx.scene.control.Pagination.currentpageindex.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
-javafx.scene.control.ColorPicker.value.SET;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
-javafx.scene.control.ColorPicker.value.DEFAULT;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
-javafx.scene.control.CheckBox.indeterminate.GET;javafx.scene.control.test.ChecksTest.checks();FULL
-javafx.scene.control.CheckBox.selected.SET;javafx.scene.control.test.tableview.TableViewApp.getControlsContainer(),javafx.scene.control.test.ChecksTest.checks();FULL
-javafx.scene.control.MenuItem.onHiding.SET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-javafx.scene.control.ScrollPane.vbarPolicy.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
-javafx.scene.control.ScrollPane.fitToWidth.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
-javafx.scene.control.Tooltip.activated.SET;javafx.scene.control.test.TooltipTest.enabled();FULL
-javafx.scene.control.ScrollPane.pannable.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPannableOptionTest();FULL
-com.sun.javafx.scene.control.Pagination.pagecount.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
-javafx.scene.control.CheckMenuItem.selected.SET;javafx.scene.control.test.tableview.TableViewApp.createColumn();FULL
-javafx.scene.control.ScrollPane.vmin.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMinOptionTest();FULL
-javafx.scene.control.SingleSelectionModel.selectedItem.GET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-com.sun.javafx.scene.control.Pagination.currentpageindex.BIND;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
-javafx.scene.control.SingleSelectionModel.selectedItem.SET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-javafx.scene.control.MenuItem.onHiding.GET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-TreeView.onEditStartProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditStartCancel();FULL
-TreeView.onEditCommitProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
-com.sun.javafx.scene.control.Pagination.pagefactory.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
-com.sun.javafx.scene.control.Pagination.pagecount.BIND;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
-javafx.scene.control.ScrollPane.prefViewportWidth.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortWidthOptionTest();FULL
-com.sun.javafx.scene.control.Pagination.pagecount.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
-javafx.scene.control.ScrollPane.prefViewportHeight.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortHeightOptionTest();FULL
-javafx.scene.control.MenuItem.disable.SET;javafx.scene.control.test.MenuItemTest.disableTest();FULL
-TreeView.onEditStartProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
-TreeView.onEditCommitProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditCommit();FULL
-javafx.scene.control.CheckMenuItem.selected.GET;javafx.scene.control.test.tableview.TableViewApp.createColumn();FULL
-javafx.scene.control.ScrollPane.fitToHeight.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
-javafx.scene.control.ScrollPane.hbarPolicy.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
-javafx.scene.control.MenuItem.visible.BIND;javafx.scene.control.test.MenuItemTest.visibleTest();FULL
-javafx.scene.control.ScrollPane.hmax.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMaxOptionTest();FULL
-javafx.scene.control.ScrollPane.vmax.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMaxOptionTest();FULL
-javafx.scene.control.ScrollPane.prefViewportHeight.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortHeightOptionTest();FULL
-javafx.scene.control.ScrollPane.hmin.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMinOptionTest();FULL
-javafx.scene.control.MenuItem.disable.GET;javafx.scene.control.test.MenuItemTest.disableTest();FULL
-javafx.scene.control.MenuItem.onHidden.BIND;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-javafx.scene.control.MenuItem.disable.BIND;javafx.scene.control.test.MenuItemTest.disableTest();FULL
-javafx.scene.control.ScrollPane.viewportBounds.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.boundsTest();FULL
-TreeView.onEditCancelProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
-javafx.scene.control.ScrollPane.pannable.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPannableOptionTest();FULL
-javafx.scene.control.ScrollPane.hbarPolicy.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
-javafx.scene.control.ColorPicker.value.BIND;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
-com.sun.javafx.scene.control.Pagination.pagefactory.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
-javafx.scene.control.ListView.selectionModel.SET;javafx.scene.control.test.ListView.ListViewApp.getTestContainer();FULL
-com.sun.javafx.scene.control.Pagination.currentpageindex.SET;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
-javafx.scene.control.ScrollPane.vbarPolicy.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
-javafx.scene.control.ListView.selectionModel.GET;javafx.scene.control.test.ListView.ListViewApp.getTestContainer();FULL
-javafx.scene.control.MenuItem.visible.SET;javafx.scene.control.test.MenuItemTest.visibleTest();FULL
-javafx.scene.control.ScrollPane.fitToWidth.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
-javafx.scene.control.Button.cancelButton.BIND;javafx.scene.control.test.ButtonsTest.cancelButtonTest();FULL
-javafx.scene.control.CheckBox.selected.DEFAULT;javafx.scene.control.test.ChecksTest.checks();FULL
-javafx.scene.control.ChoiceBox.showing.DEFAULT;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-javafx.scene.control.MenuItem.visible.GET;javafx.scene.control.test.MenuItemTest.visibleTest();FULL
-com.sun.javafx.scene.control.Pagination.currentpageindex.GET;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
-TreeView.onEditCancelProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditStartCancel();FULL
-javafx.scene.control.ChoiceBox.showing.SET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
-com.sun.javafx.scene.control.Pagination.pagecount.GET;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
-javafx.scene.control.Button.defaultButton.GET;javafx.scene.control.test.ButtonsTest.defaultButtonTest();FULL
-javafx.scene.control.MenuItem.onHiding.BIND;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest();FULL
-com.sun.javafx.scene.control.Pagination.pageindicatorcounts.SET;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
-javafx.scene.control.ScrollPane.vmax.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMaxOptionTest();FULL
-com.sun.javafx.scene.control.Pagination.pageindicatorcount.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
-javafx.scene.control.CheckBox.indeterminate.DEFAULT;javafx.scene.control.test.ChecksTest.checks();FULL
-com.sun.javafx.scene.control.Pagination.pagecount.SET;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
-com.sun.javafx.scene.control.Pagination.pagefactory.GET;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
-javafx.scene.control.Button.defaultButton.SET;javafx.scene.control.test.ButtonsTest.defaultButtonTest();FULL
-javafx.scene.control.Button.cancelButton.DEFAULT;javafx.scene.control.test.ButtonsTest.cancelButtonTest();FULL
-javafx.scene.control.Button.defaultButton.DEFAULT;javafx.scene.control.test.ButtonsTest.defaultButtonTest();FULL
-javafx.scene.control.Button.text.BIND;javafx.scene.control.test.ButtonsTest.binding();FULL
-com.sun.javafx.scene.control.Pagination.pageindicatorcount.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
-javafx.scene.control.Button.text.DEFAULT;javafx.scene.control.test.ButtonsTest.binding();FULL
-javafx.scene.control.ScrollPane.hmax.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMaxOptionTest();FULL
-javafx.scene.control.ScrollPane.fitToHeight.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
-javafx.scene.control.ScrollPane.vmin.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMinOptionTest();FULL
-javafx.scene.control.ColorPicker.value.BEHAVIOR;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
-com.sun.javafx.scene.control.Pagination.pagefactory.SET;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
+javafx.scene.control.ScrollPane.prefViewportWidth.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortWidthOptionTest(),javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkMinViewPortWidthSetTest();FULL
+javafx.scene.control.ColorPicker.value.GET;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
+com.sun.javafx.scene.control.Pagination.currentpageindex.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
+com.sun.javafx.scene.control.Pagination.pageindicatorcount.GET;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
+javafx.scene.control.Button.cancelButton.SET;javafx.scene.control.test.ButtonsTest.cancelButtonTest(),javafx.scene.control.test.mix.ButtonsTest.cancelButtonTest();FULL
+javafx.scene.control.Button.text.GET;javafx.scene.control.test.ButtonsTest.binding(),javafx.scene.control.test.mix.ButtonsTest.binding();FULL
+javafx.scene.control.MenuItem.onHidden.GET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+com.sun.javafx.scene.control.Pagination.pageindicatorcount.BIND;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
+javafx.scene.control.Button.defaultButton.BIND;javafx.scene.control.test.ButtonsTest.defaultButtonTest(),javafx.scene.control.test.mix.ButtonsTest.defaultButtonTest();FULL
+javafx.scene.control.ScrollPane.hmin.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMinOptionTest();FULL
+javafx.scene.control.Button.cancelButton.GET;javafx.scene.control.test.ButtonsTest.cancelButtonTest(),javafx.scene.control.test.mix.ButtonsTest.cancelButtonTest();FULL
+javafx.scene.control.MenuItem.onHidden.SET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+javafx.scene.control.CheckBox.indeterminate.SET;javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+javafx.scene.control.CheckBox.selected.GET;javafx.scene.control.test.tableview.TableViewApp.getControlsContainer(),javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+javafx.scene.control.Button.text.SET;javafx.scene.control.test.ButtonsTest.binding(),javafx.scene.control.test.mix.ButtonsTest.binding();FULL
+javafx.scene.control.Tooltip.activated.GET;javafx.scene.control.test.TooltipTest.enabled(),javafx.scene.control.test.mix.TooltipTest.enabled();FULL
+javafx.scene.control.ChoiceBox.showing.BIND;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+javafx.scene.control.SingleSelectionModel.selectedItem.BIND;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+javafx.scene.control.ChoiceBox.showing.GET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+com.sun.javafx.scene.control.Pagination.currentpageindex.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
+javafx.scene.control.ColorPicker.value.SET;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
+javafx.scene.control.ColorPicker.value.DEFAULT;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
+javafx.scene.control.CheckBox.indeterminate.GET;javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+javafx.scene.control.CheckBox.selected.SET;javafx.scene.control.test.tableview.TableViewApp.getControlsContainer(),javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+javafx.scene.control.MenuItem.onHiding.SET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+javafx.scene.control.ScrollPane.vbarPolicy.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
+javafx.scene.control.ScrollPane.fitToWidth.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
+javafx.scene.control.Tooltip.activated.SET;javafx.scene.control.test.TooltipTest.enabled(),javafx.scene.control.test.mix.TooltipTest.enabled();FULL
+javafx.scene.control.ScrollPane.pannable.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPannableOptionTest();FULL
+com.sun.javafx.scene.control.Pagination.pagecount.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
+javafx.scene.control.CheckMenuItem.selected.SET;javafx.scene.control.test.tableview.TableViewApp.createColumn();FULL
+javafx.scene.control.ScrollPane.vmin.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMinOptionTest();FULL
+javafx.scene.control.SingleSelectionModel.selectedItem.GET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+com.sun.javafx.scene.control.Pagination.currentpageindex.BIND;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
+javafx.scene.control.SingleSelectionModel.selectedItem.SET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+javafx.scene.control.MenuItem.onHiding.GET;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+TreeView.onEditStartProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditStartCancel();FULL
+TreeView.onEditCommitProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
+com.sun.javafx.scene.control.Pagination.pagefactory.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
+com.sun.javafx.scene.control.Pagination.pagecount.BIND;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
+javafx.scene.control.ScrollPane.prefViewportWidth.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortWidthOptionTest(),javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkMinViewPortWidthSetTest();FULL
+com.sun.javafx.scene.control.Pagination.pagecount.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
+javafx.scene.control.ScrollPane.prefViewportHeight.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortHeightOptionTest();FULL
+javafx.scene.control.MenuItem.disable.SET;javafx.scene.control.test.MenuItemTest.disableTest(),javafx.scene.control.test.mix.MenuItemTest.disableTest();FULL
+TreeView.onEditStartProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
+TreeView.onEditCommitProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditCommit();FULL
+javafx.scene.control.CheckMenuItem.selected.GET;javafx.scene.control.test.tableview.TableViewApp.createColumn();FULL
+javafx.scene.control.ScrollPane.fitToHeight.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
+javafx.scene.control.ScrollPane.hbarPolicy.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
+javafx.scene.control.MenuItem.visible.BIND;javafx.scene.control.test.MenuItemTest.visibleTest(),javafx.scene.control.test.mix.MenuItemTest.visibleTest();FULL
+javafx.scene.control.ScrollPane.hmax.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMaxOptionTest();FULL
+javafx.scene.control.ScrollPane.vmax.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMaxOptionTest();FULL
+javafx.scene.control.ScrollPane.prefViewportHeight.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPrefViewPortHeightOptionTest();FULL
+javafx.scene.control.ScrollPane.hmin.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMinOptionTest();FULL
+javafx.scene.control.MenuItem.disable.GET;javafx.scene.control.test.MenuItemTest.disableTest(),javafx.scene.control.test.mix.MenuItemTest.disableTest();FULL
+javafx.scene.control.MenuItem.onHidden.BIND;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+javafx.scene.control.MenuItem.disable.BIND;javafx.scene.control.test.MenuItemTest.disableTest(),javafx.scene.control.test.mix.MenuItemTest.disableTest();FULL
+javafx.scene.control.ScrollPane.viewportBounds.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.boundsTest();FULL
+TreeView.onEditCancelProperty.GET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditOnCancelEventSequence();FULL
+javafx.scene.control.ScrollPane.pannable.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkPannableOptionTest();FULL
+javafx.scene.control.ScrollPane.hbarPolicy.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
+javafx.scene.control.ColorPicker.value.BIND;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
+com.sun.javafx.scene.control.Pagination.pagefactory.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
+javafx.scene.control.ListView.selectionModel.SET;javafx.scene.control.test.ListView.ListViewApp.getTestContainer();FULL
+com.sun.javafx.scene.control.Pagination.currentpageindex.SET;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
+javafx.scene.control.ScrollPane.vbarPolicy.GET;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHVBarPolicyOptionTest();FULL
+javafx.scene.control.ListView.selectionModel.GET;javafx.scene.control.test.ListView.ListViewApp.getTestContainer();FULL
+javafx.scene.control.MenuItem.visible.SET;javafx.scene.control.test.MenuItemTest.visibleTest(),javafx.scene.control.test.mix.MenuItemTest.visibleTest();FULL
+javafx.scene.control.ScrollPane.fitToWidth.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
+javafx.scene.control.Button.cancelButton.BIND;javafx.scene.control.test.ButtonsTest.cancelButtonTest(),javafx.scene.control.test.mix.ButtonsTest.cancelButtonTest();FULL
+javafx.scene.control.CheckBox.selected.DEFAULT;javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+javafx.scene.control.ChoiceBox.showing.DEFAULT;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+javafx.scene.control.MenuItem.visible.GET;javafx.scene.control.test.MenuItemTest.visibleTest(),javafx.scene.control.test.mix.MenuItemTest.visibleTest();FULL
+com.sun.javafx.scene.control.Pagination.currentpageindex.GET;javafx.scene.control.test.pagination.PaginationTest.currentPageIndexPropertyTest();FULL
+TreeView.onEditCancelProperty.SET;javafx.scene.control.test.treeview.TreeViewTest.testOnEditStartCancel();FULL
+javafx.scene.control.ChoiceBox.showing.SET;javafx.scene.control.test.choicebox.ChoiceBoxApp.getScene();FULL
+com.sun.javafx.scene.control.Pagination.pagecount.GET;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
+javafx.scene.control.Button.defaultButton.GET;javafx.scene.control.test.ButtonsTest.defaultButtonTest(),javafx.scene.control.test.mix.ButtonsTest.defaultButtonTest();FULL
+javafx.scene.control.MenuItem.onHiding.BIND;javafx.scene.control.test.MenuTest.apiTest(),javafx.scene.control.test.MenuTest.dropTest(),javafx.scene.control.test.mix.MenuTest.apiTest(),javafx.scene.control.test.mix.MenuTest.dropTest();FULL
+com.sun.javafx.scene.control.Pagination.pageindicatorcounts.SET;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
+javafx.scene.control.ScrollPane.vmax.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMaxOptionTest();FULL
+com.sun.javafx.scene.control.Pagination.pageindicatorcount.BEHAVIOR;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
+javafx.scene.control.CheckBox.indeterminate.DEFAULT;javafx.scene.control.test.ChecksTest.checks(),javafx.scene.control.test.mix.ChecksTest.checks();FULL
+com.sun.javafx.scene.control.Pagination.pagecount.SET;javafx.scene.control.test.pagination.PaginationTest.pageCountPropertyTest();FULL
+com.sun.javafx.scene.control.Pagination.pagefactory.GET;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
+javafx.scene.control.Button.defaultButton.SET;javafx.scene.control.test.ButtonsTest.defaultButtonTest(),javafx.scene.control.test.mix.ButtonsTest.defaultButtonTest();FULL
+javafx.scene.control.Button.cancelButton.DEFAULT;javafx.scene.control.test.ButtonsTest.cancelButtonTest(),javafx.scene.control.test.mix.ButtonsTest.cancelButtonTest();FULL
+javafx.scene.control.Button.defaultButton.DEFAULT;javafx.scene.control.test.ButtonsTest.defaultButtonTest(),javafx.scene.control.test.mix.ButtonsTest.defaultButtonTest();FULL
+javafx.scene.control.Button.text.BIND;javafx.scene.control.test.ButtonsTest.binding(),javafx.scene.control.test.mix.ButtonsTest.binding();FULL
+com.sun.javafx.scene.control.Pagination.pageindicatorcount.DEFAULT;javafx.scene.control.test.pagination.PaginationTest.pageIndicatorCountTest();FULL
+javafx.scene.control.Button.text.DEFAULT;javafx.scene.control.test.ButtonsTest.binding(),javafx.scene.control.test.mix.ButtonsTest.binding();FULL
+javafx.scene.control.ScrollPane.hmax.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkHMaxOptionTest();FULL
+javafx.scene.control.ScrollPane.fitToHeight.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkFitToWidthAndHeightOptionTest();FULL
+javafx.scene.control.ScrollPane.vmin.DEFAULT;javafx.scene.control.test.ScrollPane.ScrollPaneTest.checkVMinOptionTest();FULL
+javafx.scene.control.ColorPicker.value.BEHAVIOR;javafx.scene.control.test.colorpicker.ColorPickerTest.colorPropertyTest();FULL
+com.sun.javafx.scene.control.Pagination.pagefactory.SET;javafx.scene.control.test.pagination.PaginationTest.factoryChangingTest();FULL
--- old/functional/ControlsTests/nbproject/project.properties 2017-02-15 15:57:35.943259252 +0300
+++ new/functional/ControlsTests/nbproject/project.properties 2017-02-15 15:57:35.891258768 +0300
@@ -25,7 +25,7 @@
file.reference.JemmyFX.jar=../../tools/Jemmy/JemmyFX/dist/JemmyFX.jar
file.reference.JemmyFXBrowser.jar=../../tools/Jemmy/JemmyFXBrowser/dist/JemmyFXBrowser.jar
file.reference.JemmySWT.jar=../../tools/lib/JemmySWT.jar
-file.reference.jfxswt.jar=${java.home}/lib/jfxswt.jar
+file.reference.jfxswt.jar=${java.home}/lib/javafx-swt.jar
build.test.results.dir=${external.output}/${application.title}/build/test/results
file.reference.junit.jar=../../tools/Jemmy/jemmy_core/junit.jar
file.reference.SharedTestUtilsOpen.jar=../../tools/SharedTestUtilsOpen/dist/SharedTestUtilsOpen.jar
--- old/functional/ControlsTests/src/javafx/commons/ControlChooserApp.java 2017-02-15 15:57:36.175261414 +0300
+++ new/functional/ControlsTests/src/javafx/commons/ControlChooserApp.java 2017-02-15 15:57:36.119260892 +0300
@@ -39,9 +39,7 @@
import javafx.scene.control.test.utils.ptables.PropertiesTable;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
-import javafx.scene.layout.PaneBuilder;
import javafx.scene.layout.VBox;
-import javafx.scene.layout.VBoxBuilder;
import test.javaclient.shared.InteroperabilityApp;
import test.javaclient.shared.Utils;
@@ -55,9 +53,7 @@
private VBox spaceForNode;
private PropertiesTable propertiesTable;
- private Pane propertiesPane = PaneBuilder.create()
- .style("-fx-border-color:BLUE")
- .build();
+ private Pane propertiesPane;
public static void main(String[] args) {
Utils.launch(javafx.commons.ControlChooserApp.class, args);
@@ -106,6 +102,9 @@
}
private Parent getContent() {
+ propertiesPane = new Pane();
+ propertiesPane.setStyle("-fx-border-color:BLUE");
+
spaceForNode = new VBox(10);
spaceForNode.setAlignment(Pos.CENTER);
spaceForNode.setMinWidth(300);
@@ -121,11 +120,8 @@
controls.getChildren().add(createNodeChooser());
controls.setStyle("-fx-border-color:GREEN");
- VBox vBox = VBoxBuilder.create()
- .children(spaceForNode, controls)
- .spacing(10d)
- .build();
-
+ VBox vBox = new VBox(spaceForNode, controls);
+ vBox.setSpacing(10d);
HBox hBox = new HBox(10);
hBox.setAlignment(Pos.TOP_LEFT);
hBox.getChildren().addAll(
--- old/functional/ControlsTests/src/javafx/draganddrop/DragDropWithControls.java 2017-02-15 15:57:36.447263948 +0300
+++ new/functional/ControlsTests/src/javafx/draganddrop/DragDropWithControls.java 2017-02-15 15:57:36.379263314 +0300
@@ -50,14 +50,13 @@
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label;
import javafx.scene.control.Separator;
import javafx.scene.control.TextField;
import javafx.scene.image.Image;
-import javafx.scene.image.ImageViewBuilder;
+import javafx.scene.image.ImageView;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import javafx.scene.input.DataFormat;
@@ -293,15 +292,16 @@
createTMSelect(sourceModes));
VBox rbox = new VBox(10);
- rbox.getChildren().addAll(new Text("Data formats:"),
- createFormatSelect(sourceFormats),
- ButtonBuilder.create().text("Put to clipboard")
- .id(ID_TO_CLIPBOARD_BUTTON)
- .onAction(new EventHandler() {
+ Button b = new Button("Put to clipboard");
+ b.setId(ID_TO_CLIPBOARD_BUTTON);
+ b.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
Clipboard.getSystemClipboard().setContent(prepareClipboardContent());
}
- }).build());
+ });
+ rbox.getChildren().addAll(new Text("Data formats:"),
+ createFormatSelect(sourceFormats),
+ b);
HBox hbox = new HBox(10);
hbox.getChildren().addAll(lbox, new Separator(Orientation.VERTICAL), rbox);
@@ -342,10 +342,13 @@
useCustomViewCB = new CheckBox("Use custom drag view.");
VBox box = new VBox(10);
+ ImageView i = new ImageView();
+ i.setImage(CONTENT_IMAGE);
+ i.setId(ID_SRC_IMAGE);
box.getChildren().addAll(hbox, new Separator(), fileHdr,
fileNames, tb, btns,
useCustomViewCB, new Text("Image: "),
- ImageViewBuilder.create().image(CONTENT_IMAGE).id(ID_SRC_IMAGE).build(),
+ i,
log);
if (parameters.size() > 0) {
box.setStyle("-fx-background-color: " + parameters.get(0) + ";");
@@ -370,12 +373,14 @@
createControlCombo(targetControlPane, false), new Text("Target transfer modes:"), createTMSelect(targetModes));
VBox rbox = new VBox(10);
- rbox.getChildren().addAll(new Text("Data formats:"), createFormatSelect(targetFormats),
- ButtonBuilder.create().text("paste from clipboard").id(ID_FROM_CLIPBOARD_BUTTON).onAction(new EventHandler() {
+ Button b = new Button("paste from clipboard");
+ b.setId(ID_FROM_CLIPBOARD_BUTTON);
+ b.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
getDataFromClipboard(Clipboard.getSystemClipboard());
}
- }).build());
+ });
+ rbox.getChildren().addAll(new Text("Data formats:"), createFormatSelect(targetFormats), b);
VBox content = new VBox(10);
content.getChildren().addAll(new Text("Transfered content:"), transferedContentPane);
@@ -400,6 +405,9 @@
public void changed(ObservableValue extends NodeFactory> ov, NodeFactory t, NodeFactory t1) {
Node ctrl = null;
ctrl = t1.createNode();
+ if (ctrl instanceof ImageView) {
+ ctrl.setPickOnBounds(true);
+ }
if (source) {
ctrl.setId(ID_DRAG_SOURCE);
} else {
@@ -569,7 +577,9 @@
}
if (targetFormats.contains(DataFormat.IMAGE) && cb.hasImage()) {
receivedContent.put(DataFormat.IMAGE, cb.getImage());
- transferedContentPane.getChildren().addAll(new Text("Image: "), ImageViewBuilder.create().image(cb.getImage()).id(ID_RECEIVED_IMAGE).build());
+ ImageView i = new ImageView(cb.getImage());
+ i.setId(ID_RECEIVED_IMAGE);
+ transferedContentPane.getChildren().addAll(new Text("Image: "), i);
log("Dropped image: " + cb.getImage());
gotData = true;
}
--- old/functional/ControlsTests/src/javafx/factory/ControlsFactory.java 2017-02-15 15:57:36.703266332 +0300
+++ new/functional/ControlsTests/src/javafx/factory/ControlsFactory.java 2017-02-15 15:57:36.647265811 +0300
@@ -46,54 +46,38 @@
import javafx.scene.Node;
import javafx.scene.control.Accordion;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.CheckBox;
-import javafx.scene.control.CheckBoxBuilder;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.ColorPicker;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Control;
import javafx.scene.control.DatePicker;
import javafx.scene.control.Hyperlink;
-import javafx.scene.control.HyperlinkBuilder;
import javafx.scene.control.Label;
-import javafx.scene.control.LabelBuilder;
import javafx.scene.control.ListView;
import javafx.scene.control.Menu;
import javafx.scene.control.MenuBar;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Pagination;
import javafx.scene.control.PasswordField;
-import javafx.scene.control.PasswordFieldBuilder;
import javafx.scene.control.ProgressBar;
-import javafx.scene.control.ProgressBarBuilder;
import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.ProgressIndicatorBuilder;
import javafx.scene.control.RadioButton;
-import javafx.scene.control.RadioButtonBuilder;
import javafx.scene.control.ScrollBar;
-import javafx.scene.control.ScrollBarBuilder;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Separator;
-import javafx.scene.control.SeparatorBuilder;
import javafx.scene.control.Slider;
-import javafx.scene.control.SliderBuilder;
import javafx.scene.control.SplitMenuButton;
-import javafx.scene.control.SplitMenuButtonBuilder;
import javafx.scene.control.SplitPane;
-import javafx.scene.control.SplitPaneBuilder;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableColumn.CellDataFeatures;
import javafx.scene.control.TableView;
import javafx.scene.control.TextArea;
-import javafx.scene.control.TextAreaBuilder;
import javafx.scene.control.TextField;
-import javafx.scene.control.TextFieldBuilder;
import javafx.scene.control.TitledPane;
import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleButtonBuilder;
import javafx.scene.control.ToolBar;
import javafx.scene.control.TreeItem;
import javafx.scene.control.TreeTableColumn;
@@ -102,7 +86,7 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPaneBuilder;
+import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.scene.shape.Circle;
@@ -114,7 +98,10 @@
Buttons(new ControlFactory() {
public Control createControl() {
- return ButtonBuilder.create().text("Button the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).graphic(new Rectangle(10, 10, Color.RED)).build();
+ Button b = new Button("Button the first line" + "\nthe sec long line" + "\nthe third line");
+ b.setFocusTraversable(false);
+ b.setGraphic(new Rectangle(10, 10, Color.RED));
+ return b;
}
public Class getControlClass() {
@@ -183,7 +170,10 @@
}),
CheckBoxes(new ControlFactory() {
public Control createControl() {
- return CheckBoxBuilder.create().text("Check box the first line" + "\nthe sec long line" + "\nthe third line").graphic(new Rectangle(20, 20, Color.web("lightblue"))).focusTraversable(false).build();
+ CheckBox cb = new CheckBox("Check box the first line" + "\nthe sec long line" + "\nthe third line");
+ cb.setFocusTraversable(false);
+ cb.setGraphic(new Rectangle(20, 20, Color.web("lightblue")));
+ return cb;
}
public Class getControlClass() {
@@ -192,7 +182,11 @@
}),
RadioButtons(new ControlFactory() {
public Control createControl() {
- return RadioButtonBuilder.create().text("Radio the first line" + "\nthe sec long line" + "\nthe third line").graphic(new Rectangle(20, 20, Color.web("lightblue"))).focusTraversable(false).textAlignment(TextAlignment.RIGHT).build();
+ RadioButton rb = new RadioButton("Radio the first line" + "\nthe sec long line" + "\nthe third line");
+ rb.setFocusTraversable(false);
+ rb.setGraphic(new Rectangle(20, 20, Color.web("lightblue")));
+ rb.setTextAlignment(TextAlignment.RIGHT);
+ return rb;
}
public Class getControlClass() {
@@ -201,7 +195,9 @@
}),
TextFields(new ControlFactory() {
public Control createControl() {
- return TextFieldBuilder.create().text("Text box the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).build();
+ TextField tf = new TextField("Text box the first line" + "\nthe sec long line" + "\nthe third line");
+ tf.setFocusTraversable(false);
+ return tf;
}
public Class getControlClass() {
@@ -210,7 +206,10 @@
}),
TextAreas(new ControlFactory() {
public Control createControl() {
- return TextAreaBuilder.create().maxWidth(100).maxHeight(50).text("Text area the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).build();
+ TextArea ta = new TextArea("Text area the first line" + "\nthe sec long line" + "\nthe third line");
+ ta.setFocusTraversable(false);
+ ta.setMaxSize(100, 50);
+ return ta;
}
public Class getControlClass() {
@@ -219,7 +218,10 @@
}),
PasswordFields(new ControlFactory() {
public Control createControl() {
- return PasswordFieldBuilder.create().promptText("Password box the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).build();
+ PasswordField pf = new PasswordField();
+ pf.setPromptText("Password box the first line" + "\nthe sec long line" + "\nthe third line");
+ pf.setFocusTraversable(false);
+ return pf;
}
public Class getControlClass() {
@@ -228,7 +230,12 @@
}),
Sliders(new ControlFactory() {
public Control createControl() {
- return SliderBuilder.create().min(0).max(100).value(20).focusTraversable(false).build();
+ Slider s = new Slider();
+ s.setMin(0);
+ s.setMax(100);
+ s.setValue(20);
+ s.setFocusTraversable(false);
+ return s;
}
public Class getControlClass() {
@@ -237,7 +244,10 @@
}),
Labels(new ControlFactory() {
public Control createControl() {
- return LabelBuilder.create().text("Label the first line" + "\nthe sec longlong line" + "\nthe third line").focusTraversable(false).graphic(new Rectangle(20, 20, Color.web("lightblue"))).build();
+ Label l = new Label("Label the first line" + "\nthe sec longlong line" + "\nthe third line");
+ l.setFocusTraversable(false);
+ l.setGraphic(new Rectangle(20, 20, Color.web("lightblue")));
+ return l;
}
public Class getControlClass() {
@@ -246,7 +256,10 @@
}),
Hyperlinks(new ControlFactory() {
public Control createControl() {
- return HyperlinkBuilder.create().text("Hyperlink the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).graphic(new Circle(10, Color.BLUE)).build();
+ Hyperlink hl = new Hyperlink("Hyperlink the first line" + "\nthe sec long line" + "\nthe third line");
+ hl.setFocusTraversable(false);
+ hl.setGraphic(new Circle(10, Color.BLUE));
+ return hl;
}
public Class getControlClass() {
@@ -299,7 +312,8 @@
}),
Separators(new ControlFactory() {
public Control createControl() {
- Separator sep = SeparatorBuilder.create().halignment(HPos.CENTER).build();
+ Separator sep = new Separator();
+ sep.setHalignment(HPos.CENTER);
sep.setPrefWidth(80);
return sep;
}
@@ -310,7 +324,12 @@
}),
ScrollBars(new ControlFactory() {
public Control createControl() {
- return ScrollBarBuilder.create().value(45).min(0).max(100).focusTraversable(false).build();
+ ScrollBar sb = new ScrollBar();
+ sb.setValue(45);
+ sb.setMin(0);
+ sb.setMax(100);
+ sb.setFocusTraversable(false);
+ return sb;
}
public Class getControlClass() {
@@ -337,7 +356,9 @@
}),
ProgressIndicators(new ControlFactory() {
public Node createControl() {
- return ProgressIndicatorBuilder.create().progress(0.85).focusTraversable(false).build();
+ ProgressIndicator pi = new ProgressIndicator(0.85);
+ pi.setFocusTraversable(false);
+ return pi;
}
public Class getControlClass() {
@@ -346,7 +367,9 @@
}),
ProgressBars(new ControlFactory() {
public Node createControl() {
- return ProgressBarBuilder.create().progress(0.25).focusTraversable(false).build();
+ ProgressBar pb = new ProgressBar(0.25);
+ pb.setFocusTraversable(false);
+ return pb;
}
public Class getControlClass() {
@@ -356,6 +379,8 @@
ListViews(new ControlFactory() {
public Node createControl() {
ListView list = new ListView();
+
+ // The following requires --add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
ObservableListWrapper items = new ObservableListWrapper(Arrays.asList("One", "Two", "Three", "Four", "Five", "Six", "long line long line long line long line"));
list.setItems(items);
list.setPrefWidth(100);
@@ -370,7 +395,11 @@
}),
PressedToggleButtons(new ControlFactory() {
public Control createControl() {
- return ToggleButtonBuilder.create().selected(true).text("Button the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).graphic(new Rectangle(10, 10, Color.RED)).build();
+ ToggleButton tb = new ToggleButton("Button the first line" + "\nthe sec long line" + "\nthe third line");
+ tb.setFocusTraversable(false);
+ tb.setGraphic(new Rectangle(10, 10, Color.RED));
+ tb.setSelected(true);
+ return tb;
}
public Class getControlClass() {
@@ -379,7 +408,11 @@
}),
UnPressedToggleButtons(new ControlFactory() {
public Control createControl() {
- return ToggleButtonBuilder.create().selected(false).text("Button the first line" + "\nthe sec long line" + "\nthe third line").focusTraversable(false).graphic(new Rectangle(10, 10, Color.RED)).build();
+ ToggleButton tb = new ToggleButton("Button the first line" + "\nthe sec long line" + "\nthe third line");
+ tb.setFocusTraversable(false);
+ tb.setGraphic(new Rectangle(10, 10, Color.RED));
+ tb.setSelected(false);
+ return tb;
}
public Class getControlClass() {
@@ -389,7 +422,9 @@
Toolbars(new ControlFactory() {
public Node createControl() {
ToolBar toolbar = new ToolBar();
- toolbar.getItems().addAll(new Button("One"), new Button("Two"), new Separator(), SplitMenuButtonBuilder.create().text("three").build());
+ SplitMenuButton smb = new SplitMenuButton();
+ smb.setText("three");
+ toolbar.getItems().addAll(new Button("One"), new Button("Two"), new Separator(), smb);
toolbar.setFocusTraversable(false);
return toolbar;
}
@@ -412,12 +447,10 @@
}),
SplitMenuButtons(new ControlFactory() {
public Node createControl() {
- SplitMenuButton smb = SplitMenuButtonBuilder.create()
- .text("Split box the first line" + "\nthe sec long line" + "\nthe third line")
- .items(new MenuItem("Split box the first line" + "\nthe sec long line" + "\nthe third line",
- new Rectangle(10, 10, Color.BLUE)))
- .graphic(new Rectangle(10, 10, Color.RED))
- .build();
+ SplitMenuButton smb = new SplitMenuButton(new MenuItem("Split box the first line" + "\nthe sec long line" + "\nthe third line",
+ new Rectangle(10, 10, Color.BLUE)));
+ smb.setText("Split box the first line" + "\nthe sec long line" + "\nthe third line");
+ smb.setGraphic(new Rectangle(10, 10, Color.RED));
smb.setMinWidth(100);
smb.setFocusTraversable(false);
return smb;
@@ -491,7 +524,6 @@
table.getColumns().setAll(column1, column2);
table.setPrefHeight(100);
table.setPrefWidth(100);
- table.setMinHeight(Control.USE_PREF_SIZE);
table.setFocusTraversable(false);
return table;
}
@@ -531,7 +563,6 @@
treeTable.getColumns().setAll(column1, column2);
treeTable.setPrefHeight(100);
treeTable.setPrefWidth(100);
- treeTable.setMinHeight(Control.USE_PREF_SIZE);
treeTable.setFocusTraversable(false);
return treeTable;
}
@@ -584,10 +615,11 @@
}),
SplitPanes(new ControlFactory() {
public Node createControl() {
- SplitPane pane = SplitPaneBuilder.create().items(
- StackPaneBuilder.create().children(new Rectangle(40, 40, Color.WHITESMOKE)).build(),
- StackPaneBuilder.create().children(new Rectangle(40, 40, Color.BLUE)).build(),
- StackPaneBuilder.create().children(new Rectangle(40, 40, Color.RED)).build()).prefWidth(150).prefHeight(150).build();
+ StackPane sp1 = new StackPane(new Rectangle(40, 40, Color.WHITESMOKE));
+ StackPane sp2 = new StackPane(new Rectangle(40, 40, Color.BLUE));
+ StackPane sp3 = new StackPane(new Rectangle(40, 40, Color.RED));
+ SplitPane pane = new SplitPane(sp1, sp2, sp3);
+ pane.setPrefSize(150, 150);
pane.setMinWidth(100);
pane.setDividerPositions(0.33, 0.67);
pane.setFocusTraversable(false);
--- old/functional/ControlsTests/src/javafx/scene/control/test/ListView/NewListViewApp.java 2017-02-15 15:57:36.987268978 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/ListView/NewListViewApp.java 2017-02-15 15:57:36.915268309 +0300
@@ -118,7 +118,9 @@
PropertyTablesFactory.explorePropertiesList(testedListView, tb);
SpecialTablePropertiesProvider.provideForControl(testedControl, tb);
- final TextField tf = TextFieldBuilder.create().id(LIST_VIEW_CONTROL_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(LIST_VIEW_CONTROL_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
HBox nodeshb = new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction() {
@Override
@@ -128,7 +130,8 @@
}, tf);
HBox resetButtons = new HBox();
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -138,7 +141,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
softReset();
@@ -154,7 +158,8 @@
}
});
- Button changeSelectionModel = ButtonBuilder.create().text("Change selection model to custom").id(CHANGE_SELECTION_MODEL_BUTTON_ID).build();
+ Button changeSelectionModel = new Button("Change selection model to custom");
+ changeSelectionModel.setId(CHANGE_SELECTION_MODEL_BUTTON_ID);
changeSelectionModel.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedListView.setSelectionModel(cmsm);
@@ -180,7 +185,6 @@
ListView lv = new ListView();
lv.setId(TESTED_LIST_VIEW_ID);
return lv;
- //return ListViewBuilder.create().id(TESTED_LIST_VIEW_ID).build();
}
private void softReset() {
@@ -225,12 +229,17 @@
private HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add item");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADD_ITEM_TEXT_FIELD_ID);
Label atLb = new Label("at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_POSITION_TEXT_FIELD_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_ITEM_POSITION_TEXT_FIELD_ID);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_ITEM_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_ITEM_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
((ListView) testedControl).getItems().add(Integer.parseInt(tfPos.getText()), tf.getText());
@@ -243,8 +252,11 @@
private HBox getRemoveItemHBox() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -257,8 +269,10 @@
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).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);
button.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
@@ -273,8 +287,11 @@
private HBox getAddRectangleHbox() {
HBox hb = new HBox();
Label lb = new Label("Add rectangle at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_RECTANGLE_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_RECTANGLE_BUTTON_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_RECTANGLE_TEXT_FIELD_ID);
+ Button bt = new Button("Add!");
+ bt.setId(ADD_RECTANGLE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfPos.getText());
@@ -288,8 +305,11 @@
private HBox getAddFormHbox() {
HBox hb = new HBox();
Label lb = new Label("Add form at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_FORM_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_FORM_BUTTON_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_FORM_TEXT_FIELD_ID);
+ Button bt = new Button("Add!");
+ bt.setId(ADD_FORM_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfPos.getText());
@@ -303,8 +323,11 @@
private HBox getAddTextFieldHbox() {
HBox hb = new HBox();
Label lb = new Label("Add textField at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_TEXT_FIELD_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_TEXT_FIELD_BUTTON_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_TEXT_FIELD_TEXT_FIELD_ID);
+ Button bt = new Button("Add!");
+ bt.setId(ADD_TEXT_FIELD_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfPos.getText());
@@ -317,9 +340,11 @@
private HBox getStartMotionHBox() {
HBox hb = new HBox();
- Button startMotion = ButtonBuilder.create().text("start motion").id(START_MOTION_BUTTON_ID).build();
+ Button startMotion = new Button("start motion");
+ startMotion.setId(START_MOTION_BUTTON_ID);
Label label = new Label(" of element at position ");
- final TextField tf = TextFieldBuilder.create().text("0").id(START_MOTION_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setId(START_MOTION_TEXT_FIELD_ID);
startMotion.setOnAction(new EventHandler() {
public void handle(Event t) {
cm.applyTransition((Node) ((ListView) testedControl).getItems().get(Integer.parseInt(tf.getText())));
@@ -332,9 +357,11 @@
private HBox getIncreaseScaleHBox() {
HBox hb = new HBox();
- final TextField tf = TextFieldBuilder.create().text("0").id(INCREASE_SCALE_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setId(INCREASE_SCALE_TEXT_FIELD_ID);
Label label = new Label(" of node on position ");
- Button increaseScaleButton = ButtonBuilder.create().id(INCREASE_SCALE_BUTTON_ID).text("Increase scale").build();
+ Button increaseScaleButton = new Button("Increase scale");
+ increaseScaleButton.setId(INCREASE_SCALE_BUTTON_ID);
increaseScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
Node content = (Node) ((ListView) testedControl).getItems().get(Integer.parseInt(tf.getText()));
@@ -348,9 +375,11 @@
private HBox getDecreaseScaleHBox() {
HBox hb = new HBox();
- final TextField tf = TextFieldBuilder.create().text("0").id(DECREASE_SCALE_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setId(DECREASE_SCALE_TEXT_FIELD_ID);
Label label = new Label(" of node on position ");
- Button increaseScaleButton = ButtonBuilder.create().id(DECREASE_SCALE_BUTTON_ID).text("Decrease scale").build();
+ Button increaseScaleButton = new Button("Decrease scale");
+ increaseScaleButton.setId(DECREASE_SCALE_BUTTON_ID);
increaseScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
Node content = (Node) ((ListView) testedControl).getItems().get(Integer.parseInt(tf.getText()));
@@ -371,7 +400,9 @@
}
private TextField getNewTextField() {
- return TextFieldBuilder.create().id("CONTENT_TEXT_FIELD_" + (textFieldsCounter++) + "_ID").build();
+ TextField tf = new TextField();
+ tf.setId("CONTENT_TEXT_FIELD_" + (textFieldsCounter++) + "_ID");
+ return tf;
}
}
}
--- old/functional/ControlsTests/src/javafx/scene/control/test/ScrollPane/NewScrollPaneApp.java 2017-02-15 15:57:37.215271102 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/ScrollPane/NewScrollPaneApp.java 2017-02-15 15:57:37.147270469 +0300
@@ -113,14 +113,13 @@
public ScrollPaneScene() {
super("ScrollPane", 800, 600);
-
- prepareScene();
}
@Override
protected final void prepareScene() {
Utils.addBrowser(this);
- testedScrollPane = ScrollPaneBuilder.create().id(TESTED_SCROLLPANE_ID).build();
+ testedScrollPane = new ScrollPane();
+ testedScrollPane.setId(TESTED_SCROLLPANE_ID);
final Node content = setCustomContent(customContentHeight, customContentWidth);
final ContentMotion cm = new ContentMotion();
@@ -136,7 +135,8 @@
testedScrollPane.setPrefViewportHeight(scrollPaneHeight);
}
- Button changeContentButton = ButtonBuilder.create().id(CHANGE_CONTENT_BUTTON_ID).text("ChangeContent").build();
+ Button changeContentButton = new Button("ChangeContent");
+ changeContentButton.setId(CHANGE_CONTENT_BUTTON_ID);
changeContentButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
changeContent();
@@ -144,7 +144,8 @@
}
});
- Button addPrefWidthAndHeightButton = ButtonBuilder.create().id(ADD_SIZE_BUTTON_ID).text("Add pref sizes").build();
+ Button addPrefWidthAndHeightButton = new Button("Add pref sizes");
+ addPrefWidthAndHeightButton.setId(ADD_SIZE_BUTTON_ID);
addPrefWidthAndHeightButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
tb.addDoublePropertyLine(testedScrollPane.prefWidthProperty(), -100, 200, 100);
@@ -152,7 +153,8 @@
}
});
- Button setTextAreaAsContentButton = ButtonBuilder.create().id(CHANGE_CONTENT_TO_RESIZABLE_BUTTON_ID).text("Set blue pane as content").build();
+ Button setTextAreaAsContentButton = new Button("Set blue pane as content");
+ setTextAreaAsContentButton.setId(CHANGE_CONTENT_TO_RESIZABLE_BUTTON_ID);
setTextAreaAsContentButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
setResizableContent();
@@ -162,35 +164,40 @@
}
});
- Button setCustomContentButton = ButtonBuilder.create().id(CHANGE_CONTENT_TO_CUSTOM_BUTTON_ID).text("Set custom content").build();
+ Button setCustomContentButton = new Button("Set custom content");
+ setCustomContentButton.setId(CHANGE_CONTENT_TO_CUSTOM_BUTTON_ID);
setCustomContentButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
setCustomContent();
}
});
- Button buttonStart = ButtonBuilder.create().id(START_MOTION_BUTTON_ID).text("Start motion").build();
+ Button buttonStart = new Button("Start motion");
+ buttonStart.setId(START_MOTION_BUTTON_ID);
buttonStart.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
cm.getTimeline().play();
}
});
- Button rotateButton = ButtonBuilder.create().id(ROTATE_BUTTON_ID).text("Rotate on 30deg").build();
+ Button rotateButton = new Button("Rotate on 30deg");
+ rotateButton.setId(ROTATE_BUTTON_ID);
rotateButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
content.setRotate(content.getRotate() + 30);
}
});
- Button rotateScrollPaneButton = ButtonBuilder.create().id(ROTATE_SCROLLPANE_BUTTON_ID).text("Rotate scrollpane on 30deg").build();
+ Button rotateScrollPaneButton = new Button("Rotate scrollpane on 30deg");
+ rotateScrollPaneButton.setId(ROTATE_SCROLLPANE_BUTTON_ID);
rotateScrollPaneButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedScrollPane.setRotate(testedScrollPane.getRotate() + 30);
}
});
- Button increaseScaleButton = ButtonBuilder.create().id(INCREASE_SCALE_BUTTON_ID).text("Increase scale").build();
+ Button increaseScaleButton = new Button("Increase scale");
+ increaseScaleButton.setId(INCREASE_SCALE_BUTTON_ID);
increaseScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
content.setScaleX(content.getScaleX() + 0.15);
@@ -198,7 +205,8 @@
}
});
- Button decreaseScaleButton = ButtonBuilder.create().id(DECREASE_SCALE_BUTTON_ID).text("Decrease scale").build();
+ Button decreaseScaleButton = new Button("Decrease scale");
+ decreaseScaleButton.setId(DECREASE_SCALE_BUTTON_ID);
decreaseScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
content.setScaleX(content.getScaleX() - 0.15);
@@ -206,7 +214,8 @@
}
});
- Button increaseScrollPaneScaleButton = ButtonBuilder.create().id(INCREASE_SCROLLPANE_SCALE_BUTTON_ID).text("Increase ScrollPane scale").build();
+ Button increaseScrollPaneScaleButton = new Button("Increase ScrollPane scale");
+ increaseScrollPaneScaleButton.setId(INCREASE_SCROLLPANE_SCALE_BUTTON_ID);
increaseScrollPaneScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedScrollPane.setScaleX(testedScrollPane.getScaleX() + 0.15);
@@ -214,7 +223,8 @@
}
});
- Button decreaseScrollPaneScaleButton = ButtonBuilder.create().id(DECREASE_SCROLLPANE_SCALE_BUTTON_ID).text("Decrease ScrollPane scale").build();
+ Button decreaseScrollPaneScaleButton = new Button("Decrease ScrollPane scale");
+ decreaseScrollPaneScaleButton.setId(DECREASE_SCROLLPANE_SCALE_BUTTON_ID);
decreaseScrollPaneScaleButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedScrollPane.setScaleX(testedScrollPane.getScaleX() - 0.15);
@@ -222,7 +232,8 @@
}
});
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -246,8 +257,12 @@
}
private Node getAddGridPaneForm() {
- final TextField dimension = TextFieldBuilder.create().id(GRID_DIMENSION_TEXTFIELD_ID).promptText("int-dimension").maxWidth(50).build();
- Button addButton = ButtonBuilder.create().id(ADD_GRID_BUTTON_ID).text("Add grid").build();
+ final TextField dimension = new TextField();
+ dimension.setId(GRID_DIMENSION_TEXTFIELD_ID);
+ dimension.setPromptText("int-dimension");
+ dimension.setMaxWidth(50);
+ Button addButton = new Button("Add grid");
+ addButton.setId(ADD_GRID_BUTTON_ID);
addButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
int c = Integer.parseInt(dimension.getText());
@@ -256,7 +271,11 @@
for (int i = 0; i < c; i++) {
for (int j = 0; j < c; j++) {
final String name = "B-" + String.valueOf(i) + "-" + String.valueOf(j);
- gridPane.add(ButtonBuilder.create().text(name).id(name).minHeight(10 * i).minWidth(10 * j).build(), i, j);
+ Button temp = new Button(name);
+ temp.setId(name);
+ temp.setMinHeight(10 * i);
+ temp.setMinWidth(10 * j);
+ gridPane.add(temp, i, j);
}
}
testedScrollPane.setContent(gridPane);
@@ -291,18 +310,23 @@
private void changeContent() {
VBox vb = new VBox();
- Button button = ButtonBuilder.create().id(CONTENT_BUTTON).text("Press me").build();
- final TextField tf1 = TextFieldBuilder.create().id(CONTENT_TEXT_FIELD_ID).text("0").build();
+ Button button = new Button("Press me");
+ button.setId(CONTENT_BUTTON);
+ final TextField tf1 = new TextField("0");
+ tf1.setId(CONTENT_TEXT_FIELD_ID);
button.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
tf1.setText(String.valueOf(Integer.parseInt(tf1.getText()) + 1));
}
});
- TextArea tf2 = TextAreaBuilder.create().prefHeight(100).id(CONTENT_TEXT_AREA_ID).build();
+ TextArea tf2 = new TextArea();
+ tf2.setPrefHeight(100);
+ tf2.setId(CONTENT_TEXT_AREA_ID);
for (int i = 0; i < 15; i++) {
tf2.appendText("text" + i + "\n");
}
- Button empty = ButtonBuilder.create().text("This is empty-action button").id(WITHOUT_ACTION_BUTTON).build();
+ Button empty = new Button("This is empty-action button");
+ empty.setId(WITHOUT_ACTION_BUTTON);
vb.getChildren().addAll(button, tf1, tf2, empty);
vb.setStyle("-fx-border-color: blue;");
--- old/functional/ControlsTests/src/javafx/scene/control/test/ToggleButtonNewApp.java 2017-02-15 15:57:37.463273413 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/ToggleButtonNewApp.java 2017-02-15 15:57:37.399272816 +0300
@@ -31,14 +31,10 @@
import javafx.event.EventHandler;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.CheckBox;
-import javafx.scene.control.CheckBoxBuilder;
import javafx.scene.control.Label;
-import javafx.scene.control.LabelBuilder;
-import javafx.scene.control.RadioButtonBuilder;
+import javafx.scene.control.RadioButton;
import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleButtonBuilder;
import javafx.scene.control.ToggleGroup;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.HBox;
@@ -80,21 +76,45 @@
ToggleButton toggleButton1;
ToggleButton toggleButton2;
- CheckBox checkBox1 = CheckBoxBuilder.create().wrapText(true).text("Unidirectionally binded to\ntoggle button 1 selection property").id(CHECK_BOX_LISTENING_1_ID).build();
- CheckBox checkBox2 = CheckBoxBuilder.create().wrapText(true).text("Unidirectionally binded to\ntoggle button 2 selection property").id(CHECK_BOX_LISTENING_2_ID).build();
- CheckBox checkBox3 = CheckBoxBuilder.create().wrapText(true).text("This check box is bidirectionally binded\nto Toggle Button 1 selection property").id(CHECK_BOX_SETTING_1_BIDIR_ID).build();
- CheckBox checkBox4 = CheckBoxBuilder.create().wrapText(true).text("This check box unidirectionally sets\ntoggle button 2 selection property").id(CHECK_BOX_SETTING_2_UNIDIR_ID).build();
+ CheckBox checkBox1;
+ CheckBox checkBox2;
+ CheckBox checkBox3;
+ CheckBox checkBox4;
ToggleGroup toggleGroup = new ToggleGroup();
- ToggleButton bindingsSettingButton = ToggleButtonBuilder.create().text("State: Unbinded").id(BINDING_SET_TOGGLE_BUTTON_ID).build();
- ToggleButton groupingButton = ToggleButtonBuilder.create().text("State: Ungrouped").id(GROUPING_TOGGLE_BUTTON_ID).build();
- ToggleButton testedControlChangeButton = ToggleButtonBuilder.create().text("Control: radio button").id(SETTING_CONTROL_TOGGLE_BUTTON_ID).build();
- Button resetButton = ButtonBuilder.create().text("Reset state").id(RESET_BUTTON_ID).build();
- Label mouseEventsLogger = LabelBuilder.create().text("0").id(MOUSE_EVENTS_LOGGER_LABEL_ID).build();
+ ToggleButton bindingsSettingButton;
+ ToggleButton groupingButton;
+ ToggleButton testedControlChangeButton;
+ Button resetButton;
+ Label mouseEventsLogger;
VBox vb1 = new VBox();
public ToggleButtonNewAppScene() {
super(new HBox(), 800, 320);
+ checkBox1 = new CheckBox("Unidirectionally binded to\ntoggle button 1 selection property");
+ checkBox1.setWrapText(true);
+ checkBox1.setId(CHECK_BOX_LISTENING_1_ID);
+ checkBox2 = new CheckBox("Unidirectionally binded to\ntoggle button 2 selection property");
+ checkBox2.setWrapText(true);
+ checkBox2.setId(CHECK_BOX_LISTENING_2_ID);
+ checkBox3 = new CheckBox("This check box is bidirectionally binded\nto Toggle Button 1 selection property");
+ checkBox3.setWrapText(true);
+ checkBox3.setId(CHECK_BOX_SETTING_1_BIDIR_ID);
+ checkBox4 = new CheckBox("This check box unidirectionally sets\ntoggle button 2 selection property");
+ checkBox4.setWrapText(true);
+ checkBox4.setId(CHECK_BOX_SETTING_2_UNIDIR_ID);
+
+ bindingsSettingButton = new ToggleButton("State: Unbinded");
+ bindingsSettingButton.setId(BINDING_SET_TOGGLE_BUTTON_ID);
+ groupingButton = new ToggleButton("State: Ungrouped");
+ groupingButton.setId(GROUPING_TOGGLE_BUTTON_ID);
+ testedControlChangeButton = new ToggleButton("Control: radio button");
+ testedControlChangeButton.setId(SETTING_CONTROL_TOGGLE_BUTTON_ID);
+ resetButton = new Button("Reset state");
+ resetButton.setId(RESET_BUTTON_ID);
+ mouseEventsLogger = new Label("0");
+ mouseEventsLogger.setId(MOUSE_EVENTS_LOGGER_LABEL_ID);
+
setControl(ControlType.RADIO_BUTTON);
addButtonsListeners();
@@ -131,11 +151,15 @@
private void setControl(ControlType type) {
if (type == ControlType.RADIO_BUTTON) {
- toggleButton1 = RadioButtonBuilder.create().text("Radio button 1").id(TOGGLE_BUTTON_1_ID).build();
- toggleButton2 = RadioButtonBuilder.create().text("Radio button 2").id(TOGGLE_BUTTON_2_ID).build();
+ toggleButton1 = new RadioButton("Radio button 1");
+ toggleButton1.setId(TOGGLE_BUTTON_1_ID);
+ toggleButton2 = new RadioButton("Radio button 2");
+ toggleButton2.setId(TOGGLE_BUTTON_2_ID);
} else {
- toggleButton1 = ToggleButtonBuilder.create().text("Toggle button 1").id(TOGGLE_BUTTON_1_ID).build();
- toggleButton2 = ToggleButtonBuilder.create().text("Toggle button 2").id(TOGGLE_BUTTON_2_ID).build();
+ toggleButton1 = new ToggleButton("Toggle button 1");
+ toggleButton1.setId(TOGGLE_BUTTON_1_ID);
+ toggleButton2 = new ToggleButton("Toggle button 2");
+ toggleButton2.setId(TOGGLE_BUTTON_2_ID);
}
vb1.getChildren().clear();
--- old/functional/ControlsTests/src/javafx/scene/control/test/accordion/NewAccordionApp.java 2017-02-15 15:57:37.695275574 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/accordion/NewAccordionApp.java 2017-02-15 15:57:37.643275090 +0300
@@ -78,14 +78,17 @@
private void prepareScene() {
pane = new Pane();
- testedAccordion = AccordionBuilder.create().id(TESTED_ACCORDION_ID).build();
+ testedAccordion = new Accordion();
+ testedAccordion.setId(TESTED_ACCORDION_ID);
PropertiesTable tb = new PropertiesTable(testedAccordion);
PropertyTablesFactory.explorePropertiesList(testedAccordion, tb);
final TabPaneWithControl tabPane = new TabPaneWithControl("Accordion", tb);
- final TextField tf = TextFieldBuilder.create().id(ACCORDION_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(ACCORDION_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
HBox nodeshb = new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction() {
@@ -110,7 +113,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewAreaChartApp.java 2017-02-15 15:57:37.935277810 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewAreaChartApp.java 2017-02-15 15:57:37.879277288 +0300
@@ -43,6 +43,7 @@
import javafx.scene.chart.XYChart;
import javafx.scene.chart.XYChart.Series;
import javafx.scene.control.*;
+import static javafx.scene.control.test.chart.apps.ChartIDsInterface.HARD_RESET_BUTTON_ID;
import static javafx.scene.control.test.chart.apps.CommonFunctions.*;
import javafx.scene.control.test.utils.CommonPropertiesScene;
import javafx.scene.control.test.utils.ptables.PropertiesTable;
@@ -99,7 +100,8 @@
testedAreaChart = getNewChart();
testedAreaChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -109,7 +111,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -134,15 +137,22 @@
HBox hb = new HBox();
Label lb1 = new Label("To area");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_AREA_POS_TEXT_FIELD_ID).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
+ tf1.setId(ADD_AREA_POS_TEXT_FIELD_ID);
Label lb2 = new Label("to index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_INDEX_TEXT_FIELD_ID).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
+ tf2.setId(ADD_INDEX_TEXT_FIELD_ID);
Label lb3 = new Label("value");
- final TextField tf3 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_VALUE_TEXT_FIELD_ID).build();
+ final TextField tf3 = new TextField("0");
+ tf3.setPrefWidth(50);
+ tf3.setId(ADD_VALUE_TEXT_FIELD_ID);
- Button bt = ButtonBuilder.create().text("add point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("add point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int area = Integer.parseInt(tf1.getText());
@@ -164,12 +174,17 @@
HBox hb = new HBox();
Label lb1 = new Label("From area");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_AREA_POS_TEXT_FIELD_ID).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
+ tf1.setId(REMOVE_AREA_POS_TEXT_FIELD_ID);
Label lb2 = new Label("From index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_INDEX_TEXT_FIELD_ID).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
+ tf2.setId(REMOVE_INDEX_TEXT_FIELD_ID);
- Button bt = ButtonBuilder.create().text("remove point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("remove point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int area = Integer.parseInt(tf1.getText());
@@ -184,8 +199,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From index");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_AREA_INDEX_TEXTFIELD_ID).build();
- Button bt = ButtonBuilder.create().text("remove area!").id(REMOVE_AREA_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_AREA_INDEX_TEXTFIELD_ID);
+ Button bt = new Button("remove area!");
+ bt.setId(REMOVE_AREA_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -199,18 +217,27 @@
public HBox getAddAreaHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" minX ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" maxX ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" with ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text("add area!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button("add area!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewBarChartApp.java 2017-02-15 15:57:38.171280009 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewBarChartApp.java 2017-02-15 15:57:38.115279487 +0300
@@ -95,7 +95,8 @@
testedBarChart = getNewChart();
testedBarChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -105,7 +106,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -129,8 +131,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -144,8 +149,9 @@
public HBox getRemoveCategoryDialog() {
HBox hb = new HBox();
Label lb = new Label("From index");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).build();
- Button bt = ButtonBuilder.create().text("Remove category!").build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ Button bt = new Button("Remove category!");
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -160,12 +166,14 @@
public HBox getAddCategoryDialog() {
HBox hb = new HBox();
Label lb = new Label("Category");
- final TextField tf = TextFieldBuilder.create().text("").prefWidth(50).build();
+ final TextField tf = new TextField("");
+ tf.setPrefWidth(50);
Label lind = new Label("to index");
- final TextField tfind = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tfind = new TextField("0");
+ tfind.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("Add!").build();
+ Button bt = new Button("Add!");
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfind.getText());
@@ -180,18 +188,27 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" min ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" max ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" amount ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewBubbleChartApp.java 2017-02-15 15:57:38.415282282 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewBubbleChartApp.java 2017-02-15 15:57:38.355281723 +0300
@@ -92,7 +92,8 @@
testedBubbleChart = getNewChart();
testedBubbleChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -102,7 +103,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -126,8 +128,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove serie!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove serie!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -141,12 +146,15 @@
public HBox getRemoveDataFromSerieDialog() {
HBox hb = new HBox();
Label lb1 = new Label("From serie");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
Label lb2 = new Label("from index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("remove bubble!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("remove bubble!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int serie = Integer.parseInt(tf1.getText());
@@ -161,21 +169,27 @@
public HBox getAddBubbleToSerieDialog() {
HBox hb = new HBox();
Label lb1 = new Label("To serie");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
Label lb2 = new Label("to index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
Label lb3 = new Label("X");
- final TextField tf3 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf3 = new TextField("0");
+ tf3.setPrefWidth(50);
Label lb4 = new Label("Y");
- final TextField tf4 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf4 = new TextField("0");
+ tf4.setPrefWidth(50);
Label lb5 = new Label("R");
- final TextField tf5 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf5 = new TextField("0");
+ tf5.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("add bubble!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("add bubble!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int serie = Integer.parseInt(tf1.getText());
@@ -199,18 +213,27 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" min X,Y ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" max X,Y ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" add ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text(" bubbles!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button(" bubbles!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewLineChartApp.java 2017-02-15 15:57:38.695284891 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewLineChartApp.java 2017-02-15 15:57:38.635284332 +0300
@@ -98,7 +98,8 @@
testedLineChart = getNewChart();
testedLineChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -108,7 +109,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -133,15 +135,22 @@
HBox hb = new HBox();
Label lb1 = new Label("To area");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_LINE_POS_TEXT_FIELD_ID).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
+ tf1.setId(ADD_LINE_POS_TEXT_FIELD_ID);
Label lb2 = new Label("to index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_INDEX_TEXT_FIELD_ID).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
+ tf2.setId(ADD_INDEX_TEXT_FIELD_ID);
Label lb3 = new Label("value");
- final TextField tf3 = TextFieldBuilder.create().text("0").prefWidth(50).id(ADD_VALUE_TEXT_FIELD_ID).build();
+ final TextField tf3 = new TextField("0");
+ tf3.setPrefWidth(50);
+ tf3.setId(ADD_VALUE_TEXT_FIELD_ID);
- Button bt = ButtonBuilder.create().text("add point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("add point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int area = Integer.parseInt(tf1.getText());
@@ -163,12 +172,17 @@
HBox hb = new HBox();
Label lb1 = new Label("From area");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_LINE_FROM_POS_TEXT_FIELD_ID).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
+ tf1.setId(REMOVE_LINE_FROM_POS_TEXT_FIELD_ID);
Label lb2 = new Label("From index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_INDEX_TEXT_FIELD_ID).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
+ tf2.setId(REMOVE_INDEX_TEXT_FIELD_ID);
- Button bt = ButtonBuilder.create().text("remove point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("remove point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int area = Integer.parseInt(tf1.getText());
@@ -183,8 +197,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From index");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("remove line!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("remove line!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -198,18 +215,27 @@
public HBox getAddLineHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" minX ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" maxX ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" with ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text(" points add!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button(" points add!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewNumberScatterChartApp.java 2017-02-15 15:57:38.931287090 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewNumberScatterChartApp.java 2017-02-15 15:57:38.879286605 +0300
@@ -93,7 +93,8 @@
testedScatterChart = getNewChart();
testedScatterChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -103,7 +104,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -127,8 +129,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -142,12 +147,15 @@
public HBox getRemoveDataFromSerieDialog() {
HBox hb = new HBox();
Label lb1 = new Label("From serie");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
Label lb2 = new Label("from index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("remove point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("remove point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int serie = Integer.parseInt(tf1.getText());
@@ -162,18 +170,23 @@
public HBox getAddPointToSerieDialog() {
HBox hb = new HBox();
Label lb1 = new Label("To serie");
- final TextField tf1 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf1 = new TextField("0");
+ tf1.setPrefWidth(50);
Label lb2 = new Label("to index");
- final TextField tf2 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf2 = new TextField("0");
+ tf2.setPrefWidth(50);
Label lb3 = new Label("X");
- final TextField tf3 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf3 = new TextField("0");
+ tf3.setPrefWidth(50);
Label lb4 = new Label("Y");
- final TextField tf4 = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tf4 = new TextField("0");
+ tf4.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("add point!").id(REMOVE_BUTTON_ID).build();
+ Button bt = new Button("add point!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int serie = Integer.parseInt(tf1.getText());
@@ -195,18 +208,27 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" min ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" max ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" amount ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewPieChartApp.java 2017-02-15 15:57:39.175289363 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewPieChartApp.java 2017-02-15 15:57:39.127288915 +0300
@@ -104,7 +104,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -114,7 +115,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -150,8 +152,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -165,12 +170,19 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add item");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_VALUE_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADD_ITEM_VALUE_TEXT_FIELD_ID);
Label namedLabel = new Label(" named ");
- final TextField name = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_TEXT_FIELD_ID).build();
+ final TextField name = new TextField();
+ name.setPrefWidth(50);
+ name.setId(ADD_ITEM_TEXT_FIELD_ID);
Label atLb = new Label("at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_POSITION_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_ITEM_BUTTON_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_ITEM_POSITION_TEXT_FIELD_ID);
+ Button bt = new Button("Add!");
+ bt.setId(ADD_ITEM_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfPos.getText());
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewStackedAreaChartApp.java 2017-02-15 15:57:39.419291635 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewStackedAreaChartApp.java 2017-02-15 15:57:39.363291114 +0300
@@ -87,7 +87,8 @@
testedStackedAreaChart = getNewChart();
testedStackedAreaChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -97,7 +98,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -121,8 +123,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_AREA_INDEX_TEXTFIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_AREA_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_AREA_INDEX_TEXTFIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_AREA_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -136,18 +141,27 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" min ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" max ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" amount ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewStackedBarChartApp.java 2017-02-15 15:57:39.671293983 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/apps/NewStackedBarChartApp.java 2017-02-15 15:57:39.607293387 +0300
@@ -95,7 +95,8 @@
testedStackedBarChart = getNewChart();
testedStackedBarChart.setId(TESTED_CHART_ID);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -105,7 +106,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
//throw new UnsupportedOperationException("Not supported yet.");
@@ -129,8 +131,11 @@
public HBox getRemoveDataDialog() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -144,8 +149,9 @@
public HBox getRemoveCategoryDialog() {
HBox hb = new HBox();
Label lb = new Label("From index");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).build();
- Button bt = ButtonBuilder.create().text("Remove category!").build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ Button bt = new Button("Remove category!");
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -160,12 +166,14 @@
public HBox getAddCategoryDialog() {
HBox hb = new HBox();
Label lb = new Label("Category");
- final TextField tf = TextFieldBuilder.create().text("").prefWidth(50).build();
+ final TextField tf = new TextField("");
+ tf.setPrefWidth(50);
Label lind = new Label("to index");
- final TextField tfind = TextFieldBuilder.create().text("0").prefWidth(50).build();
+ final TextField tfind = new TextField("0");
+ tfind.setPrefWidth(50);
- Button bt = ButtonBuilder.create().text("Add!").build();
+ Button bt = new Button("Add!");
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfind.getText());
@@ -180,18 +188,27 @@
public HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add series named ");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_NAME_TEXTFIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADDED_SERIES_NAME_TEXTFIELD_ID);
Label minLabel = new Label(" min ");
- final TextField minText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID).build();
+ final TextField minText = new TextField();
+ minText.setPrefWidth(50);
+ minText.setId(ADDED_SERIES_MIN_VALUE_TEXTFIELD_ID);
Label maxLabel = new Label(" max ");
- final TextField maxText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID).build();
+ final TextField maxText = new TextField();
+ maxText.setPrefWidth(50);
+ maxText.setId(ADDED_SERIES_MAX_VALUE_TEXTFIELD_ID);
Label amountLabel = new Label(" amount ");
- final TextField amountText = TextFieldBuilder.create().prefWidth(50).id(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID).build();
+ final TextField amountText = new TextField();
+ amountText.setPrefWidth(50);
+ amountText.setId(ADDED_SERIES_DOTS_COUNT_TEXTFIELD_ID);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_SERIES_COMMAND_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_SERIES_COMMAND_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
String serieName = tf.getText();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chart/manual/PieChartManualApp.java 2017-02-15 15:57:39.935296443 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chart/manual/PieChartManualApp.java 2017-02-15 15:57:39.883295958 +0300
@@ -33,7 +33,6 @@
import javafx.scene.chart.PieChart;
import javafx.scene.Scene;
import javafx.scene.control.*;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.test.utils.CommonPropertiesScene;
import javafx.geometry.Side;
import javafx.scene.layout.HBox;
@@ -104,7 +103,7 @@
}
});
- Button hardResetButton = ButtonBuilder.create().text("Reset").build();
+ Button hardResetButton = new Button("Reset");
hardResetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/choicebox/NewChoiceBoxApp.java 2017-02-15 15:57:40.155298492 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/choicebox/NewChoiceBoxApp.java 2017-02-15 15:57:40.103298007 +0300
@@ -85,7 +85,8 @@
pane.setStyle("-fx-border-color : red;");
pane.getChildren().add(testedChoiceBox);
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/chooser/FXChooser.java 2017-02-15 15:57:40.399300765 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/chooser/FXChooser.java 2017-02-15 15:57:40.343300243 +0300
@@ -33,7 +33,6 @@
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
-import javafx.scene.control.TextFieldBuilder;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.GridPane;
import javafx.scene.text.Text;
@@ -59,8 +58,10 @@
public void start(final Stage stage) throws Exception {
try {
extensionFilter = new FileChooser.ExtensionFilter("File with extension (*.extension)", "*.extension");
- initialFileNameTextField = TextFieldBuilder.create().text("").promptText("Initial file name").build();
- titleTextField = TextFieldBuilder.create().text("").promptText("Title").build();
+ initialFileNameTextField = new TextField("");
+ initialFileNameTextField.setPromptText("Initial file name");
+ titleTextField = new TextField("");
+ titleTextField.setPromptText("Title");
errorText = new Label("No errors");
// OPEN FOLDER
--- old/functional/ControlsTests/src/javafx/scene/control/test/colorpicker/ColorPickerApp.java 2017-02-15 15:57:40.639303001 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/colorpicker/ColorPickerApp.java 2017-02-15 15:57:40.587302517 +0300
@@ -134,7 +134,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -144,7 +145,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
tb.refresh();
@@ -168,8 +170,11 @@
private HBox setColorHbox() {
HBox hb = new HBox();
Label lb = new Label("Set color");
- final TextField colorTf = TextFieldBuilder.create().prefWidth(100).id(SET_COLOR_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Set!").id(SET_COLOR_BUTTON_ID).build();
+ final TextField colorTf = new TextField();
+ colorTf.setPrefWidth(100);
+ colorTf.setId(SET_COLOR_TEXT_FIELD_ID);
+ Button bt = new Button("Set!");
+ bt.setId(SET_COLOR_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
testedColorPicker.setValue(Color.web(colorTf.getText()));
--- old/functional/ControlsTests/src/javafx/scene/control/test/combobox/ComboBoxApp.java 2017-02-15 15:57:40.883305274 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/combobox/ComboBoxApp.java 2017-02-15 15:57:40.823304715 +0300
@@ -167,21 +167,24 @@
// }
// });
- Button applyCustomSelectionModel = ButtonBuilder.create().text("Apply custom selection model").id(APPLY_CUSTOM_SELECTION_MODEL_BUTTON_ID).build();
+ Button applyCustomSelectionModel = new Button("Apply custom selection model");
+ applyCustomSelectionModel.setId(APPLY_CUSTOM_SELECTION_MODEL_BUTTON_ID);
applyCustomSelectionModel.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedComboBox.selectionModelProperty().setValue(selectionModel);
}
});
- Button applyCustomStringConverter = ButtonBuilder.create().text("Apply custom string converter").id(APPLY_CUSTOM_STRING_CONVERTER_BUTTON_ID).build();
+ Button applyCustomStringConverter = new Button("Apply custom string converter");
+ applyCustomStringConverter.setId(APPLY_CUSTOM_STRING_CONVERTER_BUTTON_ID);
applyCustomStringConverter.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedComboBox.setConverter(new CustomStringConverter());
}
});
- Button applyCustomCellFactory = ButtonBuilder.create().text("Apply custom cell factory").id(APPLY_CUSTOM_CELL_FACTORY_BUTTON_ID).build();
+ Button applyCustomCellFactory = new Button("Apply custom cell factory");
+ applyCustomCellFactory.setId(APPLY_CUSTOM_CELL_FACTORY_BUTTON_ID);
applyCustomCellFactory.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedComboBox.setCellFactory(new Callback, ListCell>() {
@@ -193,7 +196,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -203,7 +207,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
tb.refresh();
@@ -228,11 +233,8 @@
HBox resetButtonsHBox = new HBox();
resetButtonsHBox.getChildren().addAll(hardResetButton, softResetButton);
- Button setAddingElementsOnShowing = ButtonBuilder.create()
- .id(SET_ADDING_ELEMENTS_ON_SHOWING)
- .text("Set adding elements on showing")
- .build();
-
+ Button setAddingElementsOnShowing = new Button("Set adding elements on showing");
+ setAddingElementsOnShowing.setId(SET_ADDING_ELEMENTS_ON_SHOWING);
setAddingElementsOnShowing.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedComboBox.setOnShowing(new EventHandler() {
@@ -246,11 +248,8 @@
}
});
- Button restoreDefaultOnShowingHandler = ButtonBuilder.create()
- .id(RESTORE_ON_SHOWING_EVENT_HANDLER)
- .text("Restore default onShowing handler")
- .build();
-
+ Button restoreDefaultOnShowingHandler = new Button("Restore default onShowing handler");
+ restoreDefaultOnShowingHandler.setId(RESTORE_ON_SHOWING_EVENT_HANDLER);
restoreDefaultOnShowingHandler.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedComboBox.setOnShowing(new EventHandler() {
@@ -261,11 +260,8 @@
}
});
- Button populateComboBoxWithFontSizes = ButtonBuilder.create()
- .id(POPULATE_COMBOBOX_WITH_FONT_SIZES)
- .text("Populate ComboBox with font sizes")
- .build();
-
+ Button populateComboBoxWithFontSizes = new Button("Populate ComboBox with font sizes");
+ populateComboBoxWithFontSizes.setId(POPULATE_COMBOBOX_WITH_FONT_SIZES);
populateComboBoxWithFontSizes.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
@@ -317,10 +313,15 @@
private HBox getAddItemHBox() {
HBox hb = new HBox();
Label lb = new Label("Add item");
- final TextField tf = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_TEXT_FIELD_ID).build();
+ final TextField tf = new TextField();
+ tf.setPrefWidth(50);
+ tf.setId(ADD_ITEM_TEXT_FIELD_ID);
Label atLb = new Label("at pos");
- final TextField tfPos = TextFieldBuilder.create().prefWidth(50).id(ADD_ITEM_POSITION_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_ITEM_BUTTON_ID).build();
+ final TextField tfPos = new TextField();
+ tfPos.setPrefWidth(50);
+ tfPos.setId(ADD_ITEM_POSITION_TEXT_FIELD_ID);
+ Button bt = new Button("Add!");
+ bt.setId(ADD_ITEM_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tfPos.getText());
@@ -334,8 +335,11 @@
private HBox getRemoveItemHBox() {
HBox hb = new HBox();
Label lb = new Label("From position");
- final TextField tf = TextFieldBuilder.create().text("0").prefWidth(50).id(REMOVE_ITEM_POS_TEXT_FIELD_ID).build();
- Button bt = ButtonBuilder.create().text("Remove!").id(REMOVE_BUTTON_ID).build();
+ final TextField tf = new TextField("0");
+ tf.setPrefWidth(50);
+ tf.setId(REMOVE_ITEM_POS_TEXT_FIELD_ID);
+ Button bt = new Button("Remove!");
+ bt.setId(REMOVE_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
int index = Integer.parseInt(tf.getText());
@@ -349,7 +353,8 @@
private HBox getSetItemsNullHBox() {
HBox hb = new HBox();
- Button bt = ButtonBuilder.create().text("Set items null").id(SET_ITEMS_NULL_BUTTON_ID).build();
+ Button bt = new Button("Set items null");
+ bt.setId(SET_ITEMS_NULL_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
((ComboBox) testedComboBox).setItems(null);
--- old/functional/ControlsTests/src/javafx/scene/control/test/datepicker/DatePickerApp.java 2017-02-15 15:57:41.147307734 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/datepicker/DatePickerApp.java 2017-02-15 15:57:41.091307212 +0300
@@ -37,7 +37,6 @@
import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.DateCell;
import javafx.scene.control.DatePicker;
import javafx.scene.control.test.utils.CommonPropertiesScene;
@@ -126,7 +125,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -136,7 +136,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
propertiesTable.refresh();
--- old/functional/ControlsTests/src/javafx/scene/control/test/fxcanvas/FXCanvasBrowserApp.java 2017-02-15 15:57:41.391310007 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/fxcanvas/FXCanvasBrowserApp.java 2017-02-15 15:57:41.331309448 +0300
@@ -132,8 +132,6 @@
}
public static void main(String[] args) {
- System.setProperty("proxyHost", "www-proxy.ru.oracle.com");
- System.setProperty("proxyPort", "80");
try {
startAndWaitShell();
} catch (InterruptedException ex) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/labeleds/newapps/LabeledsApp.java 2017-02-15 15:57:41.619312131 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/labeleds/newapps/LabeledsApp.java 2017-02-15 15:57:41.567311647 +0300
@@ -29,7 +29,6 @@
import javafx.geometry.Insets;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.Label;
import javafx.scene.control.Labeled;
import javafx.scene.control.test.utils.CommonPropertiesScene;
@@ -87,7 +86,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/labeleds/newapps/TextNodeApp.java 2017-02-15 15:57:41.855314330 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/labeleds/newapps/TextNodeApp.java 2017-02-15 15:57:41.799313808 +0300
@@ -36,7 +36,6 @@
import javafx.geometry.Orientation;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Label;
import javafx.scene.control.Separator;
@@ -103,7 +102,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/menubar/NewMenuApp.java 2017-02-15 15:57:42.099316603 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/menubar/NewMenuApp.java 2017-02-15 15:57:42.035316007 +0300
@@ -79,7 +79,8 @@
private void prepareScene() {
pane = new Pane();
- testedMenuBar = MenuBarBuilder.create().id(TESTED_MENUBAR_ID).build();
+ testedMenuBar = new MenuBar();
+ testedMenuBar.setId(TESTED_MENUBAR_ID);
PropertiesTable tb = new PropertiesTable(testedMenuBar);
PropertyTablesFactory.explorePropertiesList(testedMenuBar, tb);
@@ -97,7 +98,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
@@ -136,10 +138,15 @@
private HBox getAddTextFieldHbox() {
HBox hb = new HBox();
Label lb = new Label("Add Menu at pos");
- final TextField tf = TextFieldBuilder.create().id(MENUBAR_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
- final TextField nameTF = TextFieldBuilder.create().id(MENUBAR_ADD_NAME_TEXT_FIELD_ID).text("Menu").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(MENUBAR_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
+ final TextField nameTF = new TextField("Menu");
+ nameTF.setId(MENUBAR_ADD_NAME_TEXT_FIELD_ID);
+ nameTF.setPrefWidth(40);
- Button bt = ButtonBuilder.create().text("Add!").id(ADD_MENU_BUTTON_ID).build();
+ Button bt = new Button("Add!");
+ bt.setId(ADD_MENU_BUTTON_ID);
bt.setOnAction(new EventHandler() {
public void handle(Event t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/pagination/PaginationApp.java 2017-02-15 15:57:42.343318877 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/pagination/PaginationApp.java 2017-02-15 15:57:42.279318280 +0300
@@ -29,7 +29,6 @@
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.Label;
import javafx.scene.control.Pagination;
import javafx.scene.control.test.utils.*;
@@ -110,7 +109,8 @@
tb.addDoublePropertyLine(testedPagination.minHeightProperty(), -100, 300, 50, testedPagination);
tb.addDoublePropertyLine(testedPagination.minWidthProperty(), -100, 300, 50, testedPagination);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -120,7 +120,8 @@
}
});
- Button setBulletPageIndicatorButton = ButtonBuilder.create().id(SET_BULLET_PAGE_INDICATOR_BUTTON_ID).text("Set bullet").build();
+ Button setBulletPageIndicatorButton = new Button("Set bullet");
+ setBulletPageIndicatorButton.setId(SET_BULLET_PAGE_INDICATOR_BUTTON_ID);
setBulletPageIndicatorButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
//testedPagination.setStyle(Pagination.STYLE_CLASS_BULLET);
@@ -128,14 +129,16 @@
}
});
- Button setPageCountToIndeterminateButton = ButtonBuilder.create().id(SET_PAGE_COUNT_TO_INDETERMINATE_BUTTON_ID).text("Set indeterminate\n page count").build();
+ Button setPageCountToIndeterminateButton = new Button("Set indeterminate\n page count");
+ setPageCountToIndeterminateButton.setId(SET_PAGE_COUNT_TO_INDETERMINATE_BUTTON_ID);
setPageCountToIndeterminateButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedPagination.setPageCount(Pagination.INDETERMINATE);
}
});
- 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() {
@Override
public void handle(ActionEvent t) {
@@ -148,7 +151,8 @@
}
});
- Button setNewPageFactory = ButtonBuilder.create().id(SET_NEW_PAGE_FACTORY_BUTTON_ID).text("Set new page factory").build();
+ Button setNewPageFactory = new Button("Set new page factory");
+ setNewPageFactory.setId(SET_NEW_PAGE_FACTORY_BUTTON_ID);
setNewPageFactory.setOnAction(new EventHandler() {
@Override
public void handle(ActionEvent t) {
@@ -170,7 +174,8 @@
}
});
- Button setOldPageFactory = ButtonBuilder.create().id(SET_OLD_PAGE_FACTORY_BUTTON_ID).text("Set old page factory").build();
+ Button setOldPageFactory = new Button("Set old page factory");
+ setOldPageFactory.setId(SET_OLD_PAGE_FACTORY_BUTTON_ID);
setOldPageFactory.setOnAction(new EventHandler() {
@Override
public void handle(ActionEvent t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/scrollbar/ScrollBarApp.java 2017-02-15 15:57:42.551320814 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/scrollbar/ScrollBarApp.java 2017-02-15 15:57:42.495320292 +0300
@@ -66,13 +66,16 @@
@Override
final protected void prepareScene() {
- testedScrollBar = ScrollBarBuilder.create().id(TESTED_SCROLLBAR_ID).build();
+ testedScrollBar = new ScrollBar();
+ testedScrollBar.setFocusTraversable(true);
+ testedScrollBar.setId(TESTED_SCROLLBAR_ID);
tb = new PropertiesTable(testedScrollBar);
PropertyTablesFactory.explorePropertiesList(testedScrollBar, tb);
SpecialTablePropertiesProvider.provideForControl(testedScrollBar, tb);
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/separator/SeparatorApp.java 2017-02-15 15:57:42.787323013 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/separator/SeparatorApp.java 2017-02-15 15:57:42.731322491 +0300
@@ -73,7 +73,8 @@
@Override
final protected void prepareScene() {
pane = new Pane();
- testedSeparator = SeparatorBuilder.create().id(TESTED_SEPARATOR_ID).build();
+ testedSeparator = new Separator();
+ testedSeparator.setId(TESTED_SEPARATOR_ID);
tb = new PropertiesTable(testedSeparator);
PropertyTablesFactory.explorePropertiesList(testedSeparator, tb);
@@ -90,7 +91,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/slider/SliderNewApp.java 2017-02-15 15:57:43.039325361 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/slider/SliderNewApp.java 2017-02-15 15:57:42.979324802 +0300
@@ -28,9 +28,7 @@
import javafx.event.EventHandler;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.Slider;
-import javafx.scene.control.SliderBuilder;
import javafx.scene.control.test.utils.CommonPropertiesScene;
import javafx.scene.control.test.utils.ptables.PropertiesTable;
import javafx.scene.control.test.utils.ptables.PropertyTablesFactory;
@@ -76,13 +74,15 @@
@Override
final protected void prepareScene() {
- testedSlider = SliderBuilder.create().id(TESTED_SLIDER_ID).build();
+ testedSlider = new Slider();
+ testedSlider.setId(TESTED_SLIDER_ID);
tb = new PropertiesTable(testedSlider);
PropertyTablesFactory.explorePropertiesList(testedSlider, tb);
SpecialTablePropertiesProvider.provideForControl(testedSlider, tb);
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -92,7 +92,8 @@
}
});
- Button setCustomConverter = ButtonBuilder.create().id(APPLY_CUSTOM_LABEL_FORMATTER).text("ApplyCsustomConverter").build();
+ Button setCustomConverter = new Button("ApplyCsustomConverter");
+ setCustomConverter.setId(APPLY_CUSTOM_LABEL_FORMATTER);
setCustomConverter.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
testedSlider.setLabelFormatter(new CustomConverter());
--- old/functional/ControlsTests/src/javafx/scene/control/test/splitpane/SplitPaneApp.java 2017-02-15 15:57:43.283327634 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/splitpane/SplitPaneApp.java 2017-02-15 15:57:43.227327112 +0300
@@ -76,14 +76,17 @@
private void prepareScene() {
pane = new Pane();
- testedSplitPane = SplitPaneBuilder.create().id(TESTED_SPLIPANE_ID).build();
+ testedSplitPane = new SplitPane();
+ testedSplitPane.setId(TESTED_SPLIPANE_ID);
PropertiesTable tb = new PropertiesTable(testedSplitPane);
PropertyTablesFactory.explorePropertiesList(testedSplitPane, tb);
final TabPaneWithControl tabPane = new TabPaneWithControl("Accordion", tb);
- final TextField tf = TextFieldBuilder.create().id(SPLITPANE_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(SPLITPANE_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
HBox nodeshb = new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction() {
@@ -106,7 +109,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/tableview/NewTableViewApp.java 2017-02-15 15:57:43.531329944 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/tableview/NewTableViewApp.java 2017-02-15 15:57:43.479329460 +0300
@@ -24,10 +24,10 @@
*/
package javafx.scene.control.test.tableview;
-import com.sun.javafx.scene.control.skin.NestedTableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableHeaderRow;
-import com.sun.javafx.scene.control.skin.TableViewSkin;
+import javafx.scene.control.skin.NestedTableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TableViewSkin;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -66,6 +66,8 @@
import static javafx.commons.Consts.*;
import static javafx.commons.Consts.Cell.*;
import javafx.scene.Node;
+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 javafx.scene.control.test.utils.ComponentsFactory.MultipleIndexFormComponent.MultipleIndicesAction;
import static org.junit.Assert.assertTrue;
@@ -129,7 +131,8 @@
tabPane = new TabPaneWithControl("TableView", tb);
tabPane.setMinSize(1000, 1000);
- 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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -139,7 +142,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
TableView newOne = new TableView();
@@ -327,7 +331,7 @@
public String toString() {
return "CUSTOM " + super.toString();
}
-
+/*
@Override
protected TableHeaderRow createTableHeaderRow() {
return new TableHeaderRow(this) {
@@ -350,6 +354,7 @@
}
};
}
+ */
});
}
});
@@ -456,10 +461,8 @@
hb.getChildren().addAll(cmbEditors, chbCustom, btnSetEditor);
- 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() {
public void handle(ActionEvent t) {
@@ -896,4 +899,5 @@
}
return testData;
}
-}
\ No newline at end of file
+}
+
--- old/functional/ControlsTests/src/javafx/scene/control/test/tabpane/NewTabPaneApp.java 2017-02-15 15:57:43.803332479 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/tabpane/NewTabPaneApp.java 2017-02-15 15:57:43.727331770 +0300
@@ -91,13 +91,15 @@
pane.setPrefSize(220, 220);
pane.setStyle("-fx-border-color : red;");
- testedTabPane = TabPaneBuilder.create().id(TESTED_TABPANE_ID).build();
+ testedTabPane = new TabPane();
+ testedTabPane.setId(TESTED_TABPANE_ID);
pane.getChildren().add(testedTabPane);
tb = new PropertiesTable(testedTabPane);
PropertyTablesFactory.explorePropertiesList(testedTabPane, tb);
- Button btnResetHardly = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button btnResetHardly = new Button("Reset");
+ btnResetHardly.setId(RESET_BUTTON_ID);
btnResetHardly.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -107,7 +109,8 @@
}
});
- Button btnResetSoftly = ButtonBuilder.create().id(RESET_SOFTLY_BUTTON_ID).text("Reset softly").build();
+ Button btnResetSoftly = new Button("Reset softly");
+ btnResetSoftly.setId(RESET_SOFTLY_BUTTON_ID);
btnResetSoftly.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
@@ -176,20 +179,16 @@
grid.getColumnConstraints().addAll(column1, column2);
//row #1
grid.add(new Label("Tab ID"), 0, 0);
- final TextField newTabId = TextFieldBuilder.create()
- .id(NEW_TAB_ID_TEXT_FIELD_ID)
- .text("ID")
- .prefWidth(40d)
- .build();
+ final TextField newTabId = new TextField("ID");
+ newTabId.setPrefWidth(40d);
+ newTabId.setId(NEW_TAB_ID_TEXT_FIELD_ID);
grid.add(newTabId, 1, 0);
//row #2
grid.add(new Label("Index"), 0, 1);
- final TextField newTabIndex = TextFieldBuilder.create()
- .id(TABPANE_ADD_INDEX_TEXT_FIELD_ID)
- .text("0")
- .prefWidth(40)
- .build();
+ final TextField newTabIndex = new TextField("0");
+ newTabIndex.setId(TABPANE_ADD_INDEX_TEXT_FIELD_ID);
+ newTabIndex.setPrefWidth(40);
grid.add(newTabIndex, 1, 1);
//row #3
@@ -206,10 +205,7 @@
* If true then there will be created a properties pane
* for tab content each time a tab is added
*/
- final CheckBox createPropsTab = CheckBoxBuilder
- .create()
- .text("Create additional panes\n with content properties")
- .build();
+ final CheckBox createPropsTab = new CheckBox("Create additional panes\n with content properties");
grid.add(createPropsTab, 0, 3, 2, 1);
//row #5
@@ -217,11 +213,8 @@
* If true then there will be created a properties pane
* for tab content each time a tab is added
*/
- final CheckBox vetoOnClose = CheckBoxBuilder
- .create()
- .text("Veto tab request on close.")
- .id(VETO_CHECKBOX_ID)
- .build();
+ final CheckBox vetoOnClose = new CheckBox("Veto tab request on close.");
+ vetoOnClose.setId(VETO_CHECKBOX_ID);
grid.add(vetoOnClose, 0, 4, 2, 1);
//row #6
--- old/functional/ControlsTests/src/javafx/scene/control/test/tabpane/TabPaneApp2.java 2017-02-15 15:57:44.047334752 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/tabpane/TabPaneApp2.java 2017-02-15 15:57:43.991334230 +0300
@@ -32,7 +32,7 @@
import javafx.event.EventHandler;
import javafx.geometry.Side;
import javafx.scene.Scene;
-import javafx.scene.control.ButtonBuilder;
+import javafx.scene.control.Button;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.Label;
@@ -113,34 +113,34 @@
error = new Label();
error.setId(ERROR_ID);
- controls.getChildren().add(
- ButtonBuilder.create()
- .text(CLEAR_BTN_ID).id(CLEAR_BTN_ID)
- .onAction(new EventHandler() {
- public void handle(ActionEvent t) {
- tabPane.getTabs().clear();
- }
- }).build());
-
- controls.getChildren().add(
- ButtonBuilder.create()
- .text(RESET_BTN_ID).id(RESET_BTN_ID)
- .onAction(new EventHandler() {
-
- public void handle(ActionEvent t) {
- reset();
- }
- }).build());
-
- controls.getChildren().add(
- ButtonBuilder.create()
- .text(ADD_SINGLE_BTN_ID).id(ADD_SINGLE_BTN_ID)
- .onAction(new EventHandler() {
-
- public void handle(ActionEvent t) {
- tabPane.getTabs().add(new NamedTab(TAB_ITEM + tabPane.getTabs().size()));
- }
- }).build());
+ Button temp;
+
+ temp = new Button(CLEAR_BTN_ID);
+ temp.setId(CLEAR_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ tabPane.getTabs().clear();
+ }
+ });
+ controls.getChildren().add(temp);
+
+ temp = new Button(RESET_BTN_ID);
+ temp.setId(RESET_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ reset();
+ }
+ });
+ controls.getChildren().add(temp);
+
+ temp = new Button(ADD_SINGLE_BTN_ID);
+ temp.setId(ADD_SINGLE_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ tabPane.getTabs().add(new NamedTab(TAB_ITEM + tabPane.getTabs().size()));
+ }
+ });
+ controls.getChildren().add(temp);
HBox add_position_box = new HBox(5);
controls.getChildren().add(add_position_box);
@@ -148,15 +148,14 @@
final TextField add_position = new TextField("0");
add_position.setId(ADD_POS_EDIT_ID);
- add_position_box.getChildren().add(
- ButtonBuilder.create()
- .text(ADD_SINGLE_AT_POS_BTN_ID).id(ADD_SINGLE_AT_POS_BTN_ID)
- .onAction(new EventHandler() {
-
- public void handle(ActionEvent t) {
- tabPane.getTabs().add(new NamedTab("Tab " + tabPane.getTabs().size()));
- }
- }).build());
+ temp = new Button(ADD_SINGLE_AT_POS_BTN_ID);
+ temp.setId(ADD_SINGLE_AT_POS_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ tabPane.getTabs().add(new NamedTab("Tab " + tabPane.getTabs().size()));
+ }
+ });
+ add_position_box.getChildren().add(temp);
final Label add_label = new Label("at");
add_position_box.getChildren().add(add_label);
@@ -170,17 +169,16 @@
final TextField disable_position = new TextField("0");
disable_position.setId(DISABLE_POS_EDIT_ID);
- disable_position_box.getChildren().add(
- ButtonBuilder.create()
- .text(DISABLE_SINGLE_AT_POS_BTN_ID).id(DISABLE_SINGLE_AT_POS_BTN_ID)
- .onAction(new EventHandler() {
-
- public void handle(ActionEvent t) {
- Integer pos = Integer.valueOf(disable_position.getText());
- Tab tab = tabPane.getTabs().get(pos.intValue());
- tab.setDisable(!tab.isDisable());
- }
- }).build());
+ temp = new Button(DISABLE_SINGLE_AT_POS_BTN_ID);
+ temp.setId(DISABLE_SINGLE_AT_POS_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ Integer pos = Integer.valueOf(disable_position.getText());
+ Tab tab = tabPane.getTabs().get(pos.intValue());
+ tab.setDisable(!tab.isDisable());
+ }
+ });
+ disable_position_box.getChildren().add(temp);
final Label disable_label = new Label("at");
disable_position_box.getChildren().add(disable_label);
@@ -194,15 +192,14 @@
final TextField remove_position = new TextField("0");
remove_position.setId(REMOVE_POS_EDIT_ID);
- remove_position_box.getChildren().add(
- ButtonBuilder.create()
- .text(REMOVE_SINGLE_AT_POS_BTN_ID).id(REMOVE_SINGLE_AT_POS_BTN_ID)
- .onAction(new EventHandler() {
-
- public void handle(ActionEvent t) {
- tabPane.getTabs().remove(Integer.valueOf(remove_position.getText()).intValue());
- }
- }).build());
+ temp = new Button(REMOVE_SINGLE_AT_POS_BTN_ID);
+ temp.setId(REMOVE_SINGLE_AT_POS_BTN_ID);
+ temp.setOnAction(new EventHandler() {
+ public void handle(ActionEvent t) {
+ tabPane.getTabs().remove(Integer.valueOf(remove_position.getText()).intValue());
+ }
+ });
+ remove_position_box.getChildren().add(temp);
final Label remove_label = new Label("at");
remove_position_box.getChildren().add(remove_label);
--- old/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextAreaPropertiesApp.java 2017-02-15 15:57:44.287336988 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextAreaPropertiesApp.java 2017-02-15 15:57:44.235336503 +0300
@@ -28,9 +28,7 @@
import javafx.event.EventHandler;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
import javafx.scene.layout.Pane;
import test.javaclient.shared.Utils;
@@ -72,7 +70,8 @@
@Override
public void addControlSpecificButtons(Pane pane) {
- Button button = ButtonBuilder.create().id(ADD_TEXT_BUTTON_ID).text("Add much text").build();
+ Button button = new Button("Add much text");
+ button.setId(ADD_TEXT_BUTTON_ID);
button.setOnAction(new EventHandler() {
public void handle(Event t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextControlApp.java 2017-02-15 15:57:44.527339224 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextControlApp.java 2017-02-15 15:57:44.471338702 +0300
@@ -81,7 +81,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("RESET").build();
+ Button resetButton = new Button("RESET");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
tb.refresh();
--- old/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextFieldPropertiesApp.java 2017-02-15 15:57:44.775341534 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextFieldPropertiesApp.java 2017-02-15 15:57:44.719341012 +0300
@@ -29,8 +29,8 @@
import javafx.event.EventHandler;
import javafx.scene.Scene;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.TextField;
+import static javafx.scene.control.test.textinput.TextControlApp.ADD_TEXT_BUTTON_ID;
import javafx.scene.layout.Pane;
import test.javaclient.shared.Utils;
@@ -79,7 +79,8 @@
@Override
public void addControlSpecificButtons(Pane pane) {
- Button setOnActionListenerButton = ButtonBuilder.create().id(SET_ON_ACTION_BUTTON_ID).text("Set on action listener").build();
+ Button setOnActionListenerButton = new Button("Set on action listener");
+ setOnActionListenerButton.setId(SET_ON_ACTION_BUTTON_ID);
setOnActionListenerButton.setOnAction(new EventHandler() {
public void handle(Event t) {
@@ -92,7 +93,8 @@
}
});
- Button addTextButton = ButtonBuilder.create().id(ADD_TEXT_BUTTON_ID).text("Add \"sometext\"").build();
+ Button addTextButton = new Button("Add \"sometext\"");
+ addTextButton.setId(ADD_TEXT_BUTTON_ID);
addTextButton.setOnAction(new EventHandler() {
public void handle(Event t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextInputExternalWrap.java 2017-02-15 15:57:45.019343807 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/textinput/TextInputExternalWrap.java 2017-02-15 15:57:44.963343286 +0300
@@ -25,7 +25,6 @@
package javafx.scene.control.test.textinput;
-import com.sun.javafx.scene.text.HitInfo;
import javafx.scene.Node;
import javafx.scene.control.TextInputControl;
import javafx.scene.control.test.textinput.TextInputChanger.TextInputControlWrapInterface;
--- old/functional/ControlsTests/src/javafx/scene/control/test/toolbar/NewToolbarApp.java 2017-02-15 15:57:45.255346006 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/toolbar/NewToolbarApp.java 2017-02-15 15:57:45.199345484 +0300
@@ -79,14 +79,17 @@
private void prepareScene() {
pane = new Pane();
- testedToolbar = ToolBarBuilder.create().id(TESTED_TOOLBAR_ID).build();
+ testedToolbar = new ToolBar();
+ testedToolbar.setId(TESTED_TOOLBAR_ID);
PropertiesTable tb = new PropertiesTable(testedToolbar);
PropertyTablesFactory.explorePropertiesList(testedToolbar, tb);
final TabPaneWithControl tabPane = new TabPaneWithControl("ToolBar", tb);
- final TextField tf = TextFieldBuilder.create().id(TOOLBAR_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(TOOLBAR_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
HBox nodeshb = new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction() {
@@ -109,7 +112,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/tooltip/NewTooltipApp.java 2017-02-15 15:57:45.487348168 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/tooltip/NewTooltipApp.java 2017-02-15 15:57:45.431347646 +0300
@@ -73,7 +73,8 @@
@Override
final protected void prepareScene() {
pane = new Pane();
- testedTooltip = TooltipBuilder.create().id(TESTED_TOOLTIP_ID).build();
+ testedTooltip = new Tooltip();
+ testedTooltip.setId(TESTED_TOOLTIP_ID);
tb = new PropertiesTable(testedTooltip);
PropertyTablesFactory.explorePropertiesList(testedTooltip, tb);
@@ -93,7 +94,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
--- old/functional/ControlsTests/src/javafx/scene/control/test/treetable/TreeTableNewApp.java 2017-02-15 15:57:45.743350553 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/treetable/TreeTableNewApp.java 2017-02-15 15:57:45.687350031 +0300
@@ -24,10 +24,10 @@
*/
package javafx.scene.control.test.treetable;
-import com.sun.javafx.scene.control.skin.NestedTableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableHeaderRow;
-import com.sun.javafx.scene.control.skin.TreeTableViewSkin;
+import javafx.scene.control.skin.NestedTableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TreeTableViewSkin;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@ -54,6 +54,7 @@
import javafx.scene.control.cell.ComboBoxTreeTableCell;
import javafx.scene.control.cell.TextFieldTreeTableCell;
import javafx.scene.control.test.tableview.NewTableViewApp;
+import static javafx.scene.control.test.treetable.ResetButtonNames.HARD_RESET_BUTTON_ID;
import javafx.scene.control.test.treeview.TreeViewConstants;
import javafx.scene.control.test.utils.CommonPropertiesScene;
import javafx.scene.control.test.utils.ComponentsFactory.MultipleIndexFormComponent;
@@ -193,7 +194,8 @@
hb.setPadding(new Insets(5, 5, 5, 5));
hb.setStyle("-fx-border-color : green;");
- Button resetButton = ButtonBuilder.create().id(HARD_RESET_BUTTON_ID).text("Reset").build();
+ Button resetButton = new Button("Reset");
+ resetButton.setId(HARD_RESET_BUTTON_ID);
resetButton.setOnAction(new EventHandler() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -628,7 +630,7 @@
public String toString() {
return "CUSTOM " + super.toString();
}
-
+/*
@Override
protected TableHeaderRow createTableHeaderRow() {
return new TableHeaderRow(this) {
@@ -651,6 +653,7 @@
}
};
}
+*/
});
}
});
@@ -707,8 +710,11 @@
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() {
public void handle(ActionEvent t) {
@@ -722,8 +728,12 @@
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() {
public void handle(ActionEvent t) {
@@ -739,11 +749,8 @@
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() {
final EventHandler eventHandlerOnEditStart = new EventHandler() {
public void handle(Event t) {
@@ -780,11 +787,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
for (Object obj : testedControl.getColumns()) {
--- old/functional/ControlsTests/src/javafx/scene/control/test/treeview/TreeViewNewApp.java 2017-02-15 15:57:45.991352863 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/treeview/TreeViewNewApp.java 2017-02-15 15:57:45.939352378 +0300
@@ -33,6 +33,8 @@
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;
@@ -131,7 +133,8 @@
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() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
@@ -141,7 +144,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
refreshProcedure(2);
@@ -403,8 +407,11 @@
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() {
public void handle(ActionEvent t) {
@@ -418,8 +425,12 @@
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() {
public void handle(ActionEvent t) {
@@ -434,11 +445,8 @@
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() {
public void handle(ActionEvent t) {
testedControl.setOnEditStart(new EventHandler() {
@@ -461,11 +469,8 @@
}
});
- 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() {
public void handle(ActionEvent t) {
testedControl.setCellFactory(new Callback, TreeCell>() {
--- old/functional/ControlsTests/src/javafx/scene/control/test/utils/ColorHelper.java 2017-02-15 15:57:46.231355099 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/utils/ColorHelper.java 2017-02-15 15:57:46.179354614 +0300
@@ -30,9 +30,7 @@
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.TextArea;
-import javafx.scene.control.TextAreaBuilder;
import javafx.scene.control.TextField;
-import javafx.scene.control.TextFieldBuilder;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.stage.Stage;
@@ -55,11 +53,15 @@
@Override
public void start(final Stage stage) throws Exception {
- final TextField xField = TextFieldBuilder.create().promptText("x").build();
- final TextField yField = TextFieldBuilder.create().promptText("y").build();
+ final TextField xField = new TextField();
+ xField.setPromptText("x");
+ final TextField yField = new TextField();
+ yField.setPromptText("y");
- final TextArea awtField = TextAreaBuilder.create().promptText("awt").build();
- final TextArea glassField = TextAreaBuilder.create().promptText("glass").build();
+ final TextArea awtField = new TextArea();
+ awtField.setPromptText("awt");
+ final TextArea glassField = new TextArea();
+ glassField.setPromptText("glass");
Button act = new Button("Get colors");
act.setOnAction(new EventHandler() {
--- old/functional/ControlsTests/src/javafx/scene/control/test/utils/ComponentsFactory.java 2017-02-15 15:57:46.463357260 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/utils/ComponentsFactory.java 2017-02-15 15:57:46.411356776 +0300
@@ -65,8 +65,11 @@
VBox vb = new VBox();
HBox hb1 = new HBox();
- Button button = ButtonBuilder.create().id(FORM_BUTTON_ID).text("Press me").build();
- final TextField tf1 = TextFieldBuilder.create().id(FORM_CLICK_TEXT_FIELD_ID).prefWidth(50).text("0").build();
+ Button button = new Button("Press me");
+ button.setId(FORM_BUTTON_ID);
+ final TextField tf1 = new TextField("0");
+ tf1.setId(FORM_CLICK_TEXT_FIELD_ID);
+ tf1.setPrefWidth(50);
button.setOnAction((ActionEvent t) -> {
tf1.setText(String.valueOf(Integer.parseInt(tf1.getText()) + 1));
});
@@ -76,13 +79,19 @@
ScrollBar sb = new ScrollBar();
sb.setMax(10);
sb.setId(FORM_SCROLLBAR_ID);
- final TextField tf2 = TextFieldBuilder.create().id(FORM_SCROLL_TEXT_FIELD_ID).prefWidth(50).text("0").build();
+ final TextField tf2 = new TextField("0");
+ tf2.setId(FORM_SCROLL_TEXT_FIELD_ID);
+ tf2.setPrefWidth(50);
sb.addEventHandler(ScrollEvent.ANY, (ScrollEvent t) -> {
tf2.setText(String.valueOf(Integer.parseInt(tf2.getText()) + 1));
});
hb2.getChildren().addAll(sb, tf2);
- TextArea ta = TextAreaBuilder.create().minHeight(50).prefHeight(100).prefWidth(50).id(FORM_TEXT_AREA_ID).build();
+ TextArea ta = new TextArea();
+ ta.setMinHeight(50);
+ ta.setPrefHeight(100);
+ ta.setPrefWidth(50);
+ ta.setId(FORM_TEXT_AREA_ID);
for (int i = 0; i < 15; i++) {
ta.appendText("text" + i + "\n");
}
--- old/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/AbstractPropertyValueSetter.java 2017-02-15 15:57:46.731359757 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/AbstractPropertyValueSetter.java 2017-02-15 15:57:46.643358937 +0300
@@ -29,7 +29,6 @@
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
import javafx.scene.control.Control;
import javafx.scene.control.Label;
import static javafx.scene.control.test.utils.ptables.StaticLogger.*;
@@ -72,7 +71,9 @@
getChildren().addAll(new Label(labelDescription.toUpperCase().substring(0, Math.min(15, labelDescription.length()) - 1)), leadingControl, binding.getVisualRepresentation());
if (btype == BindingType.UNIDIRECTIONAL) {
- Button setButton = ButtonBuilder.create().text("set").minWidth(38).id(SET_PREFIX + listeningProperty.getName().toUpperCase()).build();
+ Button setButton = new Button("set");
+ setButton.setMinWidth(38);
+ setButton.setId(SET_PREFIX + listeningProperty.getName().toUpperCase());
setAction = new EventHandler() {
public void handle(ActionEvent t) {
//bindingTB.setSelected(false);I think, that is not obligative.
--- old/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/BooleanPropertyValueSetter.java 2017-02-15 15:57:46.959361881 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/BooleanPropertyValueSetter.java 2017-02-15 15:57:46.907361397 +0300
@@ -27,7 +27,6 @@
import javafx.beans.property.Property;
import javafx.scene.Node;
import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleButtonBuilder;
import static javafx.scene.control.test.utils.ptables.StaticLogger.*;
/**
@@ -37,7 +36,7 @@
*/
public class BooleanPropertyValueSetter extends AbstractPropertyValueSetter {
- private ToggleButton tb = ToggleButtonBuilder.create().text("false").build();
+ private ToggleButton tb = new ToggleButton("false");
public BooleanPropertyValueSetter(Property listeningProperty, BindingType btype, Object testedControl) {
try {
--- old/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/NodeControllerFactory.java 2017-02-15 15:57:47.199364117 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/utils/ptables/NodeControllerFactory.java 2017-02-15 15:57:47.139363558 +0300
@@ -89,7 +89,9 @@
@Override
public Node getForNode(final ToolBar toolBar, final TabPaneWithControl tabPane) {
- final TextField tf = TextFieldBuilder.create().id(TOOLBAR_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(TOOLBAR_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
this.getChildren().addAll(new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction() {
@Override
@@ -114,8 +116,12 @@
@Override
public Node getForNode(final Menu menu, final TabPaneWithControl tabPane) {
- final TextField tf = TextFieldBuilder.create().id(MENU_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
- final TextField nameTF = TextFieldBuilder.create().id(MENU_ADD_NAME_TEXT_FIELD_ID).text("Menu").prefWidth(40).build();
+ final TextField tf = new TextField("0");
+ tf.setId(MENU_ADD_INDEX_TEXT_FIELD_ID);
+ tf.setPrefWidth(40);
+ final TextField nameTF = new TextField("Menu");
+ nameTF.setId(MENU_ADD_NAME_TEXT_FIELD_ID);
+ nameTF.setPrefWidth(40);
this.getChildren().addAll(new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction
-
\ No newline at end of file
+
--- old/tools/FxTestRunner/run_javatest_macro.xml 2017-02-15 15:58:10.107577548 +0300
+++ new/tools/FxTestRunner/run_javatest_macro.xml 2017-02-15 15:58:10.055577064 +0300
@@ -28,9 +28,14 @@
+
+
+
+
+
@@ -66,6 +71,11 @@
+
+
+
+
+
@@ -77,17 +87,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -95,9 +108,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -129,11 +153,14 @@
-
+
+
+
+
@@ -156,6 +183,9 @@
+
+
+
@@ -172,6 +202,9 @@
+
+
+
@@ -189,13 +222,13 @@
-
-
+
+
-
-
+
+
tests.testFile=${testlist.path}
--- old/tools/FxTestRunner/src/client/test/runner/BasicFXInterview.java 2017-02-15 15:58:10.395580232 +0300
+++ new/tools/FxTestRunner/src/client/test/runner/BasicFXInterview.java 2017-02-15 15:58:10.287579226 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
package client.test.runner;
+import static client.test.runner.InterviewUtils.*;
import client.test.runner.interview.LookAndFeelQuestion;
import client.test.runner.interview.PipelineGroupQuestion;
import client.util.CtrUtils;
@@ -127,6 +128,21 @@
/**
*
*/
+ public final static String ADD_EXPORTS_PARAM_NAME = "addExports";
+
+ /**
+ *
+ */
+ public final static String XPATCH_PARAM_NAME = "XPatch";
+
+ /**
+ *
+ */
+ public final static String ENABLE_ADD_EXPORTS_PARAM_NAME = "addExportsEnabled";
+
+ /**
+ *
+ */
public final static String VM_OPTIONS_PARAM_NAME = "vmOptions";
/**
@@ -209,6 +225,10 @@
return qJavaPath.getValue();
}
+ public String getXPatch() {
+ return qXPatch.getValue();
+ }
+
/**
*
* @return
@@ -529,8 +549,8 @@
@Override
public void clear() {
- setValue(JAVA_DEF);
- }
+ setValue(JAVA_DEF);
+ }
@Override
public Question getNext() {
@@ -730,7 +750,7 @@
@Override
public String getText() {
- return "Proxy settings in format: host:port\nE.g. www-proxy.us.oracle.com:80";
+ return "Proxy settings in format: host:port\nE.g. proxy.example.com:80";
}
@Override
@@ -742,7 +762,7 @@
public Question getNext() {
String val = getValue();
if (val == null || val.trim().length() == 0 || CtrUtils.getProxyUrl(val) != null) {
- return qVmOptions;
+ return qXPatch;
} else {
return null;
}
@@ -763,20 +783,88 @@
private LookAndFeelQuestion qLookAndFeelGroup = new LookAndFeelQuestion (this, qProxy);
private ChoiceQuestion qPipelineGroup = new PipelineGroupQuestion (this, getLastQuestion());
+ private StringQuestion qXPatch = new StringQuestion(this, XPATCH_PARAM_NAME) {
- private static boolean isWindows() {
- return System.getProperty("os.name").toLowerCase().contains("windows");
- }
- private StringQuestion qVmOptions = new StringQuestion(this, VM_OPTIONS_PARAM_NAME) {
+ @Override
+ public String getText() {
+ return "Set -Xpatch directory for the test run. "
+ + "\nE.g. build/shim-modules";
+ }
+
+ @Override
+ public String getSummary() {
+ return "--patch-module";
+ }
+
+ @Override
+ public void clear() {
+ setValue("");
+ }
+
+ @Override
+ public Question getNext() {
+ return qEnableAddExports;
+ }
+
+ @Override
+ public void export(Map data) {
+ data.put(XPATCH_PARAM_NAME, value);
+ }
+
+ @Override
+ public void load(Map data) {
+ String newValue = (String) data.get(XPATCH_PARAM_NAME);
+ setValue(newValue != null ? newValue : "");
+ }
+ };
+
+ private YesNoQuestion qEnableAddExports = new YesNoQuestion(this, ENABLE_ADD_EXPORTS_PARAM_NAME, YesNoQuestion.YES) {
+ @Override
+ public Question getNext() {
+ if (getValue().equals(YES)) {
+ return qAddExports;
+ }
+ return qVmOptions;
+ }
@Override
public String getText() {
- return "Set VM Options for test run (desktop mode only).\nE.g. -Dprism.verbose=true";
+ return "Do you wish to add -XaddExports JVM argument when running tests? "
+ + "\nAnswer Yes when running with JDK 9 Jigsaw."
+ + "\nAnswer No when running with JDK 8 and prior.";
}
@Override
public String getSummary() {
- return "VM Options";
+ return "Add -XaddExports?";
+ }
+
+ @Override
+ public void export(Map data) {
+ data.put(ENABLE_ADD_EXPORTS_PARAM_NAME, getValue());
+ }
+
+ @Override
+ public void load(Map data) {
+ if (data.containsKey(ENABLE_ADD_EXPORTS_PARAM_NAME)) {
+ setValue((String) data.get(ENABLE_ADD_EXPORTS_PARAM_NAME));
+ }
+ }
+ };
+
+ private StringQuestion qAddExports = new StringQuestion(this, ADD_EXPORTS_PARAM_NAME) {
+
+ @Override
+ public String getText() {
+ return "Set -XaddExports values for the test run. "
+ + "Individual tests can use @addExports annotation "
+ + "to add more specific entries to -XaddExports JVM argument."
+ + "\nE.g. javafx.graphics/com.sun.prism=ALL-UNNAMED,javafx.base/com.sun.javafx.runtime=ALL-UNNAMED";
+ }
+
+ @Override
+ public String getSummary() {
+ return "--add-exports";
}
@Override
@@ -786,39 +874,55 @@
@Override
public Question getNext() {
- return qPipelineGroup;//getLastQuestion();
+ return qVmOptions;
}
@Override
public void export(Map data) {
- data.put(VM_OPTIONS_PARAM_NAME, value);
+ data.put(ADD_EXPORTS_PARAM_NAME, value);
}
@Override
public void load(Map data) {
- String newValue = (String) data.get(VM_OPTIONS_PARAM_NAME);
+ String newValue = (String) data.get(ADD_EXPORTS_PARAM_NAME);
setValue(newValue != null ? newValue : "");
}
};
+ private StringQuestion qVmOptions = new StringQuestion(this, VM_OPTIONS_PARAM_NAME) {
+ @Override
+ public String getText() {
+ return "Set VM Options for test run (desktop mode only).\nE.g. -Dprism.verbose=true";
+ }
- private static class ExecutablesFileFilter implements FileFilter {
@Override
- public boolean accept(File file) {
- return file.exists() && file.canExecute();
+ public String getSummary() {
+ return "VM Options";
}
@Override
- public boolean acceptsDirectories() {
- return false;
+ public void clear() {
+ setValue("");
}
@Override
- public String getDescription() {
- return "Executable files";
+ public Question getNext() {
+ return qPipelineGroup;//getLastQuestion();
}
- }
+
+ @Override
+ public void export(Map data) {
+ data.put(VM_OPTIONS_PARAM_NAME, value);
+ }
+
+ @Override
+ public void load(Map data) {
+ String newValue = (String) data.get(VM_OPTIONS_PARAM_NAME);
+ setValue(newValue != null ? newValue : "");
+ }
+ };
+
private static Runnable ieFix = new Runnable() {
@Override
public void run() {
--- old/tools/FxTestRunner/src/client/test/runner/DrtInterview.java 2017-02-15 15:58:10.643582542 +0300
+++ new/tools/FxTestRunner/src/client/test/runner/DrtInterview.java 2017-02-15 15:58:10.591582058 +0300
@@ -242,7 +242,7 @@
@Override
public String getText() {
- return "Proxy settings in format: host:port\nE.g. www-proxy.us.oracle.com:80";
+ return "Proxy settings in format: host:port\nE.g. someproxy.example.com:80";
}
@Override
--- old/tools/FxTestRunner/src/client/test/runner/RunUITestFinder.java 2017-02-15 15:58:10.879584742 +0300
+++ new/tools/FxTestRunner/src/client/test/runner/RunUITestFinder.java 2017-02-15 15:58:10.823584220 +0300
@@ -24,6 +24,7 @@
package client.test.runner;
+import client.test.AddExports;
import client.test.CheckUI;
import client.test.Keywords;
import client.test.RunUI;
@@ -36,12 +37,15 @@
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @author shura
*/
public class RunUITestFinder extends AbstractTestFinder {
+ static final String ADD_EXPORTS = "unit.test.addExports";
static final String TEST_NAME = "unit.test.testname";
static final String UNIT_TEST_CLASS_NAME = "unit.test.classname";
static final String NO_DESCRIPTION = "unit.test.nodescription";
@@ -92,6 +96,7 @@
boolean hasCheckUI = findAnnotations(testClass, CheckUI.class).size() > 0;
List resources = new ArrayList(runUIs.size());
List keys = findAnnotations(testClass, Keywords.class);
+ List addExportsList = findAnnotations(testClass, AddExports.class);
if (!runUIs.isEmpty()) {
boolean nodescription = false;
for (RunUI runUI : runUIs) {
@@ -126,6 +131,17 @@
System.out.println("The following keywords \"" + key_str + "\" were found in the test " + file.getName());
}
+ // --add-exports value
+ if (!addExportsList.isEmpty()) {
+ String[] addExportsArray = new String[addExportsList.size()];
+ for (int i = 0; i < addExportsList.size(); i++) {
+ addExportsArray[i] = addExportsList.get(i).value();
+ }
+ String addExports = Stream.of(TestScript.combineAddExports(addExportsArray)).collect(Collectors.joining(" "));
+ tagValues.put(ADD_EXPORTS, addExports);
+ System.out.println("The following addExports \"" + addExports + "\" were found in the test " + file.getName());
+ }
+
if (nodescription) {
tagValues.put("testName", removeDotJavaExtensionFromFilePath(filePath));
tagValues.put(FILE_PATH_PROP, path);
--- old/tools/FxTestRunner/src/client/test/runner/TestScript.java 2017-02-15 15:58:11.107586866 +0300
+++ new/tools/FxTestRunner/src/client/test/runner/TestScript.java 2017-02-15 15:58:11.051586344 +0300
@@ -49,6 +49,10 @@
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
@@ -334,13 +338,26 @@
String[] jvmVmOptions = savedEnv.lookup(BasicFXInterview.VM_OPTIONS_PARAM_NAME);
+ String[] xPatch = savedEnv.lookup(BasicFXInterview.XPATCH_PARAM_NAME);
+ String xPatchArg = "";
+ if (xPatch != null && xPatch.length > 0) {
+ File xPatchFile = new File(xPatch[0]);
+ xPatchArg = xPatchFile.getAbsolutePath();
+ }
+
+ boolean enableAddExports = YesNoQuestion.YES.equals(lookup(
+ BasicFXInterview.ENABLE_ADD_EXPORTS_PARAM_NAME, YesNoQuestion.NO));
+
+ String noAddExportsArg = enableAddExports ? null : "-DnoAddExports=true";
+
+ String addExportsArg[] = enableAddExports
+ ? combineAddExports(
+ savedEnv.lookup(BasicFXInterview.ADD_EXPORTS_PARAM_NAME),
+ td.getParameter(RunUITestFinder.ADD_EXPORTS))
+ : null;
+
String jvmArgPrismOrder = getJvmArgPrismOrder();
- //TODO (SG): is this still required?
- String jvmArgLibraryPath = "";
- if (fxSdkHome != null) {
- jvmArgLibraryPath = "-Djava.library.path=" + fxSdkHome + File.separator + "rt";
- }
// String externaloutput = lookup(BasicFXInterview.EXTERNALOUTPUT, "");
// if (externaloutput != null) {
@@ -374,7 +391,7 @@
String swtTestOpt = "";
try {
- if (System.getProperty("os.name").toLowerCase().indexOf("mac") >= 0) {
+ if (System.getProperty("os.name").toLowerCase().contains("mac")) {
RunWith wunWithAnnotation = Class.forName(testClassName).getAnnotation(RunWith.class);
if ((wunWithAnnotation != null) && (wunWithAnnotation.value().equals(CanvasRunner.class))) {
swtTestOpt = "-XstartOnFirstThread";
@@ -390,9 +407,17 @@
String[] command = new String[]{};
command = addToArray(command, javaExec.trim());
command = addToArray(command, jvmVmOptions);
+ if (addExportsArg != null) {
+ command = addToArray(command, addExportsArg);
+ } else if (noAddExportsArg != null) {
+ command = addToArray(command, noAddExportsArg);
+ }
+ if (xPatchArg != null && !xPatchArg.isEmpty()) {
+ command = addToArray(command, "--patch-module " + xPatchArg);
+ }
command = addToArray(command, lookAndFeelOptions);
command = addToArray(command, ipV4);
- command = addToArray(command, jvmArgPrismOrder, jvmArgLibraryPath, jvmArgImageUtils);
+ command = addToArray(command, jvmArgPrismOrder, jvmArgImageUtils);
command = addToArray(command, additionalOptions);
command = addToArray(command, jvmArgNoDesc, jvmProxyHost, jvmProxyPort, jvmInterop, swtTestOpt);
command = addToArray(command, jvmArgClientTestRoot);
@@ -403,6 +428,35 @@
return command;
}
+ static String[] combineAddExports(String[] addExportsArray, String addExportsValue) {
+ if (addExportsValue == null) {
+ return combineAddExports(addExportsArray);
+ } else {
+ String[] newArray = new String[addExportsArray.length + 1];
+ System.arraycopy(addExportsArray, 0, newArray, 1, addExportsArray.length);
+ newArray[0] = addExportsValue;
+ return combineAddExports(newArray);
+ }
+ }
+
+ static String[] combineAddExports(String[] addExportsArray) {
+ List addExportsList = new ArrayList<>();
+ for (String addExports : addExportsArray) {
+ if (addExports != null) {
+ for (String value : addExports.split("\\s*,\\s*")) {
+ if (!value.isEmpty() && !addExportsList.contains(value.trim())) {
+ addExportsList.add("--add-exports");
+ addExportsList.add(value.trim());
+ addExportsList.add("--add-opens");
+ addExportsList.add(value.trim());
+ }
+ }
+ }
+ }
+ return addExportsList.toArray(new String[addExportsList.size()]);
+ }
+
+
/**
*
* @param td
--- old/tools/Jemmy/JemmyFX/build.xml 2017-02-15 15:58:11.367589288 +0300
+++ new/tools/Jemmy/JemmyFX/build.xml 2017-02-15 15:58:11.291588580 +0300
@@ -73,12 +73,16 @@
+
+
+
+
@@ -95,7 +99,7 @@
-No Jemmy core sources!
+No Jemmy core sources!
Sources are available from jemmy.java.net.
Specify the location by jemmy.core.source variable.
@@ -107,9 +111,9 @@
-
+
-
+
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/ByID.java 2017-02-15 15:58:11.643591860 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/ByID.java 2017-02-15 15:58:11.563591115 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -73,4 +73,11 @@
}.dispatch(Environment.getEnvironment());
}
+
+ @Override
+ public String toString() {
+ return "id is " + super.toString();
+ // TODO: Get access to text and uncomment proper code:
+// return "Id = " + text;
+ }
}
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/Lookups.java 2017-02-15 15:58:11.879594059 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/Lookups.java 2017-02-15 15:58:11.827593574 +0300
@@ -60,7 +60,7 @@
*/
@SuppressWarnings("unchecked")
public static Wrap extends T> byID(Wrap> parent, String id, Class type) {
- return byID(parent.as(Parent.class, Node.class), id, type);
+ return byID((Parent) parent.as(Parent.class, Node.class), id, type);
}
/**
* Equivalent to parent.lookup(type, new ByText(text)).wrap(0)
@@ -84,7 +84,7 @@
*/
@SuppressWarnings("unchecked")
public static Wrap extends T> byText(Wrap> parent, String id, Class type) {
- return byText(parent.as(Parent.class, Node.class), id, type);
+ return byText((Parent) parent.as(Parent.class, Node.class), id, type);
}
/**
* Equivalent to FXRoot.ROOT.lookup(new ByTitleSceneLookup(title)).wrap(0).as(Parent.class, Node.class)
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/QueueExecutor.java 2017-02-15 15:58:12.107596183 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/QueueExecutor.java 2017-02-15 15:58:12.051595661 +0300
@@ -222,7 +222,7 @@
}
public boolean failed() {
- return action.failed();
+ return !done || action.failed();
}
public Throwable getThrowable() {
@@ -231,8 +231,9 @@
public synchronized void waitDone(Timeout timeout) {
try {
- while (!done) {
- wait(timeout.getValue());
+ long maxTime = System.currentTimeMillis() + timeout.getValue();
+ while (!done && System.currentTimeMillis() < maxTime) {
+ wait(maxTime - System.currentTimeMillis());
}
} catch (InterruptedException ex) {
}
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/SceneList.java 2017-02-15 15:58:12.347598419 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/SceneList.java 2017-02-15 15:58:12.291597897 +0300
@@ -47,9 +47,8 @@
@Override
public void run(Object... parameters) {
LinkedList res = new LinkedList();
- Iterator windows = Window.impl_getWindows();
- while(windows.hasNext()) {
- res.add(windows.next().getScene());
+ for (Window w : Window.getWindows()) {
+ res.add(w.getScene());
}
setResult(res);
}
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/WindowList.java 2017-02-15 15:58:12.595600730 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/WindowList.java 2017-02-15 15:58:12.543600246 +0300
@@ -47,10 +47,7 @@
@Override
public void run(Object... parameters) {
LinkedList res = new LinkedList();
- Iterator windows = Window.impl_getWindows();
- while(windows.hasNext()) {
- res.add(windows.next());
- }
+ res.addAll(Window.getWindows());
setResult(res);
}
};
--- old/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/ContextMenuWrap.java 2017-02-15 15:58:12.831602929 +0300
+++ new/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/ContextMenuWrap.java 2017-02-15 15:58:12.779602444 +0300
@@ -83,7 +83,7 @@
@As(MenuItem.class)
public StringMenuOwner