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

Format code.

Browse Source
This commit is contained in:
Danila Fedorin
2017-08-04 14:29:24 -07:00
parent a7e84bc946
commit d1a084363e
6 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ public class AbacusController implements PluginListener {
private ObservableList<String> numberImplementationOptions;
/**
<<<<<<< HEAD
* <<<<<<< HEAD
* The list of plugin objects that can be toggled on and off,
* and, when reloaded, get added to the plugin manager's black list.
*/
@@ -186,10 +186,10 @@ public class AbacusController implements PluginListener {
}
@FXML
private void performCalculation(){
Runnable calculator = new Runnable(){
private void performCalculation() {
Runnable calculator = new Runnable() {
public void run() {
if(delay>0) {
if (delay > 0) {
Runnable timer = new Runnable() {
public void run() {
long gap = (long) (delay * 1000);
@@ -207,16 +207,16 @@ public class AbacusController implements PluginListener {
Platform.runLater(() -> inputButton.setDisable(true));
TreeNode constructedTree = abacus.parseString(inputField.getText());
if (constructedTree == null) {
Platform.runLater(() ->outputText.setText(ERR_SYNTAX));
Platform.runLater(() -> outputText.setText(ERR_SYNTAX));
Platform.runLater(() -> inputButton.setDisable(false));
//return;
}else {
} else {
NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
if (evaluatedNumber == null) {
if(Thread.currentThread().isInterrupted()){
if (Thread.currentThread().isInterrupted()) {
Platform.runLater(() -> outputText.setText(ERR_STOP));
Platform.runLater(() -> inputButton.setDisable(false));
}else {
} else {
Platform.runLater(() -> outputText.setText(ERR_EVAL));
Platform.runLater(() -> inputButton.setDisable(false));
//return;
@@ -232,14 +232,15 @@ public class AbacusController implements PluginListener {
calculating = false;
}
};
if(!calculating) {
calcThread = new Thread(calculator);
calcThread.setName("calcThread");
calcThread.start();
if (!calculating) {
calcThread = new Thread(calculator);
calcThread.setName("calcThread");
calcThread.start();
}
}
@FXML
private void stopCalculation(){
private void stopCalculation() {
calcThread.interrupt();
calculating = false;
//Platform.runLater(() ->inputButton.setDisable(false));