1
0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-26 00:25:20 +00:00

Compare commits

..

3 Commits

Author SHA1 Message Date
0d26167f31 Merge branch 'master' into documentation-fix 2017-11-14 23:13:44 -08:00
07abe4d17a Merge pull request #46 from DanilaFe/isint-idiom
Add and use isInteger function where appropriate.
2017-11-14 23:13:10 -08:00
8ef0904d26 Fix crash when a TreeValueFunction doesn't have documentation loaded. 2017-11-14 23:08:04 -08:00

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));
} }