Skip to content

Generics cleanup #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dgruntz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Generics cleanup #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
481ac96
Declares ChoiceBox as a generic type
dgruntz Jul 27, 2018
c50435b
Generic table view
dgruntz Aug 1, 2018
374c911
Removes a cast
dgruntz Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Kapitel 4/4.2.10/controls-choicebox/src/main/java/de/javafxbuch/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static void main(String[] args) throws Exception {

@Override
public void start(Stage primaryStage) {
ChoiceBox cb = new ChoiceBox();
ChoiceBox<String> cb = new ChoiceBox<>();
for (int i = 0; i < 20; i++) {
cb.getItems().add("Option " + i);
}
Expand Down
24 changes: 13 additions & 11 deletions Kapitel 4/4.2.8/controls-tableview/src/main/java/de/javafxbuch/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ public static void main(String[] args) throws Exception {
launch(args);
}

@Override
@SuppressWarnings("unchecked")
@Override
public void start(Stage primaryStage) {
TableView tableView = new TableView();
ObservableList< Player> players = FXCollections
TableView<Player> tableView = new TableView<>();
ObservableList<Player> players = FXCollections
.observableArrayList(
new Player("Manuel", "Neuer", 0),
new Player("Philipp", "Lahm", 0),
Expand All @@ -36,21 +37,22 @@ public void start(Stage primaryStage) {
new Player("Benedikt", "Höwedes", 0)
);
tableView.setItems(players);
TableColumn firstName = new TableColumn("Vorname");
TableColumn lastName = new TableColumn("Nachname");
TableColumn goals = new TableColumn("Tore");
TableColumn<Player, String> firstName = new TableColumn<>("Vorname");
TableColumn<Player, String> lastName = new TableColumn<>("Nachname");
TableColumn<Player, Integer> goals = new TableColumn<>("Tore");
tableView.getColumns().addAll(firstName, lastName, goals);
firstName.setCellValueFactory(
new PropertyValueFactory<Player, String>("firstName")
);
lastName.setCellValueFactory(
new PropertyValueFactory<Player, String>("lastName"));
new PropertyValueFactory<Player, String>("lastName")
);
goals.setCellValueFactory(
new PropertyValueFactory< Player, Integer>("goals")
new PropertyValueFactory<Player, Integer>("goals")
);
goals.setCellFactory(new Callback<TableColumn< Player, Integer>, TableCell<Player, Integer>>() {
goals.setCellFactory(new Callback<TableColumn<Player, Integer>, TableCell<Player, Integer>>() {
@Override
public TableCell< Player, Integer> call(TableColumn< Player, Integer> param) {
public TableCell<Player, Integer> call(TableColumn<Player, Integer> param) {
return new GoalsCell();
}
});
Expand All @@ -60,7 +62,7 @@ public TableCell< Player, Integer> call(TableColumn< Player, Integer> param) {
firstName.setOnEditCommit(new EventHandler<CellEditEvent<Player, String>>() {
@Override
public void handle(CellEditEvent<Player, String> t) {
((Player) t.getTableView().getItems().get(t.getTablePosition().getRow())).setFirstName(t.getNewValue());
t.getTableView().getItems().get(t.getTablePosition().getRow()).setFirstName(t.getNewValue());
}
});
StackPane root = new StackPane(tableView);
Expand Down