From 6ef6bf24d9c72b179bb25ea487833f3e3b145f7c Mon Sep 17 00:00:00 2001 From: Steven Barclay Date: Fri, 6 Mar 2020 17:03:55 +0800 Subject: [PATCH] Avoid raw use of Overlay --- .../java/bisq/desktop/main/MainViewModel.java | 22 +++++++++---------- .../monitor/daostate/DaoStateMonitorView.java | 18 +++++++-------- .../pendingtrades/steps/TradeStepView.java | 3 +-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index 0766f96c43..f439cfc0cd 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -133,7 +133,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { private Timer checkNumberOfP2pNetworkPeersTimer; @SuppressWarnings("FieldCanBeLocal") private MonadicBinding tradesAndUIReady; - private Queue popupQueue = new PriorityQueue<>(Comparator.comparing(Overlay::getDisplayOrderPriority)); + private Queue> popupQueue = new PriorityQueue<>(Comparator.comparing(Overlay::getDisplayOrderPriority)); /////////////////////////////////////////////////////////////////////////////////////////// @@ -362,7 +362,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { .show()); bisqSetup.setDisplayLocalhostHandler(key -> { if (!DevEnv.isDevMode()) { - Overlay popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg") + + Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg") + Res.get("popup.bitcoinLocalhostNode.additionalRequirements")) .dontShowAgainId(key); popup.setDisplayOrderPriority(5); @@ -396,14 +396,14 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { tradeManager.getTradesWithoutDepositTx().addListener((ListChangeListener) c -> { c.next(); if (c.wasAdded()) { - c.getAddedSubList().forEach(trade -> { - new Popup().warning(Res.get("popup.warning.trade.depositTxNull", trade.getShortId())) - .actionButtonText(Res.get("popup.warning.trade.depositTxNull.shutDown")) - .onAction(() -> BisqApp.getShutDownHandler().run()) - .secondaryActionButtonText(Res.get("popup.warning.trade.depositTxNull.moveToFailedTrades")) - .onSecondaryAction(() -> tradeManager.addTradeToFailedTrades(trade)) - .show(); - }); + c.getAddedSubList().forEach(trade -> + new Popup().warning(Res.get("popup.warning.trade.depositTxNull", trade.getShortId())) + .actionButtonText(Res.get("popup.warning.trade.depositTxNull.shutDown")) + .onAction(() -> BisqApp.getShutDownHandler().run()) + .secondaryActionButtonText(Res.get("popup.warning.trade.depositTxNull.moveToFailedTrades")) + .onSecondaryAction(() -> tradeManager.addTradeToFailedTrades(trade)) + .show() + ); } }); @@ -682,7 +682,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { private void maybeShowPopupsFromQueue() { if (!popupQueue.isEmpty()) { - Overlay overlay = popupQueue.poll(); + Overlay overlay = popupQueue.poll(); overlay.getIsHiddenProperty().addListener((observable, oldValue, newValue) -> { if (newValue) { UserThread.runAfter(this::maybeShowPopupsFromQueue, 2); diff --git a/desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java b/desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java index 567c4e3698..1166f41c13 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java @@ -19,7 +19,6 @@ package bisq.desktop.main.dao.monitor.daostate; import bisq.desktop.common.view.FxmlView; import bisq.desktop.main.dao.monitor.StateMonitorView; -import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.util.FormBuilder; @@ -53,7 +52,7 @@ public class DaoStateMonitorView extends StateMonitorView utxoMismatchListChangeListener; - private Overlay warningPopup; + private Popup warningPopup; /////////////////////////////////////////////////////////////////////////////////////////// @@ -208,17 +207,16 @@ public class DaoStateMonitorView extends StateMonitorView { - sb.append("\n").append(Res.get("dao.monitor.daoState.utxoConflicts.blockHeight", e.getHeight())).append("\n") - .append(Res.get("dao.monitor.daoState.utxoConflicts.sumUtxo", e.getSumUtxo() / 100)).append("\n") - .append(Res.get("dao.monitor.daoState.utxoConflicts.sumBsq", e.getSumBsq() / 100)); - }); + daoStateMonitoringService.getUtxoMismatches().forEach(e -> sb.append("\n") + .append(Res.get("dao.monitor.daoState.utxoConflicts.blockHeight", e.getHeight())).append("\n") + .append(Res.get("dao.monitor.daoState.utxoConflicts.sumUtxo", e.getSumUtxo() / 100)).append("\n") + .append(Res.get("dao.monitor.daoState.utxoConflicts.sumBsq", e.getSumBsq() / 100)) + ); if (warningPopup == null) { warningPopup = new Popup().headLine(Res.get("dao.monitor.daoState.utxoConflicts")) - .warning(Utilities.toTruncatedString(sb.toString(), 500, false)).onClose(() -> { - warningPopup = null; - }); + .warning(Utilities.toTruncatedString(sb.toString(), 500, false)) + .onClose(() -> warningPopup = null); warningPopup.show(); } } diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java index caf6a7ed3f..ef82e67448 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java @@ -20,7 +20,6 @@ package bisq.desktop.main.portfolio.pendingtrades.steps; import bisq.desktop.components.InfoTextField; import bisq.desktop.components.TitledGroupBg; import bisq.desktop.components.TxIdTextField; -import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; import bisq.desktop.main.portfolio.pendingtrades.TradeStepInfo; @@ -93,7 +92,7 @@ public abstract class TradeStepView extends AnchorPane { private ClockWatcher.Listener clockListener; private final ChangeListener errorMessageListener; protected Label infoLabel; - private Overlay acceptMediationResultPopup; + private Popup acceptMediationResultPopup; private BootstrapListener bootstrapListener;