Skip to content

JavaFX thread bug fix #3456

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
georgweiss merged 1 commit into from
Jul 4, 2025
Merged

JavaFX thread bug fix #3456

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
8 changes: 5 additions & 3 deletions ...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ObservableStringValue;
import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
Expand Down Expand Up @@ -208,7 +210,7 @@ public class LogEntryEditorController {
private final ObservableList<String> availableLevels = FXCollections.observableArrayList();
private final SimpleStringProperty titleProperty = new SimpleStringProperty();
private final SimpleStringProperty descriptionProperty = new SimpleStringProperty();
private final SimpleStringProperty selectedLevelProperty = new SimpleStringProperty();
private final StringProperty selectedLevelProperty = new SimpleStringProperty();
private final SimpleStringProperty usernameProperty = new SimpleStringProperty();
private final SimpleStringProperty passwordProperty = new SimpleStringProperty();

Expand Down Expand Up @@ -830,11 +832,11 @@ private void getServerSideStaticData() {
Optional<LogEntryLevel> optionalLevel = levels.stream().filter(LogEntryLevel::defaultLevel).findFirst();
String defaultLevel = null;
if(optionalLevel.isPresent()){
// One level value should be the default level
// One level value *should* be the default level
defaultLevel = optionalLevel.get().name();
}
selectedLevelProperty.set(logEntry.getLevel() != null ? logEntry.getLevel() : defaultLevel);
levelSelector.getSelectionModel().select(selectedLevelProperty.get());
Platform.runLater(() -> levelSelector.getSelectionModel().select(selectedLevelProperty.get()));
});
}

Expand Down