add live load and unload

src/main/java/org/nwapw/abacus/Abacus.java

@@ -1,6 +1,6 @@
 package org.nwapw.abacus;
 
-import org.nwapw.abacus.config.ConfigurationObject;
+import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.fx.AbacusApplication;
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
@@ -9,7 +9,7 @@ import org.nwapw.abacus.parsing.ShuntingYardParser;
 import org.nwapw.abacus.parsing.TreeBuilder;
 import org.nwapw.abacus.plugin.ClassFinder;
 import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.plugin.StandardPlugin;
+//import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.tree.NumberReducer;
 import org.nwapw.abacus.tree.TreeNode;
 
@@ -46,7 +46,7 @@ public class Abacus {
     /**
      * The configuration loaded from a file.
      */
-    private ConfigurationObject configuration;
+    private Configuration configuration;
     /**
      * The tree builder used to construct a tree
      * from a string.
@@ -59,24 +59,30 @@ public class Abacus {
     public Abacus() {
         pluginManager = new PluginManager();
         numberReducer = new NumberReducer(this);
-        configuration = new ConfigurationObject(CONFIG_FILE);
+        configuration = new Configuration(CONFIG_FILE);
-        configuration.save(CONFIG_FILE);
+        configuration.saveTo(CONFIG_FILE);
         LexerTokenizer lexerTokenizer = new LexerTokenizer();
         ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
         treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
 
         pluginManager.addListener(lexerTokenizer);
         pluginManager.addListener(shuntingYardParser);
-        pluginManager.addInstantiated(new StandardPlugin(pluginManager));
+        //pluginManager.addInstantiated(new StandardPlugin(pluginManager));
+        /*
         try {
             ClassFinder.loadJars("plugins")
                     .forEach(plugin -> pluginManager.addClass(plugin));
         } catch (IOException | ClassNotFoundException e) {
             e.printStackTrace();
-        }
+        }//*/
         pluginManager.load();
     }
-
+    public void loadClass(Class<?> newClass){
+        pluginManager.addClass(newClass);
+    }
+    public void unloadClass(Class<?> newClass){
+        pluginManager.removeClass(newClass);
+    }
     public static void main(String[] args) {
         AbacusApplication.launch(AbacusApplication.class, args);
     }
