@@ -229,7 +229,7 @@ public void onRegisterSettingsApplyAction(ActionEvent event, ButtonType buttonTy
229229 if (!inferenceSettingsView .validateSettings ()) {
230230 MainView .displayErrorAlert (SETTINGS_APPLICATION_ERROR_DIALOG_TITLE ,
231231 SETTINGS_APPLICATION_INVALID_FIELDS_ERROR_DIALOG_CONTENT ,
232- view .getSettingsWindow ());
232+ view .getSettingsWindow (). orElse ( stage ) );
233233 event .consume ();
234234 return ;
235235 }
@@ -238,7 +238,7 @@ public void onRegisterSettingsApplyAction(ActionEvent event, ButtonType buttonTy
238238 inferenceSettingsView .getSelectedModelLabel ().getText ().equals ("None" )) {
239239 MainView .displayErrorAlert (SETTINGS_APPLICATION_ERROR_DIALOG_TITLE ,
240240 SETTINGS_APPLICATION_NO_MODEL_SELECTED_ERROR_DIALOG_CONTENT ,
241- view .getSettingsWindow ());
241+ view .getSettingsWindow (). orElse ( stage ) );
242242 event .consume ();
243243 return ;
244244 }
@@ -363,7 +363,7 @@ public void onRegisterModelNameFetchingAction() {
363363 makeClientAvailable ();
364364 modelNameFetchService .setClient (BoundingBoxPredictorClient .create (client , clientConfig ));
365365 modelNameFetchService .getProgressViewer ()
366- .setParentWindow (view .getInferenceSettingsView ().getScene (). getWindow ( ));
366+ .setParentWindow (view .getSettingsWindow ().orElse ( stage ));
367367 modelNameFetchService .restart ();
368368 }
369369
@@ -858,22 +858,21 @@ private void onModelNameFetchingSucceeded(WorkerStateEvent event) {
858858 if (modelNames .isEmpty ()) {
859859 MainView .displayErrorAlert (MODEL_FETCHING_ERROR_DIALOG_TITLE ,
860860 MODEL_FETCHING_NO_MODELS_ERROR_DIALOG_CONTENT ,
861- view .getInferenceSettingsView ().getScene (). getWindow ( ));
861+ view .getSettingsWindow ().orElse ( stage ));
862862 } else {
863863 final Optional <String > modelChoice = MainView .displayChoiceDialogAndGetResult (modelNames .get (0 ),
864864 modelNames ,
865865 MODEL_CHOICE_DIALOG_TITLE ,
866866 MODEL_CHOICE_DIALOG_HEADER ,
867867 MODEL_CHOICE_DIALOG_CONTENT ,
868- view .getInferenceSettingsView ()
869- .getScene ()
870- .getWindow ());
868+ view .getSettingsWindow ()
869+ .orElse (stage ));
871870 modelChoice
872871 .ifPresent (s -> view .getInferenceSettingsView ().getSelectedModelLabel ()
873872 .setText (s ));
874873 }
875874 } else {
876- MainView .displayIOResultErrorInfoAlert (result , view .getInferenceSettingsView ().getScene (). getWindow ( ));
875+ MainView .displayIOResultErrorInfoAlert (result , view .getSettingsWindow ().orElse ( stage ));
877876 }
878877 }
879878
0 commit comments