Task are now run async. JavaFX Thread doesn't lock while the app is performing tasks.

emlautarom1 · emlautarom1 · commit b6c6b47ab406 · 2019-05-08T19:44:07.000-03:00
diff --git a/src/main/java/app/controller/MainController.java b/src/main/java/app/controller/MainController.java
@@ -4,10 +4,13 @@
 import app.model.Operations;
 import app.model.ProtectionCustomSetting;
 import app.service.TaskManager;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.Cursor;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.TextField;
@@ -21,6 +24,7 @@
 import java.net.URL;
 import java.util.LinkedHashMap;
 import java.util.ResourceBundle;
+import java.util.concurrent.CompletableFuture;
 
 public class MainController implements Initializable {
     private LinkedHashMap<String, Integer> protectionLevelsOptions;
@@ -33,7 +37,6 @@ public class MainController implements Initializable {
     @FXML
     private TextField outputPathTextField;
 
-
     @FXML
     private ChoiceBox<String> protectionLevelsChoiceBox;
 
@@ -46,6 +49,9 @@ public class MainController implements Initializable {
     @FXML
     private VBox protectionAdvancedSettingsContainer;
 
+    @FXML
+    private Button runButton;
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         setOperations();
@@ -55,19 +61,8 @@ public void initialize(URL location, ResourceBundle resources) {
 
     @FXML
     private void runApplication() {
-        ApplicationExecutionSettings settings = new ApplicationExecutionSettings(
-                sourcePathTextField.getText(),
-                outputPathTextField.getText(),
-                getOperations(),
-                getProtectionLevel(),
-                getProtectionCustomSetting()
-        );
-        try {
-            long elapsedTime = TaskManager.runApplicationWithSettings(settings);
-            displaySucces(elapsedTime);
-        } catch (Error error) {
-            displayError(error);
-        }
+        ApplicationExecutionSettings settings = getApplicationExecutionSettings();
+        runApplicationAsync(settings);
     }
 
     @FXML
@@ -113,6 +108,38 @@ private void displayAbout() {
         alert.showAndWait();
     }
 
+    private void runApplicationAsync(ApplicationExecutionSettings settings) {
+        // Change the UI to reflect that the app is running
+        this.runButton.setDisable(true);
+        this.runButton.getScene().setCursor(Cursor.WAIT);
+        // Run tasks asynchronously
+        CompletableFuture
+                .supplyAsync(() -> TaskManager.runApplicationWithSettings(settings))
+                .handle((elapsedTime, error) -> {
+                    if (error == null) {
+                        Platform.runLater(() -> displaySucces(elapsedTime));
+                    } else {
+                        Platform.runLater(() -> displayError(error.getCause().getMessage()));
+                    }
+                    // Restore the UI
+                    Platform.runLater(() -> {
+                        this.runButton.setDisable(false);
+                        this.runButton.getScene().setCursor(Cursor.DEFAULT);
+                    });
+                    return null;
+                });
+    }
+
+    private ApplicationExecutionSettings getApplicationExecutionSettings() {
+        return new ApplicationExecutionSettings(
+                sourcePathTextField.getText(),
+                outputPathTextField.getText(),
+                getOperations(),
+                getProtectionLevel(),
+                getProtectionCustomSetting()
+        );
+    }
+
     private void setOperations() {
         operationsChoiceBox.setItems(
                 FXCollections.observableArrayList(
@@ -198,11 +225,11 @@ private void displaySucces(long elapsedTime) {
         alert.showAndWait();
     }
 
-    private void displayError(Error error) {
+    private void displayError(String message) {
         Alert alert = new Alert(Alert.AlertType.ERROR);
         alert.setTitle("Error");
         alert.setHeaderText("Ooops, something went wrong!");
-        alert.setContentText(error.getMessage());
+        alert.setContentText(message);
         alert.showAndWait();
     }
 }
diff --git a/src/main/resources/app/fxml/main.fxml b/src/main/resources/app/fxml/main.fxml
@@ -14,73 +14,69 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="600.0" spacing="20.0"
-      xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="app.controller.MainController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.MainController">
     <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
     </padding>
     <AnchorPane VBox.vgrow="NEVER">
         <padding>
-            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
         </padding>
         <VBox.margin>
-            <Insets/>
+            <Insets />
         </VBox.margin>
         <Button contentDisplay="RIGHT" layoutX="475.0" layoutY="22.0" mnemonicParsing="false"
                 onAction="#displayAbout" prefWidth="115.0" text="About" AnchorPane.rightAnchor="0.0"/>
         <ImageView fitHeight="150.0" fitWidth="200.0" onMouseClicked="#openSite" pickOnBounds="true"
                    preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                    AnchorPane.topAnchor="0.0">
             <cursor>
-                <Cursor fx:constant="HAND"/>
+                <Cursor fx:constant="HAND" />
             </cursor>
-            <Image url="@../img/unsl_logo.png"/>
+            <Image url="@../img/unsl_logo.png" />
         </ImageView>
     </AnchorPane>
-    <Separator prefWidth="200.0"/>
+    <Separator prefWidth="200.0" />
     <HBox spacing="20.0" VBox.vgrow="NEVER">
-        <Label minWidth="-Infinity" prefWidth="80.0" text="Source File:"/>
-        <TextField fx:id="sourcePathTextField" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
+        <Label minWidth="-Infinity" prefWidth="80.0" text="Source File:" />
+        <TextField fx:id="sourcePathTextField" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
         <Button mnemonicParsing="false" onAction="#setSourcePath">
             <graphic>
                 <ImageView fitHeight="30.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-                    <Image url="@../icon/folder.png"/>
+                    <Image url="@../icon/folder.png" />
                 </ImageView>
             </graphic>
         </Button>
     </HBox>
     <HBox layoutX="20.0" layoutY="132.0" spacing="20.0">
-        <Label minWidth="-Infinity" prefWidth="80.0" text="Output File:"/>
-        <TextField fx:id="outputPathTextField" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
+        <Label minWidth="-Infinity" prefWidth="80.0" text="Output File:" />
+        <TextField fx:id="outputPathTextField" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
         <Button mnemonicParsing="false" onAction="#setOutputPath">
             <graphic>
                 <ImageView fitHeight="30.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-                    <Image url="@../icon/folder.png"/>
+                    <Image url="@../icon/folder.png" />
                 </ImageView>
             </graphic>
         </Button>
     </HBox>
-    <Separator prefWidth="200.0"/>
+    <Separator prefWidth="200.0" />
     <HBox alignment="CENTER_LEFT" spacing="50.0" VBox.vgrow="NEVER">
-        <Label text="Operation(s):"/>
-        <ChoiceBox fx:id="operationsChoiceBox" prefWidth="150.0"/>
+        <Label text="Operation(s):" />
+        <ChoiceBox fx:id="operationsChoiceBox" prefWidth="150.0" />
     </HBox>
-    <Separator layoutX="20.0" layoutY="222.0" prefWidth="200.0"/>
+    <Separator layoutX="20.0" layoutY="222.0" prefWidth="200.0" />
     <VBox fx:id="protectionAdvancedSettingsContainer" spacing="20.0">
-        <Label text="Protection Advanced Settings:"/>
+        <Label text="Protection Advanced Settings:" />
         <HBox alignment="CENTER_LEFT" spacing="50.0">
-            <ChoiceBox fx:id="protectionLevelsChoiceBox" prefWidth="150.0"/>
-            <CheckBox fx:id="protectionCustomSetting" mnemonicParsing="false" text="CustomSetting"/>
+            <ChoiceBox fx:id="protectionLevelsChoiceBox" prefWidth="150.0" />
+            <CheckBox fx:id="protectionCustomSetting" mnemonicParsing="false" text="CustomSetting" />
         </HBox>
     </VBox>
     <AnchorPane prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-        <Button contentDisplay="RIGHT" defaultButton="true" graphicTextGap="10.0" mnemonicParsing="false"
-                onAction="#runApplication" prefWidth="115.0" text="Run" AnchorPane.bottomAnchor="0.0"
-                AnchorPane.rightAnchor="0.0">
+        <Button fx:id="runButton" contentDisplay="RIGHT" defaultButton="true" graphicTextGap="10.0" mnemonicParsing="false" onAction="#runApplication" prefWidth="115.0" text="Run" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
             <graphic>
                 <ImageView fitHeight="150.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-                    <Image url="@../icon/startup.png"/>
+                    <Image url="@../icon/startup.png" />
                 </ImageView>
             </graphic>
         </Button>
