DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-22 07:20:09 -08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into plugin-conversions

Browse Source
This commit is contained in:
Danila Fedorin 2017-11-14 23:18:18 -08:00 committed by GitHub
commit 981211ccfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,10 +359,13 @@ public class AbacusController implements PluginListener {
if(documentationInstance == null) if(documentationInstance == null)
documentationInstance = new Documentation(name, "", "", "", DocumentationType.FUNCTION); documentationInstance = new Documentation(name, "", "", "", DocumentationType.FUNCTION);
return documentationInstance; return documentationInstance;
}) }).collect(Collectors.toCollection(ArrayList::new)));
.collect(Collectors.toCollection(ArrayList::new))); functionList.addAll(manager.getAllTreeValueFunctions().stream().map(name -> {
functionList.addAll(manager.getAllTreeValueFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.TREE_VALUE_FUNCTION)) Documentation documentationInstance = pluginManager.documentationFor(name, DocumentationType.TREE_VALUE_FUNCTION);
.collect(Collectors.toCollection(ArrayList::new))); if(documentationInstance == null)
documentationInstance = new Documentation(name, "", "", "", DocumentationType.TREE_VALUE_FUNCTION);
return documentationInstance;
}).collect(Collectors.toCollection(ArrayList::new)));
functionList.sort(Comparator.comparing(Documentation::getCodeName)); functionList.sort(Comparator.comparing(Documentation::getCodeName));
} }