DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-26 08:35:20 +00:00
Code Issues Releases Wiki Activity

Merge the two configuration classes into one.

Browse Source
This commit is contained in:
Danila Fedorin
2017-08-01 10:24:32 -07:00
parent 0cd40b028a
commit 76677ef494
3 changed files with 70 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/nwapw/abacus/Abacus.java
View File

@@ -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;
@@ -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,8 +59,8 @@ public class Abacus {
public Abacus() {
pluginManager = new PluginManager();
numberReducer = new NumberReducer(this);
configuration = new ConfigurationObject(CONFIG_FILE);
configuration.save(CONFIG_FILE);
configuration = new Configuration(CONFIG_FILE);
configuration.saveTo(CONFIG_FILE);
LexerTokenizer lexerTokenizer = new LexerTokenizer();
ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
@@ -114,7 +114,7 @@ public class Abacus {
*
* @return the configuration object.
*/
public ConfigurationObject getConfiguration() {
public Configuration getConfiguration() {
return configuration;
}