Skip to content

CSSTUDIO-2880 Run refresh() atomically on the UI thread. #3215

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

Merged
shroffk merged 2 commits into from
Dec 18, 2024
Merged

CSSTUDIO-2880 Run refresh() atomically on the UI thread. #3215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83f0a37
CSSTUDIO-2880 Run refresh() atomically on the UI thread.
abrahamwolk Dec 18, 2024
39a65fb
CSSTUDIO-2880 Remove "synchronized" from the definition of refresh(),…
abrahamwolk Dec 18, 2024
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
38 changes: 22 additions & 16 deletions ...ogbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,36 +435,42 @@ public String getQuery() {
return query.getValue().getQuery();
}

private synchronized void refresh() {
if (this.searchResult != null) {
List<TableViewListItem> selectedLogEntries = new ArrayList<>(tableView.getSelectionModel().getSelectedItems());
private void refresh() {
Runnable refreshRunnable = () -> {
if (this.searchResult != null) {
List<TableViewListItem> selectedLogEntries = new ArrayList<>(tableView.getSelectionModel().getSelectedItems());

List<LogEntry> logEntries = searchResult.getLogs();
logEntries.sort((o1, o2) -> -(o1.getCreatedDate().compareTo(o2.getCreatedDate())));
List<LogEntry> logEntries = searchResult.getLogs();
logEntries.sort((o1, o2) -> -(o1.getCreatedDate().compareTo(o2.getCreatedDate())));

boolean showDetailsBoolean = showDetails.get();
var logs = logEntries.stream().map(le -> new TableViewListItem(le, showDetailsBoolean)).toList();
boolean showDetailsBoolean = showDetails.get();
var logs = logEntries.stream().map(le -> new TableViewListItem(le, showDetailsBoolean)).toList();

ObservableList<TableViewListItem> logsList = FXCollections.observableArrayList(logs);
tableView.setItems(logsList);
ObservableList<TableViewListItem> logsList = FXCollections.observableArrayList(logs);
tableView.setItems(logsList);

// This will ensure that selected entries stay selected after the list has been
// updated from the search result.
for (TableViewListItem selectedItem : selectedLogEntries) {
for (TableViewListItem item : tableView.getItems()) {
if (item.getLogEntry().getId().equals(selectedItem.getLogEntry().getId())) {
Platform.runLater(() -> {
// This will ensure that selected entries stay selected after the list has been
// updated from the search result.
for (TableViewListItem selectedItem : selectedLogEntries) {
for (TableViewListItem item : tableView.getItems()) {
if (item.getLogEntry().getId().equals(selectedItem.getLogEntry().getId())) {
if (goBackAndGoForwardActions.isPresent()) {
goBackAndGoForwardActions.get().setIsRecordingHistoryDisabled(true); // Do not create a "Back" action for the automatic reload.
tableView.getSelectionModel().select(item);
goBackAndGoForwardActions.get().setIsRecordingHistoryDisabled(false);
} else {
tableView.getSelectionModel().select(item);
}
});
}
}
}
}
};

if (Platform.isFxApplicationThread()) {
refreshRunnable.run();
} else {
Platform.runLater(refreshRunnable);
}
}

Expand Down
Loading