Code cleanup.

This commit is contained in:
Dennis Sheirer
2021-11-14 07:57:14 -05:00
parent 87e9bf8749
commit 560cbad5d7
2 changed files with 141 additions and 123 deletions

View File

@@ -1,6 +1,6 @@
/* /*
* ***************************************************************************** * *****************************************************************************
* Copyright (C) 2014-2020 Dennis Sheirer * Copyright (C) 2014-2021 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@ public class AliasBulkEditor extends Editor<List<Alias>>
/** /**
* Constructs an instance * Constructs an instance
*
* @param playlistManager for accessing icon manager * @param playlistManager for accessing icon manager
*/ */
public AliasBulkEditor(PlaylistManager playlistManager) public AliasBulkEditor(PlaylistManager playlistManager)
@@ -80,7 +81,7 @@ public class AliasBulkEditor extends Editor<List<Alias>>
mChangeInProgressProperty = new SimpleBooleanProperty(); mChangeInProgressProperty = new SimpleBooleanProperty();
GridPane gridPane = new GridPane(); GridPane gridPane = new GridPane();
gridPane.setPadding(new Insets(10,10,10,10)); gridPane.setPadding(new Insets(10, 10, 10, 10));
gridPane.setHgap(10); gridPane.setHgap(10);
gridPane.setVgap(10); gridPane.setVgap(10);
@@ -174,29 +175,32 @@ public class AliasBulkEditor extends Editor<List<Alias>>
/** /**
* Property indicating whether a bulk change is in progress. Bulk changes may cause drastic * Property indicating whether a bulk change is in progress. Bulk changes may cause drastic
* slow downs in some UI components. * slow downs in some UI components.
*
* @return changeInProgressProperty * @return changeInProgressProperty
*/ */
public ReadOnlyBooleanProperty changeInProgressProperty() public ReadOnlyBooleanProperty changeInProgressProperty()
{ {
if(mChangeInProgressROProperty == null) if(mChangeInProgressROProperty == null)
mChangeInProgressROProperty = BooleanProperty.readOnlyBooleanProperty(mChangeInProgressProperty); {
mChangeInProgressROProperty = BooleanProperty.readOnlyBooleanProperty(mChangeInProgressProperty);
}
return mChangeInProgressROProperty; return mChangeInProgressROProperty;
} }
private void startChange() private void startChange()
{ {
mChangeInProgressProperty.set(true); mChangeInProgressProperty.set(true);
} }
private void endChange() private void endChange()
{ {
mChangeInProgressProperty.set(false); mChangeInProgressProperty.set(false);
} }
private Label getEditingLabel() private Label getEditingLabel()
{ {
if(mEditingLabel== null) if(mEditingLabel == null)
{ {
mEditingLabel = new Label("Editing 0 Aliases"); mEditingLabel = new Label("Editing 0 Aliases");
} }
@@ -221,12 +225,13 @@ public class AliasBulkEditor extends Editor<List<Alias>>
if(mApplyColorButton == null) if(mApplyColorButton == null)
{ {
mApplyColorButton = new Button("Apply"); mApplyColorButton = new Button("Apply");
mApplyColorButton.setOnAction(event -> { mApplyColorButton.setOnAction(event ->
startChange(); {
startChange();
int colorValue = ColorUtil.toInteger(getColorPicker().getValue()); int colorValue = ColorUtil.toInteger(getColorPicker().getValue());
for(Alias alias: getItem()) for(Alias alias : getItem())
{ {
alias.setColor(colorValue); alias.setColor(colorValue);
} }
@@ -243,10 +248,11 @@ public class AliasBulkEditor extends Editor<List<Alias>>
if(mResetColorButton == null) if(mResetColorButton == null)
{ {
mResetColorButton = new Button("Reset Color"); mResetColorButton = new Button("Reset Color");
mResetColorButton.setOnAction(event -> { mResetColorButton.setOnAction(event ->
startChange(); {
startChange();
for(Alias alias: getItem()) for(Alias alias : getItem())
{ {
alias.setColor(0); alias.setColor(0);
} }
@@ -267,10 +273,10 @@ public class AliasBulkEditor extends Editor<List<Alias>>
mIconNodeComboBox.setItems(new SortedList(mPlaylistManager.getIconModel().iconsProperty(), Ordering.natural())); mIconNodeComboBox.setItems(new SortedList(mPlaylistManager.getIconModel().iconsProperty(), Ordering.natural()));
mIconNodeComboBox.setCellFactory(new IconCellFactory()); mIconNodeComboBox.setCellFactory(new IconCellFactory());
mIconNodeComboBox.getSelectionModel().selectedItemProperty() mIconNodeComboBox.getSelectionModel().selectedItemProperty()
.addListener((observable, oldValue, newValue) -> .addListener((observable, oldValue, newValue) ->
{ {
getApplyIconButton().setDisable(newValue == null); getApplyIconButton().setDisable(newValue == null);
}); });
} }
return mIconNodeComboBox; return mIconNodeComboBox;
@@ -287,13 +293,13 @@ public class AliasBulkEditor extends Editor<List<Alias>>
@Override @Override
public void handle(ActionEvent event) public void handle(ActionEvent event)
{ {
startChange(); startChange();
Icon icon = getIconNodeComboBox().getSelectionModel().getSelectedItem(); Icon icon = getIconNodeComboBox().getSelectionModel().getSelectedItem();
if(icon != null) if(icon != null)
{ {
for(Alias alias: getItem()) for(Alias alias : getItem())
{ {
alias.setIconName(icon.getName()); alias.setIconName(icon.getName());
} }
@@ -314,7 +320,7 @@ public class AliasBulkEditor extends Editor<List<Alias>>
mMonitorAudioToggleSwitch = new ToggleSwitch(); mMonitorAudioToggleSwitch = new ToggleSwitch();
mMonitorAudioToggleSwitch.setSelected(true); mMonitorAudioToggleSwitch.setSelected(true);
mMonitorAudioToggleSwitch.selectedProperty() mMonitorAudioToggleSwitch.selectedProperty()
.addListener((observable, oldValue, newValue) -> modifiedProperty().set(true)); .addListener((observable, oldValue, newValue) -> modifiedProperty().set(true));
} }
return mMonitorAudioToggleSwitch; return mMonitorAudioToggleSwitch;
@@ -334,13 +340,14 @@ public class AliasBulkEditor extends Editor<List<Alias>>
mMonitorPriorityComboBox.disableProperty().bind(getMonitorAudioToggleSwitch().selectedProperty().not()); mMonitorPriorityComboBox.disableProperty().bind(getMonitorAudioToggleSwitch().selectedProperty().not());
mMonitorPriorityComboBox.getSelectionModel().selectedItemProperty() mMonitorPriorityComboBox.getSelectionModel().selectedItemProperty()
.addListener((observable, oldValue, newValue) -> modifiedProperty().set(true)); .addListener((observable, oldValue, newValue) -> modifiedProperty().set(true));
} }
return mMonitorPriorityComboBox; return mMonitorPriorityComboBox;
} }
private static int setCount = 0; private static int setCount = 0;
private Button getApplyMonitorButton() private Button getApplyMonitorButton()
{ {
if(mApplyMonitorButton == null) if(mApplyMonitorButton == null)
@@ -351,7 +358,7 @@ public class AliasBulkEditor extends Editor<List<Alias>>
@Override @Override
public void handle(ActionEvent event) public void handle(ActionEvent event)
{ {
startChange(); startChange();
boolean canMonitor = getMonitorAudioToggleSwitch().isSelected(); boolean canMonitor = getMonitorAudioToggleSwitch().isSelected();
Integer priority = getMonitorPriorityComboBox().getSelectionModel().getSelectedItem(); Integer priority = getMonitorPriorityComboBox().getSelectionModel().getSelectedItem();
@@ -368,10 +375,10 @@ public class AliasBulkEditor extends Editor<List<Alias>>
} }
final Integer pri = priority; final Integer pri = priority;
for(Alias alias: getItem()) for(Alias alias : getItem())
{ {
alias.setCallPriority(pri); alias.setCallPriority(pri);
//System.out.println(++setCount); //System.out.println(++setCount);
} }
endChange(); endChange();
@@ -397,7 +404,7 @@ public class AliasBulkEditor extends Editor<List<Alias>>
GridPane.setHalignment(iconLabel, HPos.RIGHT); GridPane.setHalignment(iconLabel, HPos.RIGHT);
gridPane.getColumnConstraints().add(new ColumnConstraints(50)); gridPane.getColumnConstraints().add(new ColumnConstraints(50));
gridPane.add(iconLabel, 0, 0); gridPane.add(iconLabel, 0, 0);
gridPane.add(textLabel,1,0); gridPane.add(textLabel, 1, 0);
ListCell<Icon> cell = new ListCell<>() ListCell<Icon> cell = new ListCell<>()
{ {

View File

@@ -1,23 +1,20 @@
/* /*
* *****************************************************************************
* Copyright (C) 2014-2021 Dennis Sheirer
* *
* * ****************************************************************************** * This program is free software: you can redistribute it and/or modify
* * Copyright (C) 2014-2020 Dennis Sheirer * it under the terms of the GNU General Public License as published by
* * * the Free Software Foundation, either version 3 of the License, or
* * This program is free software: you can redistribute it and/or modify * (at your option) any later version.
* * it under the terms of the GNU General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
* *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* ****************************************************************************
*/ */
package io.github.dsheirer.gui.playlist.alias; package io.github.dsheirer.gui.playlist.alias;
@@ -125,8 +122,9 @@ public class AliasConfigurationEditor extends SplitPane
/** /**
* Request to show the specified alias in the editor. * Request to show the specified alias in the editor.
* * <p>
* Note: this must be called on the FX platform thread * Note: this must be called on the FX platform thread
*
* @param alias to show * @param alias to show
*/ */
public void show(Alias alias) public void show(Alias alias)
@@ -171,11 +169,12 @@ public class AliasConfigurationEditor extends SplitPane
alert.setTitle("Save Changes"); alert.setTitle("Save Changes");
alert.setHeaderText("Alias configuration has been modified"); alert.setHeaderText("Alias configuration has been modified");
alert.setContentText("Do you want to save these changes?"); alert.setContentText("Do you want to save these changes?");
alert.initOwner(((Node)getButtonBox()).getScene().getWindow()); alert.initOwner(((Node) getButtonBox()).getScene().getWindow());
//Workaround for JavaFX KDE on Linux bug in FX 10/11: https://bugs.openjdk.java.net/browse/JDK-8179073 //Workaround for JavaFX KDE on Linux bug in FX 10/11: https://bugs.openjdk.java.net/browse/JDK-8179073
alert.setResizable(true); alert.setResizable(true);
alert.onShownProperty().addListener(e -> { alert.onShownProperty().addListener(e ->
{
Platform.runLater(() -> alert.setResizable(false)); Platform.runLater(() -> alert.setResizable(false));
}); });
@@ -251,7 +250,7 @@ public class AliasConfigurationEditor extends SplitPane
searchBox.setAlignment(Pos.BASELINE_RIGHT); searchBox.setAlignment(Pos.BASELINE_RIGHT);
mSearchAndListSelectionBox.getChildren().addAll(listLabel, getAliasListNameComboBox(), mSearchAndListSelectionBox.getChildren().addAll(listLabel, getAliasListNameComboBox(),
getNewAliasListButton(), searchBox); getNewAliasListButton(), searchBox);
} }
return mSearchAndListSelectionBox; return mSearchAndListSelectionBox;
@@ -293,10 +292,11 @@ public class AliasConfigurationEditor extends SplitPane
{ {
mAliasListNameComboBox = new ComboBox<>(mPlaylistManager.getAliasModel().aliasListNames()); mAliasListNameComboBox = new ComboBox<>(mPlaylistManager.getAliasModel().aliasListNames());
mAliasListNameComboBox.getSelectionModel().selectedItemProperty() mAliasListNameComboBox.getSelectionModel().selectedItemProperty()
.addListener((ObservableValue<? extends String> observable, String oldValue, String newValue) -> { .addListener((ObservableValue<? extends String> observable, String oldValue, String newValue) ->
getNewAliasButton().setDisable(newValue == null || newValue.contentEquals(AliasModel.NO_ALIAS_LIST)); {
update(); getNewAliasButton().setDisable(newValue == null || newValue.contentEquals(AliasModel.NO_ALIAS_LIST));
}); update();
});
if(mAliasListNameComboBox.getItems().size() > 1) if(mAliasListNameComboBox.getItems().size() > 1)
{ {
@@ -312,7 +312,7 @@ public class AliasConfigurationEditor extends SplitPane
else if(mAliasListNameComboBox.getItems().size() == 1) else if(mAliasListNameComboBox.getItems().size() == 1)
{ {
mAliasListNameComboBox.getSelectionModel().select(0); mAliasListNameComboBox.getSelectionModel().select(0);
} }
} }
return mAliasListNameComboBox; return mAliasListNameComboBox;
@@ -323,7 +323,8 @@ public class AliasConfigurationEditor extends SplitPane
if(mNewAliasListButton == null) if(mNewAliasListButton == null)
{ {
mNewAliasListButton = new Button("New Alias List"); mNewAliasListButton = new Button("New Alias List");
mNewAliasListButton.setOnAction(event -> { mNewAliasListButton.setOnAction(event ->
{
TextInputDialog dialog = new TextInputDialog(); TextInputDialog dialog = new TextInputDialog();
dialog.setTitle("Create New Alias List"); dialog.setTitle("Create New Alias List");
dialog.setHeaderText("Please enter an alias list name (max 25 chars)."); dialog.setHeaderText("Please enter an alias list name (max 25 chars).");
@@ -331,7 +332,8 @@ public class AliasConfigurationEditor extends SplitPane
dialog.getEditor().setTextFormatter(new TextFormatter<String>(new MaxLengthUnaryOperator(25))); dialog.getEditor().setTextFormatter(new TextFormatter<String>(new MaxLengthUnaryOperator(25)));
Optional<String> result = dialog.showAndWait(); Optional<String> result = dialog.showAndWait();
result.ifPresent(s -> { result.ifPresent(s ->
{
String name = result.get(); String name = result.get();
if(name != null && !name.isEmpty()) if(name != null && !name.isEmpty())
@@ -355,7 +357,7 @@ public class AliasConfigurationEditor extends SplitPane
TableColumn nameColumn = new TableColumn(); TableColumn nameColumn = new TableColumn();
nameColumn.setText("Alias"); nameColumn.setText("Alias");
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name")); nameColumn.setCellValueFactory(new PropertyValueFactory<Alias, String>("name"));
nameColumn.setPrefWidth(140); nameColumn.setPrefWidth(140);
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
@@ -363,34 +365,35 @@ public class AliasConfigurationEditor extends SplitPane
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
groupColumn.setPrefWidth(140); groupColumn.setPrefWidth(140);
TableColumn<Alias,Integer> colorColumn = new TableColumn("Color"); TableColumn<Alias, Integer> colorColumn = new TableColumn("Color");
colorColumn.setCellValueFactory(new PropertyValueFactory<>("color")); colorColumn.setCellValueFactory(new PropertyValueFactory<>("color"));
colorColumn.setCellFactory(new ColorizedCell()); colorColumn.setCellFactory(new ColorizedCell());
TableColumn<Alias,String> iconColumn = new TableColumn("Icon"); TableColumn<Alias, String> iconColumn = new TableColumn("Icon");
iconColumn.setCellValueFactory(new PropertyValueFactory<>("iconName")); iconColumn.setCellValueFactory(new PropertyValueFactory<>("iconName"));
iconColumn.setCellFactory(new IconTableCellFactory()); iconColumn.setCellFactory(new IconTableCellFactory());
TableColumn<Alias,Integer> priorityColumn = new TableColumn("Listen"); TableColumn<Alias, Integer> priorityColumn = new TableColumn("Listen");
priorityColumn.setCellFactory(new PriorityCellFactory()); priorityColumn.setCellFactory(new PriorityCellFactory());
priorityColumn.setCellValueFactory(new PropertyValueFactory<>("priority")); priorityColumn.setCellValueFactory(new PropertyValueFactory<>("priority"));
TableColumn<Alias,Boolean> recordColumn = new TableColumn("Record"); TableColumn<Alias, Boolean> recordColumn = new TableColumn("Record");
recordColumn.setCellValueFactory(new PropertyValueFactory<>("recordable")); recordColumn.setCellValueFactory(new PropertyValueFactory<>("recordable"));
recordColumn.setCellFactory(new IconCell(FontAwesome.SQUARE, Color.RED)); recordColumn.setCellFactory(new IconCell(FontAwesome.SQUARE, Color.RED));
TableColumn<Alias,Boolean> streamColumn = new TableColumn("Stream"); TableColumn<Alias, Boolean> streamColumn = new TableColumn("Stream");
streamColumn.setCellValueFactory(new PropertyValueFactory<>("streamable")); streamColumn.setCellValueFactory(new PropertyValueFactory<>("streamable"));
streamColumn.setCellFactory(new IconCell(FontAwesome.VOLUME_UP, Color.DARKBLUE)); streamColumn.setCellFactory(new IconCell(FontAwesome.VOLUME_UP, Color.DARKBLUE));
TableColumn<Alias,Integer> idsColumn = new TableColumn("IDs"); TableColumn<Alias, Integer> idsColumn = new TableColumn("IDs");
idsColumn.setCellValueFactory(new IdentifierCountCell()); idsColumn.setCellValueFactory(new IdentifierCountCell());
TableColumn<Alias,Boolean> errorsColumn = new TableColumn<>("Error"); TableColumn<Alias, Boolean> errorsColumn = new TableColumn<>("Error");
errorsColumn.setPrefWidth(80); errorsColumn.setPrefWidth(80);
errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap")); errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap"));
errorsColumn.setCellFactory(param -> { errorsColumn.setCellFactory(param ->
TableCell<Alias,Boolean> tableCell = new TableCell<>() {
TableCell<Alias, Boolean> tableCell = new TableCell<>()
{ {
@Override @Override
protected void updateItem(Boolean item, boolean empty) protected void updateItem(Boolean item, boolean empty)
@@ -417,12 +420,13 @@ public class AliasConfigurationEditor extends SplitPane
mAliasTableView.getColumns().addAll(nameColumn, groupColumn, colorColumn, iconColumn, priorityColumn, mAliasTableView.getColumns().addAll(nameColumn, groupColumn, colorColumn, iconColumn, priorityColumn,
recordColumn, streamColumn, idsColumn, errorsColumn); recordColumn, streamColumn, idsColumn, errorsColumn);
mAliasTableView.setPlaceholder(getPlaceholderLabel()); mAliasTableView.setPlaceholder(getPlaceholderLabel());
mAliasTableView.setItems(getAliasSortedList()); mAliasTableView.setItems(getAliasSortedList());
mAliasTableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); mAliasTableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
mAliasTableView.getSelectionModel().getSelectedItems().addListener((ListChangeListener<Alias>)c -> { mAliasTableView.getSelectionModel().getSelectedItems().addListener((ListChangeListener<Alias>) c ->
{
Platform.runLater(() -> setAliases(mAliasTableView.getSelectionModel().getSelectedItems())); Platform.runLater(() -> setAliases(mAliasTableView.getSelectionModel().getSelectedItems()));
}); });
} }
@@ -448,16 +452,17 @@ public class AliasConfigurationEditor extends SplitPane
mAliasSortedList.comparatorProperty().bind(getAliasTableView().comparatorProperty()); mAliasSortedList.comparatorProperty().bind(getAliasTableView().comparatorProperty());
//Don't re-sort while the bulk editor is still applying changes to aliases //Don't re-sort while the bulk editor is still applying changes to aliases
getAliasBulkEditor().changeInProgressProperty().addListener((observable, oldValue, newValue) -> { getAliasBulkEditor().changeInProgressProperty().addListener((observable, oldValue, newValue) ->
if(newValue) {
{ if(newValue)
mAliasSortedList.comparatorProperty().unbind(); {
mAliasSortedList.setComparator(null); mAliasSortedList.comparatorProperty().unbind();
} mAliasSortedList.setComparator(null);
else }
{ else
mAliasSortedList.comparatorProperty().bind(getAliasTableView().comparatorProperty()); {
} mAliasSortedList.comparatorProperty().bind(getAliasTableView().comparatorProperty());
}
}); });
} }
@@ -485,7 +490,7 @@ public class AliasConfigurationEditor extends SplitPane
Button fillerButton = new Button(); Button fillerButton = new Button();
fillerButton.setVisible(false); fillerButton.setVisible(false);
mButtonBox.getChildren().addAll(fillerButton, getNewAliasButton(), getCloneAliasButton(), mButtonBox.getChildren().addAll(fillerButton, getNewAliasButton(), getCloneAliasButton(),
getMoveToAliasButton(), getDeleteAliasButton()); getMoveToAliasButton(), getDeleteAliasButton());
} }
return mButtonBox; return mButtonBox;
@@ -499,13 +504,15 @@ public class AliasConfigurationEditor extends SplitPane
mNewAliasButton.setDisable(true); mNewAliasButton.setDisable(true);
mNewAliasButton.setAlignment(Pos.CENTER); mNewAliasButton.setAlignment(Pos.CENTER);
mNewAliasButton.setMaxWidth(Double.MAX_VALUE); mNewAliasButton.setMaxWidth(Double.MAX_VALUE);
mNewAliasButton.setOnAction(event -> { mNewAliasButton.setOnAction(event ->
{
Alias alias = new Alias("New Alias"); Alias alias = new Alias("New Alias");
alias.setAliasListName(getAliasListNameComboBox().getSelectionModel().getSelectedItem()); alias.setAliasListName(getAliasListNameComboBox().getSelectionModel().getSelectedItem());
mPlaylistManager.getAliasModel().addAlias(alias); mPlaylistManager.getAliasModel().addAlias(alias);
//Queue a select alias action to allow table to update filter predicate and display the alias //Queue a select alias action to allow table to update filter predicate and display the alias
Platform.runLater(() -> { Platform.runLater(() ->
{
getAliasTableView().getSelectionModel().clearSelection(); getAliasTableView().getSelectionModel().clearSelection();
getAliasTableView().getSelectionModel().select(alias); getAliasTableView().getSelectionModel().select(alias);
getAliasTableView().scrollTo(alias); getAliasTableView().scrollTo(alias);
@@ -523,16 +530,17 @@ public class AliasConfigurationEditor extends SplitPane
mDeleteAliasButton = new Button("Delete"); mDeleteAliasButton = new Button("Delete");
mDeleteAliasButton.setDisable(true); mDeleteAliasButton.setDisable(true);
mDeleteAliasButton.setMaxWidth(Double.MAX_VALUE); mDeleteAliasButton.setMaxWidth(Double.MAX_VALUE);
mDeleteAliasButton.setOnAction(event -> { mDeleteAliasButton.setOnAction(event ->
{
boolean multiple = getAliasTableView().getSelectionModel().getSelectedItems().size() > 1; boolean multiple = getAliasTableView().getSelectionModel().getSelectedItems().size() > 1;
Alert alert = new Alert(Alert.AlertType.CONFIRMATION, Alert alert = new Alert(Alert.AlertType.CONFIRMATION,
"Do you want to delete the selected alias" + (multiple ? "es?" : "?"), "Do you want to delete the selected alias" + (multiple ? "es?" : "?"),
ButtonType.NO, ButtonType.YES); ButtonType.NO, ButtonType.YES);
alert.setTitle("Delete Alias"); alert.setTitle("Delete Alias");
alert.setHeaderText("Are you sure?"); alert.setHeaderText("Are you sure?");
alert.initOwner(((Node)getDeleteAliasButton()).getScene().getWindow()); alert.initOwner(((Node) getDeleteAliasButton()).getScene().getWindow());
Optional<ButtonType> result = alert.showAndWait(); Optional<ButtonType> result = alert.showAndWait();
@@ -540,7 +548,7 @@ public class AliasConfigurationEditor extends SplitPane
{ {
List<Alias> selectedAliases = new ArrayList<>(getAliasTableView().getSelectionModel().getSelectedItems()); List<Alias> selectedAliases = new ArrayList<>(getAliasTableView().getSelectionModel().getSelectedItems());
for(Alias selected: selectedAliases) for(Alias selected : selectedAliases)
{ {
mPlaylistManager.getAliasModel().removeAlias(selected); mPlaylistManager.getAliasModel().removeAlias(selected);
} }
@@ -558,7 +566,8 @@ public class AliasConfigurationEditor extends SplitPane
mCloneAliasButton = new Button("Clone"); mCloneAliasButton = new Button("Clone");
mCloneAliasButton.setDisable(true); mCloneAliasButton.setDisable(true);
mCloneAliasButton.setMaxWidth(Double.MAX_VALUE); mCloneAliasButton.setMaxWidth(Double.MAX_VALUE);
mCloneAliasButton.setOnAction(event -> { mCloneAliasButton.setOnAction(event ->
{
Alias original = getAliasTableView().getSelectionModel().getSelectedItem(); Alias original = getAliasTableView().getSelectionModel().getSelectedItem();
Alias copy = AliasFactory.shallowCopyOf(original); Alias copy = AliasFactory.shallowCopyOf(original);
mPlaylistManager.getAliasModel().addAlias(copy); mPlaylistManager.getAliasModel().addAlias(copy);
@@ -577,7 +586,8 @@ public class AliasConfigurationEditor extends SplitPane
{ {
mMoveToAliasButton = new MenuButton("Move To"); mMoveToAliasButton = new MenuButton("Move To");
mMoveToAliasButton.setDisable(true); mMoveToAliasButton.setDisable(true);
mMoveToAliasButton.setOnShowing(event -> { mMoveToAliasButton.setOnShowing(event ->
{
mMoveToAliasButton.getItems().clear(); mMoveToAliasButton.getItems().clear();
MenuItem emptyItem = new MenuItem("Alias Lists"); MenuItem emptyItem = new MenuItem("Alias Lists");
@@ -586,10 +596,10 @@ public class AliasConfigurationEditor extends SplitPane
List<String> aliasLists = mPlaylistManager.getAliasModel().getListNames(); List<String> aliasLists = mPlaylistManager.getAliasModel().getListNames();
for(String aliasList: aliasLists) for(String aliasList : aliasLists)
{ {
if(!aliasList.contentEquals(AliasModel.NO_ALIAS_LIST) && if(!aliasList.contentEquals(AliasModel.NO_ALIAS_LIST) &&
!aliasList.contentEquals(getAliasListNameComboBox().getSelectionModel().getSelectedItem())) !aliasList.contentEquals(getAliasListNameComboBox().getSelectionModel().getSelectedItem()))
{ {
mMoveToAliasButton.getItems().add(new MoveToAliasListItem(aliasList)); mMoveToAliasButton.getItems().add(new MoveToAliasListItem(aliasList));
} }
@@ -606,9 +616,10 @@ public class AliasConfigurationEditor extends SplitPane
{ {
super(aliasList); super(aliasList);
setOnAction(event -> { setOnAction(event ->
{
List<Alias> selectedAliases = new ArrayList<>(getAliasTableView().getSelectionModel().getSelectedItems()); List<Alias> selectedAliases = new ArrayList<>(getAliasTableView().getSelectionModel().getSelectedItems());
for(Alias selected: selectedAliases) for(Alias selected : selectedAliases)
{ {
AliasList existing = mPlaylistManager.getAliasModel().getAliasList(selected.getAliasListName()); AliasList existing = mPlaylistManager.getAliasModel().getAliasList(selected.getAliasListName());
existing.removeAlias(selected); existing.removeAlias(selected);
@@ -621,16 +632,16 @@ public class AliasConfigurationEditor extends SplitPane
} }
} }
public class ColorizedCell implements Callback<TableColumn<Alias,Integer>,TableCell<Alias,Integer>> public class ColorizedCell implements Callback<TableColumn<Alias, Integer>, TableCell<Alias, Integer>>
{ {
@Override @Override
public TableCell<Alias,Integer> call(TableColumn<Alias,Integer> param) public TableCell<Alias, Integer> call(TableColumn<Alias, Integer> param)
{ {
final Rectangle rectangle = new Rectangle(20,20); final Rectangle rectangle = new Rectangle(20, 20);
rectangle.setArcHeight(10); rectangle.setArcHeight(10);
rectangle.setArcWidth(10); rectangle.setArcWidth(10);
TableCell<Alias,Integer> tableCell = new TableCell<>() TableCell<Alias, Integer> tableCell = new TableCell<>()
{ {
@Override @Override
protected void updateItem(Integer item, boolean empty) protected void updateItem(Integer item, boolean empty)
@@ -667,7 +678,7 @@ public class AliasConfigurationEditor extends SplitPane
/** /**
* Boolean table cell with an icon visibility bound to the boolean value * Boolean table cell with an icon visibility bound to the boolean value
*/ */
public class IconCell implements Callback<TableColumn<Alias,Boolean>,TableCell<Alias,Boolean>> public class IconCell implements Callback<TableColumn<Alias, Boolean>, TableCell<Alias, Boolean>>
{ {
private IconCode mIconCode; private IconCode mIconCode;
private Color mColor; private Color mColor;
@@ -679,13 +690,13 @@ public class AliasConfigurationEditor extends SplitPane
} }
@Override @Override
public TableCell<Alias,Boolean> call(TableColumn<Alias,Boolean> param) public TableCell<Alias, Boolean> call(TableColumn<Alias, Boolean> param)
{ {
final IconNode iconNode = new IconNode(mIconCode); final IconNode iconNode = new IconNode(mIconCode);
iconNode.setIconSize(20); iconNode.setIconSize(20);
iconNode.setFill(mColor); iconNode.setFill(mColor);
TableCell<Alias,Boolean> tableCell = new TableCell<>() TableCell<Alias, Boolean> tableCell = new TableCell<>()
{ {
@Override @Override
protected void updateItem(Boolean item, boolean empty) protected void updateItem(Boolean item, boolean empty)
@@ -708,10 +719,10 @@ public class AliasConfigurationEditor extends SplitPane
} }
} }
public class IdentifierCountCell implements Callback<TableColumn.CellDataFeatures<Alias,Integer>,ObservableValue<Integer>> public class IdentifierCountCell implements Callback<TableColumn.CellDataFeatures<Alias, Integer>, ObservableValue<Integer>>
{ {
@Override @Override
public ObservableValue<Integer> call(TableColumn.CellDataFeatures<Alias,Integer> param) public ObservableValue<Integer> call(TableColumn.CellDataFeatures<Alias, Integer> param)
{ {
if(param.getValue() != null) if(param.getValue() != null)
{ {
@@ -722,10 +733,10 @@ public class AliasConfigurationEditor extends SplitPane
} }
} }
public class ActionCountCell implements Callback<TableColumn.CellDataFeatures<Alias,Integer>,ObservableValue<Integer>> public class ActionCountCell implements Callback<TableColumn.CellDataFeatures<Alias, Integer>, ObservableValue<Integer>>
{ {
@Override @Override
public ObservableValue<Integer> call(TableColumn.CellDataFeatures<Alias,Integer> param) public ObservableValue<Integer> call(TableColumn.CellDataFeatures<Alias, Integer> param)
{ {
Integer count = null; Integer count = null;
@@ -738,16 +749,16 @@ public class AliasConfigurationEditor extends SplitPane
} }
} }
public class CenteredCountCellFactory implements Callback<TableColumn<Alias,Integer>,TableCell<Alias,Integer>> public class CenteredCountCellFactory implements Callback<TableColumn<Alias, Integer>, TableCell<Alias, Integer>>
{ {
@Override @Override
public TableCell<Alias,Integer> call(TableColumn<Alias,Integer> param) public TableCell<Alias, Integer> call(TableColumn<Alias, Integer> param)
{ {
return new CenteredCountCell(); return new CenteredCountCell();
} }
} }
public class CenteredCountCell extends TableCell<Alias,Integer> public class CenteredCountCell extends TableCell<Alias, Integer>
{ {
public CenteredCountCell() public CenteredCountCell()
{ {
@@ -760,7 +771,7 @@ public class AliasConfigurationEditor extends SplitPane
@Override @Override
public TableCell<Alias, Integer> call(TableColumn<Alias, Integer> param) public TableCell<Alias, Integer> call(TableColumn<Alias, Integer> param)
{ {
TableCell tableCell = new TableCell<Alias,Integer>() TableCell tableCell = new TableCell<Alias, Integer>()
{ {
@Override @Override
protected void updateItem(Integer item, boolean empty) protected void updateItem(Integer item, boolean empty)
@@ -806,7 +817,7 @@ public class AliasConfigurationEditor extends SplitPane
@Override @Override
public TableCell<Alias, String> call(TableColumn<Alias, String> param) public TableCell<Alias, String> call(TableColumn<Alias, String> param)
{ {
TableCell<Alias,String> tableCell = new TableCell<>() TableCell<Alias, String> tableCell = new TableCell<>()
{ {
@Override @Override
protected void updateItem(String item, boolean empty) protected void updateItem(String item, boolean empty)