1
0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-25 08:05:19 +00:00

Compare commits

...

3 Commits

Author SHA1 Message Date
200f4c7288 Add a filter. 2017-08-07 14:12:41 -07:00
f28e915c9a Fix not clearing unloaded plugins. 2017-08-07 13:55:24 -07:00
7a0863380a Add a list of functions to the controller. 2017-08-07 13:55:13 -07:00
3 changed files with 35 additions and 0 deletions

View File

@@ -5,6 +5,7 @@ import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList;
import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.scene.control.cell.CheckBoxListCell;
@@ -72,6 +73,8 @@ public class AbacusController implements PluginListener {
@FXML
private Tab settingsTab;
@FXML
private Tab functionListTab;
@FXML
private TableView<HistoryModel> historyTable;
@FXML
private TableColumn<HistoryModel, String> inputColumn;
@@ -93,6 +96,10 @@ public class AbacusController implements PluginListener {
private ListView<ToggleablePlugin> enabledPluginView;
@FXML
private TextField computationLimitField;
@FXML
private ListView<String> functionListView;
@FXML
private TextField functionListSearchField;
/**
* The list of history entries, created by the users.
@@ -110,6 +117,14 @@ public class AbacusController implements PluginListener {
* and, when reloaded, get added to the plugin manager's black list.
*/
private ObservableList<ToggleablePlugin> enabledPlugins;
/**
* The list of functions that are registered in the calculator.
*/
private ObservableList<String> functionList;
/**
* The filtered list displayed to the user.
*/
private FilteredList<String> functionFilter;
/**
* The abacus instance used for changing the plugin configuration.
@@ -213,6 +228,11 @@ public class AbacusController implements PluginListener {
}
});
functionList = FXCollections.observableArrayList();
functionFilter = new FilteredList<>(functionList, (s) -> true);
functionListView.setItems(functionFilter);
functionListSearchField.textProperty().addListener((observable, oldValue, newValue) ->
functionFilter.setPredicate((newValue.length() == 0) ? ((s) -> true) : ((s) -> s.contains(newValue))));
historyData = FXCollections.observableArrayList();
historyTable.setItems(historyData);
numberImplementationOptions = FXCollections.observableArrayList();
@@ -327,10 +347,13 @@ public class AbacusController implements PluginListener {
plugin.enabledProperty().addListener(e -> changesMade = true);
enabledPlugins.add(plugin);
}
functionList.addAll(manager.getAllFunctions());
functionList.sort(String::compareTo);
}
@Override
public void onUnload(PluginManager manager) {
functionList.clear();
enabledPlugins.clear();
numberImplementationOptions.clear();
}

View File

@@ -209,6 +209,9 @@ public class PluginManager {
if (disabledPlugins.contains(plugin.getClass().getName())) continue;
plugin.disable();
}
registeredFunctions.clear();
registeredOperators.clear();
registeredNumberImplementations.clear();
cachedInterfaceImplementations.clear();
cachedPi.clear();
listeners.forEach(e -> e.onUnload(this));

View File

@@ -60,6 +60,15 @@
</FlowPane>
</GridPane>
</Tab>
<Tab fx:id="functionListTab" text="Functions" closable="false">
<VBox spacing="10">
<padding>
<Insets left="10" right="10" top="10" bottom="10"/>
</padding>
<TextField fx:id="functionListSearchField" maxWidth="Infinity"/>
<ListView maxWidth="Infinity" fx:id="functionListView"/>
</VBox>
</Tab>
</TabPane>
</center>