diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java index ac8eb45804..cc60e94dc5 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java @@ -49,12 +49,8 @@ @Slf4j public final class BisqEasyOfferbookView extends ChatView { - private final BisqEasyOfferbookModel bisqEasyOfferbookModel; - private final BisqEasyOfferbookController bisqEasyOfferbookController; private SearchBox marketSelectorSearchBox; - private Label chatDomainTitle; private BisqTableView tableView; - private BisqTableColumn marketLabelTableColumn; private VBox marketSelectionList; private Subscription tableViewSelectionPin, selectedModelItemPin, marketSelectorHeaderIconPin, selectedMarketFilterPin, selectedOffersFilterPin, selectedMarketSortTypePin; private Button createOfferButton; @@ -71,15 +67,13 @@ public BisqEasyOfferbookView(BisqEasyOfferbookModel model, Pane channelSidebar) { super(model, controller, chatMessagesComponent, channelSidebar); - bisqEasyOfferbookController = controller; - bisqEasyOfferbookModel = model; } @Override protected void configTitleHBox() { super.configTitleHBox(); - chatDomainTitle = new Label(Res.get("bisqEasy.offerbook")); + Label chatDomainTitle = new Label(Res.get("bisqEasy.offerbook")); chatDomainTitle.getStyleClass().add("chat-header-title"); HBox headerTitle = new HBox(10, chatDomainTitle, channelDescription); @@ -107,7 +101,7 @@ protected void configContainerHBox() { protected void onViewAttached() { super.onViewAttached(); - hideUserMessagesCheckbox.selectedProperty().bindBidirectional(bisqEasyOfferbookModel.getOfferOnly()); + hideUserMessagesCheckbox.selectedProperty().bindBidirectional(getModel().getOfferOnly()); marketSelectorSearchBox.textProperty().bindBidirectional(getModel().getMarketSelectorSearchText()); selectedModelItemPin = EasyBind.subscribe(getModel().getSelectedMarketChannelItem(), selected -> { @@ -146,7 +140,7 @@ private void setOffersFilter(DropdownFilterMenuItem filterMenuItem) { protected void onViewDetached() { super.onViewDetached(); - hideUserMessagesCheckbox.selectedProperty().unbindBidirectional(bisqEasyOfferbookModel.getOfferOnly()); + hideUserMessagesCheckbox.selectedProperty().unbindBidirectional(getModel().getOfferOnly()); marketSelectorSearchBox.textProperty().unbindBidirectional(getModel().getMarketSelectorSearchText()); selectedModelItemPin.unsubscribe(); @@ -266,7 +260,7 @@ private void configTableView() { .isSortable(false) .build(); - marketLabelTableColumn = new BisqTableColumn.Builder() + BisqTableColumn marketLabelTableColumn = new BisqTableColumn.Builder() .minWidth(100) .left() .setCellFactory(BisqEasyOfferbookUtil.getMarketLabelCellFactory()) @@ -333,10 +327,8 @@ private void updateSelectedMarketFilter(Filters.Markets marketFilter) { sortAndFilterMarketsMenu.getMenuItems().stream() .filter(menuItem -> menuItem instanceof DropdownFilterMenuItem) - .forEach(menuItem -> { - DropdownFilterMenuItem filterMenuItem = (DropdownFilterMenuItem) menuItem; - filterMenuItem.updateSelection(marketFilter == filterMenuItem.getFilter()); - }); + .map(menuItem -> (DropdownFilterMenuItem) menuItem) + .forEach(menuItem -> menuItem.updateSelection(marketFilter == menuItem.getFilter())); } private void updateMarketSortType(MarketSortType marketSortType) {