Skip to content

add validation when loosing focus #3657

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+129 −40
Open

add validation when loosing focus #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
105 changes: 75 additions & 30 deletions app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/TitleDetailDelayTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.Objects;

import org.phoebus.applications.alarm.model.TitleDetailDelay;
import org.phoebus.applications.alarm.ui.AlarmUI;
import org.phoebus.ui.dialog.DialogHelper;
import org.phoebus.ui.dialog.MultiLineInputDialog;
import org.phoebus.ui.javafx.ImageCache;
import org.phoebus.ui.javafx.UpdateThrottle;

import javafx.application.Platform;
import javafx.beans.InvalidationListener;
Expand All @@ -35,7 +34,6 @@
import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip;
import javafx.scene.control.cell.ComboBoxTableCell;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox;
import javafx.util.converter.DefaultStringConverter;
Expand Down Expand Up @@ -104,8 +102,49 @@ class DelayTableCell extends TableCell<TitleDetailDelay, Integer>
public DelayTableCell()
{
this.spinner = new Spinner<>(0, 10000, 1);
spinner.setEditable(true);
this.spinner.valueProperty().addListener((observable, oldValue, newValue) -> commitEdit(newValue));
this.spinner.setEditable(true);

// disable focus on buttons
spinner.lookupAll(".increment-arrow-button, .decrement-arrow-button")
.forEach(node -> node.setFocusTraversable(false));

this.spinner.valueProperty().addListener((obs, oldValue, newValue) -> {
if (isEditing()) {
commitEdit(newValue);
}
});

// validate when loosing focus
spinner.focusedProperty().addListener((obs, wasFocused, isNowFocused) -> {
if (!isNowFocused) {
Integer currentValue = spinner.getValue();
Integer oldValue = getItem();

if (Objects.equals(currentValue, oldValue)) {
cancelEdit();
return;
}

// if not currently editing, force table to enter edit mode first
if (!isEditing()) {
TableView<TitleDetailDelay> tv = getTableView();
if (tv != null) {
Platform.runLater(() -> {
tv.getSelectionModel().clearAndSelect(getIndex());
tv.edit(getIndex(), getTableColumn());
// commit after we've asked the table to start editing
commitEdit(currentValue);
});
} else {
// fallback: commit anyway
commitEdit(currentValue);
}
} else {
// normal case
commitEdit(currentValue);
}
}
});
}

@Override
Expand Down Expand Up @@ -135,6 +174,13 @@ public void updateItem(Integer item, boolean empty)

this.spinner.getValueFactory().setValue(item);
setGraphic(spinner);
// force focus on the textedit not buttons
Platform.runLater(() -> {
if (isEditing()) {
spinner.getEditor().requestFocus();
spinner.getEditor().end();
}
});
}
}

Expand All @@ -147,20 +193,19 @@ private void createTable()

TableColumn<TitleDetailDelay, String> col = new TableColumn<>("Title");
col.setCellValueFactory(cell -> new SimpleStringProperty(cell.getValue().title));
col.setCellFactory(column -> new TextFieldTableCell<>(new DefaultStringConverter()));
col.setCellFactory(ValidatingTextFieldTableCell.forTableColumn(new DefaultStringConverter()));
col.setOnEditCommit(event ->
{
final int row = event.getTablePosition().getRow();
items.set(row, new TitleDetailDelay(event.getNewValue(), items.get(row).detail, items.get(row).delay));

// Trigger editing the detail
UpdateThrottle.TIMER.schedule(() ->
Platform.runLater(() ->
{
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(1));
}),
200, TimeUnit.MILLISECONDS);
Platform.runLater(() -> {
TableColumn<TitleDetailDelay, ?> detailCol = table.getColumns().get(1);
TableColumn<TitleDetailDelay, ?> optionCol = detailCol.getColumns().get(0);
table.getSelectionModel().clearAndSelect(row);
table.edit(row, optionCol);
});
});
col.setSortable(false);
table.getColumns().add(col);
Expand All @@ -182,18 +227,20 @@ private void createTable()
items.set(row, newTitleDetailDelay);
// Trigger editing the delay.
if (newTitleDetailDelay.hasDelay())
UpdateThrottle.TIMER.schedule(() -> Platform.runLater(() -> {
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(2));
}), 200, TimeUnit.MILLISECONDS);
Platform.runLater(() -> {
TableColumn<TitleDetailDelay, ?> detailCol = table.getColumns().get(1);
TableColumn<TitleDetailDelay, ?> infoCol = detailCol.getColumns().get(1);
table.getSelectionModel().clearAndSelect(row);
table.edit(row, infoCol);
});
});
tmpOptionCol.setEditable(true);
col.getColumns().add(tmpOptionCol);

