improve formatting, rename and simplify vars

This commit is contained in:
Jan-Peter Klein
2025-01-08 15:07:04 +01:00
parent 8830e0f5fb
commit 59f360bde7
2 changed files with 15 additions and 8 deletions

View File

@@ -15,11 +15,19 @@ public class Dialogs {
private Dialogs() {}
public static void showRemoveVaultDialog(SimpleDialog.Builder simpleDialogProvider, Stage mainWindow, Vault vault, ObservableList<Vault> vaults) {
simpleDialogProvider.setOwner(mainWindow).setTitleKey("removeVault.title", vault.getDisplayName()).setMessageKey("removeVault.message").setDescriptionKey("removeVault.description").setIcon(FontAwesome5Icon.QUESTION).setOkButtonKey("removeVault.confirmBtn").setCancelButtonKey("generic.button.cancel").setOkAction(v -> {
LOG.debug("Removing vault {}.", vault.getDisplayName());
vaults.remove(vault);
v.close();
}).build().showAndWait();
public static void showRemoveVaultDialog(SimpleDialog.Builder simpleDialogBuilder, Stage mainWindow, Vault vault, ObservableList<Vault> vaults) {
simpleDialogBuilder.setOwner(mainWindow) //
.setTitleKey("removeVault.title", vault.getDisplayName()) //
.setMessageKey("removeVault.message") //
.setDescriptionKey("removeVault.description") //
.setIcon(FontAwesome5Icon.QUESTION) //
.setOkButtonKey("removeVault.confirmBtn") //
.setCancelButtonKey("generic.button.cancel") //
.setOkAction(v -> {
LOG.debug("Removing vault {}.", vault.getDisplayName());
vaults.remove(vault);
v.close();
}) //
.build().showAndWait();
}
}

View File

@@ -32,7 +32,6 @@ public class SimpleDialog {
FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController(new SimpleDialogController(), Scene::new, builder.resourceBundle);
FXMLLoader loader = loaderFactory.load(FxmlFile.SIMPLE_DIALOG.getRessourcePathString());
Parent root = loader.getRoot();
SimpleDialogController controller = loader.getController();
controller.setMessage(resolveText(builder.messageKey, null));
@@ -44,7 +43,7 @@ public class SimpleDialog {
controller.setOkAction(() -> builder.okAction.accept(dialogStage));
controller.setCancelAction(() -> builder.cancelAction.accept(dialogStage));
dialogStage.setScene(new Scene(root));
dialogStage.setScene(new Scene(loader.getRoot()));
}
public void showAndWait() {