From f181fdd8dcc62f636baae44f4b399edb8a7f816c Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 18:24:20 -0700
Subject: [PATCH 01/11] Add the new UI components required for the plugin
 loading.

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

diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index aa898d8..575adfd 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -42,6 +42,10 @@ public class AbacusController {
     private Button inputButton;
     @FXML
     private ComboBox<String> numberImplementationBox;
+    @FXML
+    private ListView enabledPluginView;
+    @FXML
+    private Button reloadButton;
 
     /**
      * The list of history entries, created by the users.
diff --git a/src/main/resources/abacus.fxml b/src/main/resources/abacus.fxml
index 183e247..0cd471b 100644
--- a/src/main/resources/abacus.fxml
+++ b/src/main/resources/abacus.fxml
@@ -46,6 +46,10 @@
                     <padding><Insets left="10" right="10" top="10" bottom="10"/></padding>
                     <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
                     <ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
+                    <ListView fx:id="enabledPluginView"
+                              GridPane.rowIndex="1" GridPane.columnIndex="0"
+                              GridPane.columnSpan="2" maxHeight="100"/>
+                    <Button fx:id="reloadButton" text="Reload" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
                 </GridPane>
             </Tab>
         </TabPane>

From d05850edfab32a985308b375fdf1c5fdd243f910 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 18:33:58 -0700
Subject: [PATCH 02/11] Add the disabled plugins configuration option.

---
 .../nwapw/abacus/config/Configuration.java    | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/nwapw/abacus/config/Configuration.java b/src/main/java/org/nwapw/abacus/config/Configuration.java
index 6253632..9a511cf 100644
--- a/src/main/java/org/nwapw/abacus/config/Configuration.java
+++ b/src/main/java/org/nwapw/abacus/config/Configuration.java
@@ -5,6 +5,10 @@ import com.moandjiezana.toml.TomlWriter;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * The configuration object that stores
@@ -25,13 +29,19 @@ public class Configuration {
      * The implementation of the number that should be used.
      */
     private String numberImplementation = "naive";
+    /**
+     * The list of disabled plugins in this Configuration.
+     */
+    private Set<String> disabledPlugins = new HashSet<>();
 
     /**
      * Creates a new configuration with the given values.
      * @param numberImplementation the number implementation, like "naive" or "precise"
+     * @param disabledPlugins the list of disabled plugins.
      */
-    public Configuration(String numberImplementation){
+    public Configuration(String numberImplementation, String[] disabledPlugins){
         this.numberImplementation = numberImplementation;
+        this.disabledPlugins.addAll(Arrays.asList(disabledPlugins));
     }
 
     /**
@@ -49,6 +59,7 @@ public class Configuration {
      */
     public void copyFrom(Configuration otherConfiguration){
         this.numberImplementation = otherConfiguration.numberImplementation;
+        this.disabledPlugins.addAll(otherConfiguration.disabledPlugins);
     }
 
     /**
@@ -80,4 +91,38 @@ public class Configuration {
     public void setNumberImplementation(String numberImplementation) {
         this.numberImplementation = numberImplementation;
     }
+
+    /**
+     * Gets the list of disabled plugins.
+     * @return the list of disabled plugins.
+     */
+    public Set<String> getDisabledPlugins() {
+        return disabledPlugins;
+    }
+
+    /**
+     * Adds the given plugin to the disabled plugins list.
+     * @param pluginClass the plugin to disable.
+     */
+    public void disablePlugin(String pluginClass){
+        disabledPlugins.add(pluginClass);
+    }
+
+    /**
+     * Removes the given plugin from the disabled plugins list.
+     * @param pluginClass the plugin to enable.
+     */
+    public void enablePlugin(String pluginClass){
+        disabledPlugins.remove(pluginClass);
+    }
+
+    /**
+     * Sets the disabled plugins to be as specified.
+     * @param newDisabled the new list of disabled plugins.
+     */
+    public void setDisabledPlugins(Collection<String> newDisabled){
+        disabledPlugins.clear();
+        disabledPlugins.addAll(newDisabled);
+    }
+
 }

From 482c3c2dd13746f5111db30950c66fb3a2ae5cf5 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 18:39:00 -0700
Subject: [PATCH 03/11] Add a data model for the plugins displayed in the
 enabled plugins list.

---
 .../org/nwapw/abacus/fx/ToggleablePlugin.java | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/java/org/nwapw/abacus/fx/ToggleablePlugin.java

diff --git a/src/main/java/org/nwapw/abacus/fx/ToggleablePlugin.java b/src/main/java/org/nwapw/abacus/fx/ToggleablePlugin.java
new file mode 100644
index 0000000..e311819
--- /dev/null
+++ b/src/main/java/org/nwapw/abacus/fx/ToggleablePlugin.java
@@ -0,0 +1,29 @@
+package org.nwapw.abacus.fx;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+public class ToggleablePlugin {
+
+    private final BooleanProperty enabled;
+    private final String className;
+
+    public ToggleablePlugin(boolean enabled, String className){
+        this.enabled = new SimpleBooleanProperty();
+        this.enabled.setValue(enabled);
+        this.className = className;
+    }
+
+    public BooleanProperty enabledProperty() {
+        return enabled;
+    }
+
+    public boolean isEnabled() {
+        return enabled.get();
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+}

From 27ffa4c78fd5dd926495db7249d0afeb2dc444b8 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 18:48:42 -0700
Subject: [PATCH 04/11] Add a check box list cell generator.

---
 .../org/nwapw/abacus/fx/AbacusController.java | 25 ++++++++++++++++++-
 1 file changed, 24 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 575adfd..b9adac9 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -4,8 +4,10 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.text.Text;
 import javafx.util.Callback;
+import javafx.util.StringConverter;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.tree.TreeNode;
@@ -43,7 +45,7 @@ public class AbacusController {
     @FXML
     private ComboBox<String> numberImplementationBox;
     @FXML
-    private ListView enabledPluginView;
+    private ListView<ToggleablePlugin> enabledPluginView;
     @FXML
     private Button reloadButton;
 
@@ -58,12 +60,30 @@ public class AbacusController {
      */
     private ObservableList<String> numberImplementationOptions;
 
+    /**
+     * The list of plugin objects that can be toggled on and off,
+     * and, when reloaded, get added to the plugin manager's black list.
+     */
+    private ObservableList<ToggleablePlugin> enabledPlugins;
+
     private Abacus abacus;
 
     @FXML
     public void initialize(){
         Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory =
                 param -> new CopyableCell<>();
+        Callback<ListView<ToggleablePlugin>, ListCell<ToggleablePlugin>> pluginCellFactory =
+                param -> new CheckBoxListCell<>(ToggleablePlugin::enabledProperty, new StringConverter<ToggleablePlugin>() {
+                    @Override
+                    public String toString(ToggleablePlugin object) {
+                        return object.getClassName().substring(object.getClassName().lastIndexOf('.') + 1);
+                    }
+
+                    @Override
+                    public ToggleablePlugin fromString(String string) {
+                        return new ToggleablePlugin(true, string);
+                    }
+                });
 
         historyData = FXCollections.observableArrayList();
         historyTable.setItems(historyData);
@@ -75,6 +95,9 @@ public class AbacusController {
             abacus.getConfiguration().saveTo(Abacus.CONFIG_FILE);
         });
         historyTable.getSelectionModel().setCellSelectionEnabled(true);
+        enabledPlugins = FXCollections.observableArrayList();
+        enabledPluginView.setItems(enabledPlugins);
+        enabledPluginView.setCellFactory(pluginCellFactory);
         inputColumn.setCellFactory(cellFactory);
         inputColumn.setCellValueFactory(cell -> cell.getValue().inputProperty());
         parsedColumn.setCellFactory(cellFactory);

From 8ae9b2fcbd5bfad1154fe93d16353258674489d0 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:01:01 -0700
Subject: [PATCH 05/11] Write disabled / enabled plugins to the configuration.

---
 .../nwapw/abacus/config/Configuration.java    | 26 -------------------
 .../org/nwapw/abacus/fx/AbacusController.java | 23 +++++++++++++++-
 .../nwapw/abacus/plugin/PluginManager.java    | 10 ++++++-
 src/main/resources/abacus.fxml                |  3 ++-
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/config/Configuration.java b/src/main/java/org/nwapw/abacus/config/Configuration.java
index 9a511cf..69e1272 100644
--- a/src/main/java/org/nwapw/abacus/config/Configuration.java
+++ b/src/main/java/org/nwapw/abacus/config/Configuration.java
@@ -6,7 +6,6 @@ import com.moandjiezana.toml.TomlWriter;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -100,29 +99,4 @@ public class Configuration {
         return disabledPlugins;
     }
 
-    /**
-     * Adds the given plugin to the disabled plugins list.
-     * @param pluginClass the plugin to disable.
-     */
-    public void disablePlugin(String pluginClass){
-        disabledPlugins.add(pluginClass);
-    }
-
-    /**
-     * Removes the given plugin from the disabled plugins list.
-     * @param pluginClass the plugin to enable.
-     */
-    public void enablePlugin(String pluginClass){
-        disabledPlugins.remove(pluginClass);
-    }
-
-    /**
-     * Sets the disabled plugins to be as specified.
-     * @param newDisabled the new list of disabled plugins.
-     */
-    public void setDisabledPlugins(Collection<String> newDisabled){
-        disabledPlugins.clear();
-        disabledPlugins.addAll(newDisabled);
-    }
-
 }
diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index b9adac9..5b7b4c5 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -9,9 +9,12 @@ import javafx.scene.text.Text;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.tree.TreeNode;
 
+import java.util.Set;
+
 
 /**
  * The controller for the abacus FX UI, responsible
@@ -106,10 +109,16 @@ public class AbacusController {
         outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty());
 
         abacus = new Abacus();
+        Configuration configuration = abacus.getConfiguration();
+        Set<String> disabledPlugins = configuration.getDisabledPlugins();
         numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
-        String actualImplementation = abacus.getConfiguration().getNumberImplementation();
+        String actualImplementation = configuration.getNumberImplementation();
         String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "naive";
         numberImplementationBox.getSelectionModel().select(toSelect);
+        for(Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()){
+            String fullName = pluginClass.getName();
+            enabledPlugins.add(new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName));
+        }
     }
 
     @FXML
@@ -134,4 +143,16 @@ public class AbacusController {
         inputField.setText("");
     }
 
+    @FXML
+    private void performReload(){
+        Configuration configuration = abacus.getConfiguration();
+        Set<String> disabledPlugins = configuration.getDisabledPlugins();
+        disabledPlugins.clear();
+        for(ToggleablePlugin pluginEntry : enabledPlugins){
+            if(!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
+        }
+        abacus.getPluginManager().reload();
+        abacus.getConfiguration().saveTo(Abacus.CONFIG_FILE);
+    }
+
 }
diff --git a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
index 757ac67..1c8748e 100644
--- a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
+++ b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
@@ -185,7 +185,7 @@ public class PluginManager {
      */
     public void reload() {
         unload();
-        reload();
+        load();
     }
 
     /**
@@ -233,4 +233,12 @@ public class PluginManager {
         listeners.remove(listener);
     }
 
+    /**
+     * Gets a list of all the plugin class files that have been
+     * added to the plugin manager.
+     * @return the list of all the added plugin classes.
+     */
+    public Set<Class<?>> getLoadedPluginClasses() {
+        return loadedPluginClasses;
+    }
 }
diff --git a/src/main/resources/abacus.fxml b/src/main/resources/abacus.fxml
index 0cd471b..14e809f 100644
--- a/src/main/resources/abacus.fxml
+++ b/src/main/resources/abacus.fxml
@@ -49,7 +49,8 @@
                     <ListView fx:id="enabledPluginView"
                               GridPane.rowIndex="1" GridPane.columnIndex="0"
                               GridPane.columnSpan="2" maxHeight="100"/>
-                    <Button fx:id="reloadButton" text="Reload" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
+                    <Button fx:id="reloadButton" text="Reload" GridPane.rowIndex="2" GridPane.columnIndex="0"
+                            onAction="#performReload"/>
                 </GridPane>
             </Tab>
         </TabPane>

From 21150fa7a2a07cfd61976d66cc2bf7e0636cb260 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:06:16 -0700
Subject: [PATCH 06/11] Actually disable loading the plugin functions in the
 PluginManager.

---
 src/main/java/org/nwapw/abacus/Abacus.java    |  2 +-
 .../nwapw/abacus/plugin/PluginManager.java    | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/Abacus.java b/src/main/java/org/nwapw/abacus/Abacus.java
index bf8328f..649bb1a 100644
--- a/src/main/java/org/nwapw/abacus/Abacus.java
+++ b/src/main/java/org/nwapw/abacus/Abacus.java
@@ -57,7 +57,7 @@ public class Abacus {
      * Creates a new instance of the Abacus calculator.
      */
     public Abacus() {
-        pluginManager = new PluginManager();
+        pluginManager = new PluginManager(this);
         numberReducer = new NumberReducer(this);
         configuration = new Configuration(CONFIG_FILE);
         configuration.saveTo(CONFIG_FILE);
diff --git a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
index 1c8748e..8450bf7 100644
--- a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
+++ b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
@@ -1,5 +1,6 @@
 package org.nwapw.abacus.plugin;
 
+import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -52,11 +53,17 @@ public class PluginManager {
      * The list of plugin listeners attached to this instance.
      */
     private Set<PluginListener> listeners;
+    /**
+     * The abacus instance used to access other
+     * components of the application.
+     */
+    private Abacus abacus;
 
     /**
      * Creates a new plugin manager.
      */
-    public PluginManager() {
+    public PluginManager(Abacus abacus) {
+        this.abacus = abacus;
         loadedPluginClasses = new HashSet<>();
         plugins = new HashSet<>();
         cachedFunctions = new HashMap<>();
@@ -160,8 +167,13 @@ public class PluginManager {
      * Loads all the plugins in the PluginManager.
      */
     public void load() {
-        for (Plugin plugin : plugins) plugin.enable();
+        Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
         for (Plugin plugin : plugins) {
+            if(disabledPlugins.contains(plugin.getClass().getName())) continue;
+            plugin.enable();
+        }
+        for (Plugin plugin : plugins) {
+            if(disabledPlugins.contains(plugin.getClass().getName())) continue;
             allFunctions.addAll(plugin.providedFunctions());
             allOperators.addAll(plugin.providedOperators());
             allNumbers.addAll(plugin.providedNumbers());
@@ -173,7 +185,11 @@ public class PluginManager {
      * Unloads all the plugins in the PluginManager.
      */
     public void unload() {
-        for (Plugin plugin : plugins) plugin.disable();
+        Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
+        for (Plugin plugin : plugins) {
+            if(disabledPlugins.contains(plugin.getClass().getName())) continue;
+            plugin.disable();
+        }
         allFunctions.clear();
         allOperators.clear();
         allNumbers.clear();

From df94f698c370a9ddaf1e75ff0376474b4feb9274 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:14:50 -0700
Subject: [PATCH 07/11] Clear caches on unload and call onUnload before plugins
 are removed.

---
 src/main/java/org/nwapw/abacus/plugin/PluginManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
index 8450bf7..ab116dc 100644
--- a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
+++ b/src/main/java/org/nwapw/abacus/plugin/PluginManager.java
@@ -185,15 +185,18 @@ public class PluginManager {
      * Unloads all the plugins in the PluginManager.
      */
     public void unload() {
+        listeners.forEach(e -> e.onUnload(this));
         Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
         for (Plugin plugin : plugins) {
             if(disabledPlugins.contains(plugin.getClass().getName())) continue;
             plugin.disable();
         }
+        cachedFunctions.clear();
+        cachedOperators.clear();
+        cachedNumbers.clear();
         allFunctions.clear();
         allOperators.clear();
         allNumbers.clear();
-        listeners.forEach(e -> e.onUnload(this));
     }
 
     /**

From 3650d1eec752656e5cb1f3becd675021e7c35d49 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:18:33 -0700
Subject: [PATCH 08/11] Refresh all settings on plugin load.

---
 .../org/nwapw/abacus/fx/AbacusController.java | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index 5b7b4c5..a3dd793 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -11,6 +11,8 @@ import javafx.util.StringConverter;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.plugin.PluginListener;
+import org.nwapw.abacus.plugin.PluginManager;
 import org.nwapw.abacus.tree.TreeNode;
 
 import java.util.Set;
@@ -20,7 +22,7 @@ import java.util.Set;
  * The controller for the abacus FX UI, responsible
  * for all the user interaction.
  */
-public class AbacusController {
+public class AbacusController implements PluginListener {
 
     /**
      * Constant string that is displayed if the text could not be lexed or parsed.
@@ -109,16 +111,8 @@ public class AbacusController {
         outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty());
 
         abacus = new Abacus();
-        Configuration configuration = abacus.getConfiguration();
-        Set<String> disabledPlugins = configuration.getDisabledPlugins();
-        numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
-        String actualImplementation = configuration.getNumberImplementation();
-        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "naive";
-        numberImplementationBox.getSelectionModel().select(toSelect);
-        for(Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()){
-            String fullName = pluginClass.getName();
-            enabledPlugins.add(new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName));
-        }
+        abacus.getPluginManager().addListener(this);
+        abacus.getPluginManager().reload();
     }
 
     @FXML
@@ -155,4 +149,23 @@ public class AbacusController {
         abacus.getConfiguration().saveTo(Abacus.CONFIG_FILE);
     }
 
+    @Override
+    public void onLoad(PluginManager manager) {
+        Configuration configuration = abacus.getConfiguration();
+        Set<String> disabledPlugins = configuration.getDisabledPlugins();
+        numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
+        String actualImplementation = configuration.getNumberImplementation();
+        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "naive";
+        numberImplementationBox.getSelectionModel().select(toSelect);
+        for(Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()){
+            String fullName = pluginClass.getName();
+            enabledPlugins.add(new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName));
+        }
+    }
+
+    @Override
+    public void onUnload(PluginManager manager) {
+        enabledPlugins.clear();
+        numberImplementationOptions.clear();
+    }
 }

From f194eb891c1329544913860e7cde368c42c20b74 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:26:14 -0700
Subject: [PATCH 09/11] Change the default implementation string to "<default>"

---
 src/main/java/org/nwapw/abacus/fx/AbacusController.java | 2 +-
 1 file changed, 1 insertion(+), 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 a3dd793..29ee546 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -155,7 +155,7 @@ public class AbacusController implements PluginListener {
         Set<String> disabledPlugins = configuration.getDisabledPlugins();
         numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
         String actualImplementation = configuration.getNumberImplementation();
-        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "naive";
+        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "<default>";
         numberImplementationBox.getSelectionModel().select(toSelect);
         for(Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()){
             String fullName = pluginClass.getName();

From 39c84b2c3f3a190bc5e31a2d874bd8d4daf3e394 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 19:37:35 -0700
Subject: [PATCH 10/11] Stop autosaving, switch to save + reload buttons.

---
 .../org/nwapw/abacus/fx/AbacusController.java     | 15 +++++++--------
 src/main/resources/abacus.fxml                    |  6 ++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index 29ee546..ebd7437 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -51,8 +51,6 @@ public class AbacusController implements PluginListener {
     private ComboBox<String> numberImplementationBox;
     @FXML
     private ListView<ToggleablePlugin> enabledPluginView;
-    @FXML
-    private Button reloadButton;
 
     /**
      * The list of history entries, created by the users.
@@ -94,11 +92,6 @@ public class AbacusController implements PluginListener {
         historyTable.setItems(historyData);
         numberImplementationOptions = FXCollections.observableArrayList();
         numberImplementationBox.setItems(numberImplementationOptions);
-        numberImplementationBox.valueProperty().addListener((observable, oldValue, newValue)
-                -> {
-            abacus.getConfiguration().setNumberImplementation(newValue);
-            abacus.getConfiguration().saveTo(Abacus.CONFIG_FILE);
-        });
         historyTable.getSelectionModel().setCellSelectionEnabled(true);
         enabledPlugins = FXCollections.observableArrayList();
         enabledPluginView.setItems(enabledPlugins);
@@ -146,7 +139,13 @@ public class AbacusController implements PluginListener {
             if(!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
         }
         abacus.getPluginManager().reload();
-        abacus.getConfiguration().saveTo(Abacus.CONFIG_FILE);
+    }
+
+    @FXML
+    private void performSave(){
+        Configuration configuration = abacus.getConfiguration();
+        configuration.setNumberImplementation(numberImplementationBox.getSelectionModel().getSelectedItem());
+        configuration.saveTo(Abacus.CONFIG_FILE);
     }
 
     @Override
diff --git a/src/main/resources/abacus.fxml b/src/main/resources/abacus.fxml
index 14e809f..8d8567c 100644
--- a/src/main/resources/abacus.fxml
+++ b/src/main/resources/abacus.fxml
@@ -49,8 +49,10 @@
                     <ListView fx:id="enabledPluginView"
                               GridPane.rowIndex="1" GridPane.columnIndex="0"
                               GridPane.columnSpan="2" maxHeight="100"/>
-                    <Button fx:id="reloadButton" text="Reload" GridPane.rowIndex="2" GridPane.columnIndex="0"
-                            onAction="#performReload"/>
+                    <HBox GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" spacing="10">
+                        <Button text="Apply" onAction="#performSave"/>
+                        <Button text="Reload" onAction="#performReload"/>
+                    </HBox>
                 </GridPane>
             </Tab>
         </TabPane>

From 91f238f7e2f569c3b77a60c0678602566636f127 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 2 Aug 2017 21:57:53 -0700
Subject: [PATCH 11/11] Add defaults that actually work.

---
 .../org/nwapw/abacus/config/Configuration.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/config/Configuration.java b/src/main/java/org/nwapw/abacus/config/Configuration.java
index 69e1272..951edee 100644
--- a/src/main/java/org/nwapw/abacus/config/Configuration.java
+++ b/src/main/java/org/nwapw/abacus/config/Configuration.java
@@ -15,19 +15,25 @@ import java.util.Set;
  */
 public class Configuration {
 
+    /**
+     * The defaults TOML string.
+     */
+    private static final String DEFAULT_CONFIG =
+            "numberImplementation = \"naive\"\n" +
+            "disabledPlugins = []";
+    /**
+     * The defaults TOML object, parsed from the string.
+     */
+    private static final Toml DEFAULT_TOML = new Toml().read(DEFAULT_CONFIG);
     /**
      * The TOML writer used to write this configuration to a file.
      */
     private static final TomlWriter TOML_WRITER = new TomlWriter();
-    /**
-     * The TOML reader used to load this config from a file.
-     */
-    private static final Toml TOML_READER = new Toml();
 
     /**
      * The implementation of the number that should be used.
      */
-    private String numberImplementation = "naive";
+    private String numberImplementation = "<default>";
     /**
      * The list of disabled plugins in this Configuration.
      */
@@ -49,7 +55,7 @@ public class Configuration {
      */
     public Configuration(File fromFile){
         if(!fromFile.exists()) return;
-        copyFrom(TOML_READER.read(fromFile).to(Configuration.class));
+        copyFrom(new Toml(DEFAULT_TOML).read(fromFile).to(Configuration.class));
     }
 
     /**