DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2025-12-28 03:31:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into thread-safety

Browse Source
This commit is contained in:
Danila Fedorin
2017-09-15 22:58:33 -07:00
committed by GitHub
parent 87529da15f 08967fbb8f
commit 337edd68fa
25 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,12 @@ import javafx.util.Callback;
import javafx.util.StringConverter;
import org.nwapw.abacus.Abacus;
import org.nwapw.abacus.config.Configuration;
import org.nwapw.abacus.exception.AbacusException;
import org.nwapw.abacus.exception.ComputationInterruptedException;
import org.nwapw.abacus.function.Documentation;
import org.nwapw.abacus.function.DocumentationType;
import org.nwapw.abacus.function.DomainException;
import org.nwapw.abacus.exception.DomainException;
import org.nwapw.abacus.exception.EvaluationException;
import org.nwapw.abacus.number.*;
import org.nwapw.abacus.plugin.ClassFinder;
import org.nwapw.abacus.plugin.PluginListener;
@@ -147,16 +150,11 @@ public class AbacusController implements PluginListener {
}
EvaluationResult result = abacus.evaluateTree(constructedTree);
NumberInterface evaluatedNumber = result.getValue();
if (evaluatedNumber == null) {
return ERR_EVAL;
}
String resultingString = evaluatedNumber.toString();
historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), resultingString));
abacus.applyToContext(result.getResultingContext());
return resultingString;
} catch (ComputationInterruptedException exception) {
return ERR_STOP;
} catch (DomainException exception) {
} catch (AbacusException exception) {
return exception.getMessage();
} catch (RuntimeException exception) {
exception.printStackTrace();