// Use a textfield to set info for detail
TableColumn<TitleDetailDelay, String> infoCol = new TableColumn<>("Info");
infoCol.setCellValueFactory(cell -> new SimpleStringProperty(getInfoFromDetail(cell.getValue())));
infoCol.setCellFactory(column -> new TextFieldTableCell<>(new DefaultStringConverter()));
infoCol.setCellFactory(ValidatingTextFieldTableCell.forTableColumn(new DefaultStringConverter()));
infoCol.setOnEditCommit(event -> {
final int row = event.getTablePosition().getRow();
TitleDetailDelay tmpT = items.get(row);
Expand All @@ -202,10 +249,10 @@ private void createTable()
items.set(row, newTitleDetailDelay);
// Trigger editing the delay.
if (newTitleDetailDelay.hasDelay())
UpdateThrottle.TIMER.schedule(() -> Platform.runLater(() -> {
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(2));
}), 200, TimeUnit.MILLISECONDS);
Platform.runLater(() -> {
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(2));
});
});
infoCol.setSortable(false);
col.getColumns().add(infoCol);
Expand Down Expand Up @@ -306,14 +353,12 @@ private void createButtons()
items.add(new TitleDetailDelay("", "", 0));

// Trigger editing the title of new item
UpdateThrottle.TIMER.schedule(() ->
Platform.runLater(() ->
{
final int row = items.size()-1;
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(0));
}),
200, TimeUnit.MILLISECONDS);
Platform.runLater(() ->
{
final int row = items.size()-1;
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(0));
});
});

edit.setTooltip(new Tooltip("Edit the detail field of table item."));
Expand Down
17 changes: 7 additions & 10 deletions app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/TitleDetailTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox;
import javafx.util.converter.DefaultStringConverter;
Expand Down Expand Up @@ -83,27 +82,25 @@ private void createTable()

TableColumn<TitleDetail, String> col = new TableColumn<>("Title");
col.setCellValueFactory(cell -> new SimpleStringProperty(cell.getValue().title));
col.setCellFactory(column -> new TextFieldTableCell<>(new DefaultStringConverter()));
col.setCellFactory(ValidatingTextFieldTableCell.forTableColumn(new DefaultStringConverter()));
col.setOnEditCommit(event ->
{
final int row = event.getTablePosition().getRow();
items.set(row, new TitleDetail(event.getNewValue(), items.get(row).detail));

// Trigger editing the detail
UpdateThrottle.TIMER.schedule(() ->
Platform.runLater(() ->
{
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(1));
}),
200, TimeUnit.MILLISECONDS);
Platform.runLater(() ->
{
table.getSelectionModel().clearAndSelect(row);
table.edit(row, table.getColumns().get(1));
});
});
col.setSortable(false);
table.getColumns().add(col);

col = new TableColumn<>("Detail");
col.setCellValueFactory(cell -> new SimpleStringProperty(cell.getValue().detail.replace("\n", "\\n")));
col.setCellFactory(column -> new TextFieldTableCell<>(new DefaultStringConverter()));
col.setCellFactory(ValidatingTextFieldTableCell.forTableColumn(new DefaultStringConverter()));
col.setOnEditCommit(event ->
{
final int row = event.getTablePosition().getRow();
Expand Down
47 changes: 47 additions & 0 deletions ...ui/src/main/java/org/phoebus/applications/alarm/ui/tree/ValidatingTextFieldTableCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package org.phoebus.applications.alarm.ui.tree;

import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TextField;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.util.Callback;
import javafx.util.StringConverter;

public class ValidatingTextFieldTableCell<S, T> extends TextFieldTableCell<S, T> {

private TextField textField;

public ValidatingTextFieldTableCell(StringConverter<T> converter) {
super(converter);
}

@Override
public void startEdit() {
super.startEdit();
if (isEditing() && getGraphic() instanceof TextField tf) {
textField = tf;
// add listener
textField.focusedProperty().addListener((obs, wasFocused, isNowFocused) -> {
if (!isNowFocused && textField != null) {
T newValue = getConverter().fromString(textField.getText());
if (newValue.equals(getItem())) {
// nothing changed so cancel
cancelEdit();
} else {
// changed so validate
commitEdit(newValue);
}
}
});
}
}

// utility method to simplify usage in column
public static <S> Callback<TableColumn<S, String>, TableCell<S, String>> forTableColumn() {
return forTableColumn(new javafx.util.converter.DefaultStringConverter());
}

public static <S, T> Callback<TableColumn<S, T>, TableCell<S, T>> forTableColumn(StringConverter<T> converter) {
return column -> new ValidatingTextFieldTableCell<>(converter);
}
}