From 4f7fe053dede32f9da0368dcfd956650d275f79d Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Sat, 5 Aug 2017 13:57:27 -0700
Subject: [PATCH] Add a stop button.

---
 src/main/java/org/nwapw/abacus/fx/AbacusController.java | 8 +++++++-
 src/main/resources/abacus.fxml                          | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index 91e4fc5..e328912 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -70,6 +70,8 @@ public class AbacusController implements PluginListener {
     @FXML
     private Button inputButton;
     @FXML
+    private Button stopButton;
+    @FXML
     private ComboBox<String> numberImplementationBox;
     @FXML
     private ListView<ToggleablePlugin> enabledPluginView;
@@ -86,7 +88,6 @@ public class AbacusController implements PluginListener {
     private ObservableList<String> numberImplementationOptions;
 
     /**
-     * <<<<<<< HEAD
      * The list of plugin objects that can be toggled on and off,
      * and, when reloaded, get added to the plugin manager's black list.
      */
@@ -192,6 +193,11 @@ public class AbacusController implements PluginListener {
         inputField.setText("");
     }
 
+    @FXML
+    private void performStop(){
+        System.out.println("Stopping");
+    }
+
     @FXML
     private void performSaveAndReload() {
         performSave();
diff --git a/src/main/resources/abacus.fxml b/src/main/resources/abacus.fxml
index d3f3cc6..9ee57d4 100644
--- a/src/main/resources/abacus.fxml
+++ b/src/main/resources/abacus.fxml
@@ -34,6 +34,8 @@
                             <TextField fx:id="inputField" onAction="#performCalculation"/>
                             <Button fx:id="inputButton" text="Calculate" maxWidth="Infinity"
                                     onAction="#performCalculation"/>
+                            <Button fx:id="stopButton" text="Stop" maxWidth="Infinity"
+                                    onAction="#performStop"/>
                         </VBox>
                     </bottom>
                 </BorderPane>