@@ -114,7 +120,7 @@ public class Abacus {
      *
      * @return the configuration object.
      */
-    public ConfigurationObject getConfiguration() {
+    public Configuration getConfiguration() {
         return configuration;
     }
 

src/main/java/org/nwapw/abacus/config/Configuration.java

@@ -1,14 +1,83 @@
 package org.nwapw.abacus.config;
 
+import com.moandjiezana.toml.Toml;
+import com.moandjiezana.toml.TomlWriter;
+
+import java.io.File;
+import java.io.IOException;
+
 /**
- * Serializable class that will be used to load TOML
+ * The configuration object that stores
- * configurations.
+ * options that the user can change.
  */
 public class Configuration {
 
     /**
-     * The type of number this calculator should use.
+     * The TOML writer used to write this configuration to a file.
      */
-    public String numberType;
+    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";
+
+    /**
+     * Creates a new configuration with the given values.
+     * @param numberImplementation the number implementation, like "naive" or "precise"
+     */
+    public Configuration(String numberImplementation){
+        this.numberImplementation = numberImplementation;
+    }
+
+    /**
+     * Loads a configuration from a given file, keeping non-specified fields default.
+     * @param fromFile the file to load from.
+     */
+    public Configuration(File fromFile){
+        if(!fromFile.exists()) return;
+        copyFrom(TOML_READER.read(fromFile).to(Configuration.class));
+    }
+
+    /**
+     * Copies the values from the given configuration into this one.
+     * @param otherConfiguration the configuration to copy from.
+     */
+    public void copyFrom(Configuration otherConfiguration){
+        this.numberImplementation = otherConfiguration.numberImplementation;
+    }
+
+    /**
+     * Saves this configuration to the given file, creating
+     * any directories that do not exist.
+     * @param file the file to save to.
+     */
+    public void saveTo(File file){
+        if(file.getParentFile() != null) file.getParentFile().mkdirs();
+        try {
+            TOML_WRITER.write(this, file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Gets the number implementation from this configuration.
+     * @return the number implementation.
+     */
+    public String getNumberImplementation() {
+        return numberImplementation;
+    }
+
+    /**
+     * Sets the number implementation for the configuration
+     * @param numberImplementation the number implementation.
+     */
+    public void setNumberImplementation(String numberImplementation) {
+        this.numberImplementation = numberImplementation;
+    }
 }

src/main/java/org/nwapw/abacus/config/ConfigurationObject.java

@@ -1,111 +0,0 @@
-package org.nwapw.abacus.config;
-
-import com.moandjiezana.toml.Toml;
-import com.moandjiezana.toml.TomlWriter;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A configuration object, which essentially
- * manages saving, loading, and getting values
- * from the configuration. While Configuration is
- * the data model, this is the interface with it.
- */
-public class ConfigurationObject {
-
-    /**
-     * The writer used to store the configuration.
-     */
-    private static final TomlWriter TOML_WRITER = new TomlWriter();
-    /**
-     * The configuration instance being modeled.
-     */
-    private Configuration configuration;
-
-    /**
-     * Creates a new configuration object with the given config.
-     *
-     * @param config the config to use.
-     */
-    public ConfigurationObject(Configuration config) {
-        setup(config);
-    }
-
-    /**
-     * Create a configuration object by attempting to
-     * load a config from the given path, using the
-     * default configuration otherwise.
-     *
-     * @param path the path to attempt to load.
-     */
-    public ConfigurationObject(File path) {
-        Configuration config;
-        if (!path.exists()) {
-            config = getDefaultConfig();
-        } else {
-            Toml parse = new Toml();
-            parse.read(path);
-            config = parse.to(Configuration.class);
-        }
-        setup(config);
-    }
-
-    /**
-     * Creates a new configuration object with the
-     * default configuration.
-     */
-    public ConfigurationObject() {
-        setup(getDefaultConfig());
-    }
-
-    /**
-     * Sets up the ConfigurationObject.
-     * different constructors do different things,
-     * but they all lead here.
-     *
-     * @param configuration the configuration to set up with.
-     */
-    private void setup(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * Creates a default configuration.
-     *
-     * @return the newly created default configuration.
-     */
-    private Configuration getDefaultConfig() {
-        configuration = new Configuration();
-        configuration.numberType = "naive";
-        return configuration;
-    }
-
-    /**
-     * Returns the implementation the user has requested to
-     * represent their numbers.
-     *
-     * @return the implementation name.
-     */
-    public String getNumberImplementation() {
-        return configuration.numberType;
-    }
-
-    /**
-     * Saves the ConfigurationObject to the given file.
-     *
-     * @param toFile the file to save ot.
-     * @return true if the save succeed, false if otherwise.
-     */
-    public boolean save(File toFile) {
-        if (toFile.getParentFile() != null) toFile.getParentFile().mkdirs();
-        try {
-            TOML_WRITER.write(configuration, toFile);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-}

src/main/java/org/nwapw/abacus/fx/AbacusController.java

@@ -8,8 +8,11 @@ import javafx.scene.text.Text;
 import javafx.util.Callback;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.plugin.ClassFinder;
 import org.nwapw.abacus.tree.TreeNode;
 
+import java.io.IOException;
+
 
 /**
  * The controller for the abacus FX UI, responsible
@@ -40,6 +43,14 @@ public class AbacusController {
     private TextField inputField;
     @FXML
     private Button inputButton;
+    @FXML
+    private ComboBox<String> numberImplementationBox;
+    @FXML
+    private Button loadButton;
+    @FXML
+    private Button unloadButton;
+    @FXML
+    private TextField loadField;
 
     /**
      * The list of history entries, created by the users.
@@ -50,6 +61,8 @@ public class AbacusController {
      * The abacus instance used for calculations and all
      * other main processing code.
      */
+    private ObservableList<String> numberImplementationOptions;
+
     private Abacus abacus;
 
     @FXML
@@ -57,9 +70,15 @@ public class AbacusController {
         Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory =
                 param -> new CopyableCell<>();
 
-        abacus = new Abacus();
         historyData = FXCollections.observableArrayList();
         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);
         inputColumn.setCellFactory(cellFactory);
         inputColumn.setCellValueFactory(cell -> cell.getValue().inputProperty());
@@ -67,6 +86,12 @@ public class AbacusController {
         parsedColumn.setCellValueFactory(cell -> cell.getValue().parsedProperty());
         outputColumn.setCellFactory(cellFactory);
         outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty());
+
+        abacus = new Abacus();
+        numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
+        String actualImplementation = abacus.getConfiguration().getNumberImplementation();
+        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "naive";
+        numberImplementationBox.getSelectionModel().select(toSelect);
     }
 
     @FXML
@@ -90,5 +115,38 @@ public class AbacusController {
         inputButton.setDisable(false);
         inputField.setText("");
     }
+    @FXML
+    private void loadClass(){
+        try {
+            for(Class<?> plugin :ClassFinder.loadJars("plugins")){
+                String name = "";
+                //String name = plugin.getName();
+                while(!(name.indexOf('/') ==-1)){
+                    name=name.substring(name.indexOf('/')+1);
+                }
+                if(loadField.getText().equals("")||loadField.getText().equals(name)||(loadField.getText()+".class").equals(name)){
+                    //abacus.loadClass(plugin);
+                }
+            }
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+    @FXML
+    private void unloadClass(){
+        try {
+            for(Class<?> plugin :ClassFinder.loadJars("plugins")){
+                String name = plugin.getName();
+                while(!(name.indexOf('/') ==-1)){
+                    name=name.substring(name.indexOf('/')+1);
+                }
+                if(loadField.getText().equals("")||loadField.getText().equals(name)||(loadField.getText()+".class").equals(name)){
+                    //abacus.unloadClass(plugin);
+                }
+            }
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
 
 }

src/main/java/org/nwapw/abacus/plugin/PluginManager.java

@@ -140,6 +140,11 @@ public class PluginManager {
         plugins.add(plugin);
         loadedPluginClasses.add(plugin.getClass());
     }
+    public void removeInstantiated(Plugin plugin){
+        if (loadedPluginClasses.contains(plugin.getClass())) return;
+        plugins.remove(plugin);
+        loadedPluginClasses.remove(plugin.getClass());
+    }
 
     /**
      * Instantiates a class of plugin, and adds it to this
@@ -155,6 +160,14 @@ public class PluginManager {
             e.printStackTrace();
         }
     }
+    public void removeClass(Class<?> newClass){
+        if (!Plugin.class.isAssignableFrom(newClass) || newClass == Plugin.class) return;
+        try {
+            removeInstantiated((Plugin) newClass.getConstructor(PluginManager.class).newInstance(this));
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
 
     /**
      * Loads all the plugins in the PluginManager.

src/main/resources/abacus.fxml

@@ -5,6 +5,8 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.GridPane?>
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             fx:controller="org.nwapw.abacus.fx.AbacusController">
@@ -39,7 +41,16 @@
                     </bottom>
                 </BorderPane>
             </Tab>
-            <Tab text="Settings" closable="false"/>
+            <Tab text="Settings" closable="false">
+                <GridPane hgap="10" vgap="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"/>
+                    <Button fx:id="loadButton" text="Load" GridPane.rowIndex="1" GridPane.columnIndex="0" maxWidth = "Infinity" onAction="#loadClass"/>
+                    <Button fx:id="unloadButton" text="Unload" GridPane.rowIndex="1" GridPane.columnIndex="1" maxWidth = "Infinity" onAction="#unloadClass"/>
+                    <TextField fx:id="loadField" GridPane.rowIndex="1" GridPane.columnIndex="2"/>
+                </GridPane>
+            </Tab>
         </TabPane>
     </center>