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

Merge branch 'sin'

Browse Source 
# Conflicts:
#	src/main/java/org/nwapw/abacus/Abacus.java
#	src/main/java/org/nwapw/abacus/plugin/PluginManager.java
This commit is contained in:
Danila Fedorin
2017-08-04 12:04:37 -07:00
parent bf3aa2becd 68f5163deb
commit 4c8dff6623
10 changed files with 461 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/nwapw/abacus/fx/AbacusController.java
View File

@@ -220,7 +220,7 @@ public class AbacusController implements PluginListener {
public void onLoad(PluginManager manager) {
Configuration configuration = abacus.getConfiguration();
Set<String> disabledPlugins = configuration.getDisabledPlugins();
numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumbers());
numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumberImplementations());
String actualImplementation = configuration.getNumberImplementation();
String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "<default>";
numberImplementationBox.getSelectionModel().select(toSelect);