Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Upgrade ControlsFX and Flexmark, simplify definition source code
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-05-31 10:23:21 GMT-0700 |
| Commit | 3b6c3aa74aefc719f9ccee9b058cbf54089734eb |
| Parent | 6636eb3 |
| Delta | 10 lines added, 4 lines removed, 6-line increase |
src/main/java/com/scrivenvar/definition/AbstractDefinitionSource.java
| import javafx.collections.ObservableList; | ||
| -import javafx.scene.Parent; | ||
| import javafx.scene.control.*; | ||
| import javafx.scene.control.cell.TextFieldTreeCell; | ||
 | ||
| if( mTreeView == null ) { | ||
| mTreeView = createTreeView(); | ||
| - mTreeView.setContextMenu( createContextMenu( mTreeView ) ); | ||
| + mTreeView.setContextMenu( createContextMenu() ); | ||
| mTreeView.setEditable( true ); | ||
| mTreeView.setCellFactory( treeView -> createTreeCell() ); | ||
| ||
| protected abstract TreeView<String> createTreeView(); | ||
| - private ContextMenu createContextMenu( final TreeView<String> treeView ) { | ||
| + private ContextMenu createContextMenu() { | ||
| final ContextMenu menu = new ContextMenu(); | ||
| final ObservableList<MenuItem> items = menu.getItems(); | ||
| addMenuItem( items, "Definition.menu.create" ).setOnAction( | ||
| e -> getSiblings( getSelectedItem() ).add( createTreeItem() ) | ||
| ); | ||
| addMenuItem( items, "Definition.menu.rename" ).setOnAction( | ||
| - e -> treeView.edit( getSelectedItem() ) | ||
| + e -> getTreeView().edit( getSelectedItem() ) | ||
| ); | ||
| ||
| } | ||
| + /** | ||
| + * Adds a menu item to a list of menu items. | ||
| + * | ||
| + * @param items The list of menu items to append to. | ||
| + * @param labelKey The resource bundle key name for the menu item's label. | ||
| + * @return The menu item added to the list of menu items. | ||
| + */ | ||
| private MenuItem addMenuItem( | ||
| final List<MenuItem> items, final String labelKey ) { | ||