From 9bdf188ca7969ff0382b97f8cf8ac100820c48d7 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Thu, 23 Nov 2017 18:59:33 -0800 Subject: [PATCH] Add loading of files to the core, but not the UI. --- .../org/nwapw/abacus/fx/AbacusController.java | 32 +++++++++++++++++-- .../nwapw/abacus/fx/ExtendedConfiguration.kt | 13 ++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java index 903225a..eec15bf 100644 --- a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java +++ b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java @@ -23,9 +23,12 @@ import org.nwapw.abacus.EvaluationResult; import org.nwapw.abacus.tree.nodes.TreeNode; import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; +import java.util.Scanner; import java.util.Set; import java.util.stream.Collectors; @@ -69,6 +72,7 @@ public class AbacusController implements PluginListener { * Constant string that is displayed if the calculations are interrupted by an exception. */ private static final String ERR_EXCEPTION = "Exception Thrown"; + private static final String ERR_DEFINITION = "Definition Error"; @FXML private TabPane coreTabPane; @FXML @@ -304,6 +308,30 @@ public class AbacusController implements PluginListener { reloadAlertShown = false; } + private void loadDefinitionFile(String fileName){ + File definitionFile = new File(fileName); + if(!definitionFile.exists()) return; + try { + FileReader fileReader = new FileReader(definitionFile); + Scanner scanner = new Scanner(fileReader); + while(scanner.hasNext()){ + abacus.evaluateTree(abacus.parseString(scanner.nextLine())); + } + } catch (AbacusException abacusError) { + outputText.setText(ERR_DEFINITION + "(" + abacusError.getMessage() + ")"); + } catch (RuntimeException runtime) { + outputText.setText(ERR_DEFINITION + "(" + ERR_EXCEPTION + ")"); + } catch (FileNotFoundException ignored) {} + } + + private void reloadAbacus(){ + abacus.reload(); + ExtendedConfiguration abacusConfig = (ExtendedConfiguration) abacus.getConfiguration(); + for(String fileName: abacusConfig.getDefinitionFiles()) { + loadDefinitionFile(fileName); + } + } + @FXML public void performScan() { PluginManager abacusPluginManager = abacus.getPluginManager(); @@ -314,13 +342,13 @@ public class AbacusController implements PluginListener { } catch (IOException | ClassNotFoundException e) { e.printStackTrace(); } - abacus.reload(); + reloadAbacus(); } @FXML public void performReload() { alertIfApplyNeeded(true); - abacus.reload(); + reloadAbacus(); } @FXML diff --git a/fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt b/fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt index 1cfaf87..edb6782 100644 --- a/fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt +++ b/fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt @@ -17,8 +17,9 @@ import java.io.File * @param disabledPlugins the list of plugins that should be disabled, same as [Configuration.disabledPlugins] */ class ExtendedConfiguration(var computationDelay: Double = 0.0, - implementation: String = "", - disabledPlugins: Array = emptyArray()) + definitionFiles: Array = emptyArray(), + implementation: String = "", + disabledPlugins: Array = emptyArray()) : Configuration(implementation, disabledPlugins) { companion object { @@ -27,6 +28,7 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0, */ val DEFAULT_TOML_STRING = """ computationDelay=0.0 + definitionFiles=[] implementation="naive" disabledPlugins=[] """ @@ -40,6 +42,11 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0, val DEFAULT_TOML_WRITER = TomlWriter() } + /** + * The set of files that definitions should be loaded from. + */ + val definitionFiles: MutableSet = mutableSetOf(*definitionFiles) + /** * Constructs a new configuration from a file on disk. * @param tomlFile the file from disk to load. @@ -59,6 +66,8 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0, numberImplementation = config.numberImplementation disabledPlugins.clear() disabledPlugins.addAll(config.disabledPlugins) + definitionFiles.clear() + definitionFiles.addAll(config.definitionFiles) } /**