functional/ControlsTests/src/javafx/scene/control/test/tableview/NewTableViewApp.java
Print this page
@@ -22,14 +22,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
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;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
@@ -64,10 +64,12 @@
import test.javaclient.shared.InteroperabilityApp;
import test.javaclient.shared.Utils;
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;
/**
* @author Alexander Kirov
@@ -127,21 +129,23 @@
});
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<ActionEvent>() {
public void handle(ActionEvent t) {
HBox hb = (HBox) getRoot();
hb.getChildren().clear();
prepareMainSceneStructure();
prepareScene();
}
});
- Button softResetButton = ButtonBuilder.create().id(SOFT_RESET_BUTTON_ID).text("Soft reset").build();
+ Button softResetButton = new Button("Soft reset");
+ softResetButton.setId(SOFT_RESET_BUTTON_ID);
softResetButton.setOnAction(new EventHandler<ActionEvent>() {
public void handle(ActionEvent t) {
TableView newOne = new TableView();
refreshProcedure(1);
allData.clear();
@@ -325,11 +329,11 @@
testedTableView.setSkin(new TableViewSkin(testedTableView) {
@Override
public String toString() {
return "CUSTOM " + super.toString();
}
-
+/*
@Override
protected TableHeaderRow createTableHeaderRow() {
return new TableHeaderRow(this) {
@Override
protected NestedTableColumnHeader createRootHeader() {
@@ -348,10 +352,11 @@
}
};
}
};
}
+ */
});
}
});
return replaceButton;
@@ -454,14 +459,12 @@
}
});
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<ActionEvent>() {
public void handle(ActionEvent t) {
final EventHandler eventHandlerOnEditStart = new EventHandler() {
public void handle(Event t) {