From ef54e18cc7935881b712a874c280ed53bf09de65 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 7 Apr 2018 13:55:13 +0300 Subject: [PATCH] Refactor alerts --- .../annimon/voicyanski/MainController.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/annimon/voicyanski/MainController.java b/src/main/java/com/annimon/voicyanski/MainController.java index f42d3f6..ce5e996 100644 --- a/src/main/java/com/annimon/voicyanski/MainController.java +++ b/src/main/java/com/annimon/voicyanski/MainController.java @@ -31,6 +31,8 @@ import org.kordamp.ikonli.javafx.FontIcon; public class MainController implements Initializable { + private static final double MIN_DURATION = 5.0; + @FXML private Button btnMarkStart, btnMarkEnd, btnBackward, btnPlay, btnForward, btnSend; @@ -74,18 +76,14 @@ public class MainController implements Initializable { data.metadata = clipView.getMetadata(); data.startTime = clipView.getClipPartStart(); data.endTime = clipView.getClipPartEnd(); - if(data.endTime - data.startTime > 5.0) { + if (data.endTime - data.startTime > MIN_DURATION) { btnSend.setDisable(true); CompletableFuture.completedFuture(data) .thenApplyAsync(new OpusConvertTask()) .thenApplyAsync(new SendTelegramVoiceTask()) .handleAsync(this::handleVoiceSend); } else { - Alert alert = new Alert(Alert.AlertType.ERROR); - alert.setTitle(Main.getResources().getString("error")); - alert.setHeaderText(null); - alert.setContentText(Main.getResources().getString("zero_file_length")); - alert.showAndWait(); + alertError(Main.getResources().getString("zero_file_length")); } }); } @@ -189,15 +187,19 @@ public class MainController implements Initializable { } private void alertError(Throwable ex) { - Alert alert = new Alert(AlertType.ERROR); - alert.setTitle(Main.getResources().getString("error")); - alert.setHeaderText(null); final String message; if ((ex instanceof CompletionException) && (ex.getCause() != null)) { message = ex.getCause().getLocalizedMessage(); } else { message = ex.getLocalizedMessage(); } + alertError(message); + } + + private void alertError(String message) { + Alert alert = new Alert(AlertType.ERROR); + alert.setTitle(Main.getResources().getString("error")); + alert.setHeaderText(null); alert.setContentText(message); alert.showAndWait(); }