--- old/functional/ControlsTests/src/javafx/scene/control/test/choicebox/NewChoiceBoxApp.java 2016-12-09 13:27:54.070601459 +0300 +++ new/functional/ControlsTests/src/javafx/scene/control/test/choicebox/NewChoiceBoxApp.java 2016-12-09 13:27:54.018600992 +0300 @@ -1,106 +1,107 @@ -/* - * Copyright (c) 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package javafx.scene.control.test.choicebox; - -import javafx.event.ActionEvent; -import javafx.event.EventHandler; -import javafx.scene.Scene; -import javafx.scene.control.*; -import javafx.scene.control.test.utils.CommonPropertiesScene; -import javafx.scene.control.test.utils.ptables.PropertiesTable; -import javafx.scene.control.test.utils.ptables.PropertyTablesFactory; -import javafx.scene.control.test.utils.ptables.SpecialTablePropertiesProvider; -import javafx.scene.layout.HBox; -import javafx.scene.layout.Pane; -import javafx.scene.layout.VBox; -import test.javaclient.shared.InteroperabilityApp; -import test.javaclient.shared.Utils; - -/** - * @author Alexander Kirov - */ -public class NewChoiceBoxApp extends InteroperabilityApp { - - public final static String TESTED_CHOICEBOX_ID = "TESTED_CHOICEBOX_ID"; - public final static String RESET_BUTTON_ID = "RESET_CHOICEBOX_BUTTON_ID"; - - public static void main(String[] args) { - Utils.launch(NewChoiceBoxApp.class, args); - } - - @Override - protected Scene getScene() { - Utils.setTitleToStage(stage, "ChoiceBoxTestApp"); - return new NewChoiceBoxApp.ChoiceBoxScene(); - } - - class ChoiceBoxScene extends CommonPropertiesScene { - - //VBox which contains tested ChoiceBox. - Pane pane; - PropertiesTable tb; - //ChoiceBox to be tested. - ChoiceBox testedChoiceBox; - - public ChoiceBoxScene() { - super("ChoiceBox", 800, 600); - - prepareScene(); - } - - @Override - final protected void prepareScene() { - pane = new Pane(); - testedChoiceBox = new ChoiceBox(); - testedChoiceBox.setId(TESTED_CHOICEBOX_ID); - - tb = new PropertiesTable(testedChoiceBox); - PropertyTablesFactory.explorePropertiesList(testedChoiceBox, tb); - SpecialTablePropertiesProvider.provideForControl(testedChoiceBox, tb); - - pane.setMinSize(220, 220); - pane.setPrefSize(220, 220); - pane.setStyle("-fx-border-color : red;"); - pane.getChildren().add(testedChoiceBox); - - Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build(); - resetButton.setOnAction(new EventHandler() { - public void handle(ActionEvent t) { - HBox hb = (HBox) getRoot(); - hb.getChildren().clear(); - prepareScene(); - } - }); - - setTestedControl(testedChoiceBox); - setPropertiesContent(tb); - - VBox vb = new VBox(); - vb.setSpacing(5); - vb.getChildren().addAll(resetButton); - setControllersContent(vb); - } - } -} +/* + * Copyright (c) 2014, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package javafx.scene.control.test.choicebox; + +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.control.test.utils.CommonPropertiesScene; +import javafx.scene.control.test.utils.ptables.PropertiesTable; +import javafx.scene.control.test.utils.ptables.PropertyTablesFactory; +import javafx.scene.control.test.utils.ptables.SpecialTablePropertiesProvider; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; +import test.javaclient.shared.InteroperabilityApp; +import test.javaclient.shared.Utils; + +/** + * @author Alexander Kirov + */ +public class NewChoiceBoxApp extends InteroperabilityApp { + + public final static String TESTED_CHOICEBOX_ID = "TESTED_CHOICEBOX_ID"; + public final static String RESET_BUTTON_ID = "RESET_CHOICEBOX_BUTTON_ID"; + + public static void main(String[] args) { + Utils.launch(NewChoiceBoxApp.class, args); + } + + @Override + protected Scene getScene() { + Utils.setTitleToStage(stage, "ChoiceBoxTestApp"); + return new NewChoiceBoxApp.ChoiceBoxScene(); + } + + class ChoiceBoxScene extends CommonPropertiesScene { + + //VBox which contains tested ChoiceBox. + Pane pane; + PropertiesTable tb; + //ChoiceBox to be tested. + ChoiceBox testedChoiceBox; + + public ChoiceBoxScene() { + super("ChoiceBox", 800, 600); + + prepareScene(); + } + + @Override + final protected void prepareScene() { + pane = new Pane(); + testedChoiceBox = new ChoiceBox(); + testedChoiceBox.setId(TESTED_CHOICEBOX_ID); + + tb = new PropertiesTable(testedChoiceBox); + PropertyTablesFactory.explorePropertiesList(testedChoiceBox, tb); + SpecialTablePropertiesProvider.provideForControl(testedChoiceBox, tb); + + pane.setMinSize(220, 220); + pane.setPrefSize(220, 220); + pane.setStyle("-fx-border-color : red;"); + pane.getChildren().add(testedChoiceBox); + + Button resetButton = new Button("Reset"); + resetButton.setId(RESET_BUTTON_ID); + resetButton.setOnAction(new EventHandler() { + public void handle(ActionEvent t) { + HBox hb = (HBox) getRoot(); + hb.getChildren().clear(); + prepareScene(); + } + }); + + setTestedControl(testedChoiceBox); + setPropertiesContent(tb); + + VBox vb = new VBox(); + vb.setSpacing(5); + vb.getChildren().addAll(resetButton); + setControllersContent(vb); + } + } +}