Skip to content

Commit 3df46a1

Browse files
committed
JavaFX thread bug fix
1 parent 32806b7 commit 3df46a1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import javafx.beans.property.SimpleBooleanProperty;
2828
import javafx.beans.property.SimpleObjectProperty;
2929
import javafx.beans.property.SimpleStringProperty;
30+
import javafx.beans.property.StringProperty;
31+
import javafx.beans.value.ObservableStringValue;
3032
import javafx.collections.FXCollections;
3133
import javafx.collections.ListChangeListener;
3234
import javafx.collections.ObservableList;
@@ -208,7 +210,7 @@ public class LogEntryEditorController {
208210
private final ObservableList<String> availableLevels = FXCollections.observableArrayList();
209211
private final SimpleStringProperty titleProperty = new SimpleStringProperty();
210212
private final SimpleStringProperty descriptionProperty = new SimpleStringProperty();
211-
private final SimpleStringProperty selectedLevelProperty = new SimpleStringProperty();
213+
private final StringProperty selectedLevelProperty = new SimpleStringProperty();
212214
private final SimpleStringProperty usernameProperty = new SimpleStringProperty();
213215
private final SimpleStringProperty passwordProperty = new SimpleStringProperty();
214216

@@ -830,11 +832,11 @@ private void getServerSideStaticData() {
830832
Optional<LogEntryLevel> optionalLevel = levels.stream().filter(LogEntryLevel::defaultLevel).findFirst();
831833
String defaultLevel = null;
832834
if(optionalLevel.isPresent()){
833-
// One level value should be the default level
835+
// One level value *should* be the default level
834836
defaultLevel = optionalLevel.get().name();
835837
}
836838
selectedLevelProperty.set(logEntry.getLevel() != null ? logEntry.getLevel() : defaultLevel);
837-
levelSelector.getSelectionModel().select(selectedLevelProperty.get());
839+
Platform.runLater(() -> levelSelector.getSelectionModel().select(selectedLevelProperty.get()));
838840
});
839841
}
840842

0 commit comments

Comments
 (0)