Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-23 03:59:51 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

improve exception handling
Some checks failed
Build / Compile and Test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Jan-Peter Klein 2024-11-21 16:55:03 +01:00
parent bba5d11bdc
commit 02c20c01ee
No known key found for this signature in database
GPG Key ID: 90EDA3A7C822FD0E
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/org/cryptomator/ui/controls/CustomDialog.java
View File

@ -2,26 +2,25 @@ package org.cryptomator.ui.controls;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlLoaderFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.stage.Modality;
import javafx.stage.Stage;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.IllegalFormatException;
import java.util.ResourceBundle;
import java.util.function.Consumer;
public class CustomDialog {
private static final Logger LOG = LoggerFactory.getLogger(CustomDialog.class);
private final ResourceBundle resourceBundle;
private final Stage dialogStage;
CustomDialog(Builder builder) {
CustomDialog(Builder builder) throws IOException {
this.resourceBundle = builder.resourceBundle;
dialogStage = new Stage();
dialogStage.initOwner(builder.owner);
@ -29,27 +28,21 @@ public class CustomDialog {
dialogStage.setTitle(resolveText(builder.titleKey, builder.titleArgs));
dialogStage.setResizable(false);
try {
FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController(new CustomDialogController(), Scene::new, builder.resourceBundle);
FXMLLoader loader = loaderFactory.load(FxmlFile.CUSTOM_DIALOG.getRessourcePathString());
Parent root = loader.getRoot();
CustomDialogController controller = loader.getController();
FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController(new CustomDialogController(), Scene::new, builder.resourceBundle);
FXMLLoader loader = loaderFactory.load(FxmlFile.CUSTOM_DIALOG.getRessourcePathString());
Parent root = loader.getRoot();
CustomDialogController controller = loader.getController();
controller.setMessage(resolveText(builder.messageKey, null));
controller.setDescription(resolveText(builder.descriptionKey, null));
controller.setIcon(builder.icon);
controller.setOkButtonText(resolveText(builder.okButtonKey, null));
controller.setCancelButtonText(resolveText(builder.cancelButtonKey, null));
controller.setMessage(resolveText(builder.messageKey, null));
controller.setDescription(resolveText(builder.descriptionKey, null));
controller.setIcon(builder.icon);
controller.setOkButtonText(resolveText(builder.okButtonKey, null));
controller.setCancelButtonText(resolveText(builder.cancelButtonKey, null));
controller.setOkAction(() -> builder.okAction.accept(dialogStage));
controller.setCancelAction(() -> builder.cancelAction.accept(dialogStage));
dialogStage.setScene(new Scene(root));
} catch (Exception e) {
LOG.error("Failed to build and show dialog stage.", e);
}
controller.setOkAction(() -> builder.okAction.accept(dialogStage));
controller.setCancelAction(() -> builder.cancelAction.accept(dialogStage));
dialogStage.setScene(new Scene(root));
}
public void showAndWait() {
@ -134,7 +127,11 @@ public class CustomDialog {
}
public CustomDialog build() {
return new CustomDialog(this);
try {
return new CustomDialog(this);
} catch (IOException e) {
throw new UncheckedIOException("Failed to create CustomDialog.", e);
}
}
}
}