From 68a4178bf3ae4c52c5ce3954387814518d2dc1ef Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 17 May 2015 00:20:30 +0200 Subject: [PATCH] Make BlurManager static --- .../java/io/bitsquare/btc/WalletService.java | 2 +- .../java/io/bitsquare/p2p/BootstrapNodes.java | 2 +- core/src/main/java/io/bitsquare/p2p/Node.java | 9 +++--- .../java/io/bitsquare/app/BitsquareApp.java | 6 ++-- .../java/io/bitsquare/gui/OverlayManager.java | 10 +++---- .../gui/components/AddressTextField.java | 13 ++------- .../io/bitsquare/gui/components/Popups.java | 19 ++++--------- .../java/io/bitsquare/gui/main/MainView.java | 8 ++---- .../io/bitsquare/gui/main/MainViewModel.java | 2 ++ .../account/content/fiat/FiatAccountView.java | 8 ++---- .../registration/RegistrationView.java | 10 ++----- .../main/funds/withdrawal/WithdrawalView.fxml | 2 +- .../main/funds/withdrawal/WithdrawalView.java | 28 +++++++++++++++++-- .../offer/createoffer/CreateOfferView.java | 9 ++---- .../main/offer/offerbook/OfferBookView.java | 7 ++--- .../main/offer/takeoffer/TakeOfferView.java | 9 ++---- .../steps/ConfirmFiatReceivedView.java | 3 +- .../settings/network/NetworkSettingsView.java | 6 ++-- 18 files changed, 70 insertions(+), 83 deletions(-) diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java index d0fe6e34c1..3eadb5de95 100644 --- a/core/src/main/java/io/bitsquare/btc/WalletService.java +++ b/core/src/main/java/io/bitsquare/btc/WalletService.java @@ -610,7 +610,7 @@ public class WalletService { @Override protected void doneDownload() { super.doneDownload(); - Threading.USER_THREAD.execute(() -> this.percentage.set(1)); + Threading.USER_THREAD.execute(() -> this.percentage.set(1d)); } public ReadOnlyDoubleProperty percentageProperty() { diff --git a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java index 13a9c21743..e2ce52d0ec 100644 --- a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java +++ b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java @@ -30,7 +30,7 @@ public class BootstrapNodes { public static final int BASE_PORT = 7366; // port will be evaluated from btc network 7366 for mainnet, 7367 for testnet and 7368 for regtest private static List bootstrapNodes = Arrays.asList( - //Node.at("digitalocean1.bitsquare.io", "188.226.179.109", BASE_PORT), + Node.at("digitalocean1.bitsquare.io", "188.226.179.109", BASE_PORT), Node.at("aws1.bitsquare.io", "52.24.144.42", BASE_PORT), Node.at("aws2.bitsquare.io", "52.11.125.194", BASE_PORT) ); diff --git a/core/src/main/java/io/bitsquare/p2p/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java index 43ac287069..24e3747cb3 100644 --- a/core/src/main/java/io/bitsquare/p2p/Node.java +++ b/core/src/main/java/io/bitsquare/p2p/Node.java @@ -127,10 +127,9 @@ public final class Node { @Override public String toString() { - return Objects.toStringHelper(Node.class.getSimpleName()) - .add("name", name) - .add("ip", ip) - .add("port", port) - .toString(); + return "Node with: " + + "name='" + name + '\'' + + ", ip='" + ip + '\'' + + ", port=" + port; } } diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java index 8bfda3308f..60a9646ce3 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -60,7 +60,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY; public class BitsquareApp extends Application { private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); - public static final boolean DEV_MODE = true; + public static final boolean DEV_MODE = false; private static Environment env; @@ -138,8 +138,8 @@ public class BitsquareApp extends Application { new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) stop(); else if (new KeyCodeCombination(KeyCode.D, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) - if (BitsquareApp.DEV_MODE) - showDebugWindow(); + //if (BitsquareApp.DEV_MODE) + showDebugWindow(); }); // configure the primary stage diff --git a/gui/src/main/java/io/bitsquare/gui/OverlayManager.java b/gui/src/main/java/io/bitsquare/gui/OverlayManager.java index da4da3366b..1020b8e11b 100644 --- a/gui/src/main/java/io/bitsquare/gui/OverlayManager.java +++ b/gui/src/main/java/io/bitsquare/gui/OverlayManager.java @@ -24,7 +24,7 @@ import java.util.List; public class OverlayManager { - private final List listeners = new ArrayList<>(); + private final static List listeners = new ArrayList<>(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -35,19 +35,19 @@ public class OverlayManager { public OverlayManager() { } - public void blurContent() { + public static void blurContent() { listeners.stream().forEach(OverlayListener::onBlurContentRequested); } - public void removeBlurContent() { + public static void removeBlurContent() { listeners.stream().forEach(OverlayListener::onRemoveBlurContentRequested); } - public void addListener(OverlayListener listener) { + public static void addListener(OverlayListener listener) { listeners.add(listener); } - public void removeListener(OverlayListener listener) { + public static void removeListener(OverlayListener listener) { listeners.remove(listener); } diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java index 6e3eaf919c..f05067e331 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java +++ b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java @@ -55,8 +55,6 @@ public class AddressTextField extends AnchorPane { private final StringProperty paymentLabel = new SimpleStringProperty(); private final ObjectProperty amountAsCoin = new SimpleObjectProperty<>(); - private OverlayManager overlayManager; - /////////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -114,16 +112,14 @@ public class AddressTextField extends AnchorPane { popOver.setDetachedTitle("Scan QR code for this address"); popOver.setDetached(true); popOver.setOnHiding(windowEvent -> { - if (overlayManager != null) - overlayManager.removeBlurContent(); + OverlayManager.removeBlurContent(); }); Window window = getScene().getWindow(); double x = Math.round(window.getX() + (window.getWidth() - 320) / 2); double y = Math.round(window.getY() + (window.getHeight() - 240) / 2); popOver.show(getScene().getWindow(), x, y); - if (overlayManager != null) - overlayManager.blurContent(); + OverlayManager.blurContent(); } }); @@ -176,11 +172,6 @@ public class AddressTextField extends AnchorPane { this.paymentLabel.set(paymentLabel); } - // TODO find better solution without OverlayManager dependency - public void setOverlayManager(OverlayManager overlayManager) { - this.overlayManager = overlayManager; - } - /////////////////////////////////////////////////////////////////////////////////////////// // Private diff --git a/gui/src/main/java/io/bitsquare/gui/components/Popups.java b/gui/src/main/java/io/bitsquare/gui/components/Popups.java index 6bfe84ad1d..65d4c6f750 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/Popups.java +++ b/gui/src/main/java/io/bitsquare/gui/components/Popups.java @@ -39,15 +39,8 @@ public class Popups { public static Stage primaryStage; - // TODO just temporary, class will be removed completely - public static void setOverlayManager(OverlayManager overlayManager) { - Popups.overlayManager = overlayManager; - } - - private static OverlayManager overlayManager; - public static void removeBlurContent() { - overlayManager.removeBlurContent(); + OverlayManager.removeBlurContent(); } // Information @@ -56,7 +49,7 @@ public class Popups { } public static void openInfoPopup(String masthead, String message) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.close")) { @Override @@ -84,7 +77,7 @@ public class Popups { } public static Action openConfirmPopup(String title, String masthead, String message) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.ok")) { @Override @@ -123,7 +116,7 @@ public class Popups { } public static void openWarningPopup(String title, String masthead, String message) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.close")) { @Override @@ -156,7 +149,7 @@ public class Popups { } public static void openErrorPopup(String title, String masthead, String message) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.close")) { @Override @@ -189,7 +182,7 @@ public class Popups { } private static void openExceptionPopup(Throwable throwable, String title, String masthead, String message) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.close")) { @Override diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java index cff736a743..e9db876d6c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -66,7 +66,6 @@ public class MainView extends InitializableView { private final ViewLoader viewLoader; private final Navigation navigation; - private final OverlayManager overlayManager; private final Transitions transitions; private final String title; private ChangeListener walletServiceErrorMsgListener; @@ -84,12 +83,11 @@ public class MainView extends InitializableView { private List persistedFilesCorrupted; @Inject - public MainView(MainViewModel model, CachingViewLoader viewLoader, Navigation navigation, OverlayManager overlayManager, Transitions transitions, + public MainView(MainViewModel model, CachingViewLoader viewLoader, Navigation navigation, Transitions transitions, @Named(MainView.TITLE_KEY) String title) { super(model); this.viewLoader = viewLoader; this.navigation = navigation; - this.overlayManager = overlayManager; this.transitions = transitions; this.title = title; } @@ -497,9 +495,7 @@ public class MainView extends InitializableView { } private void configureBlurring(Node node) { - Popups.setOverlayManager(overlayManager); - - overlayManager.addListener(new OverlayManager.OverlayListener() { + OverlayManager.addListener(new OverlayManager.OverlayListener() { @Override public void onBlurContentRequested() { transitions.blur(node); diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index 6b574e1814..fd505cdc85 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -160,6 +160,8 @@ class MainViewModel implements ViewModel { setBitcoinNetworkSyncProgress((double) newValue); }); setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get()); + // Sometimes we don't get the updates, so add an additional setter after 2 seconds + Utilities.setTimeout(2000, () -> setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get())); walletService.numPeersProperty().addListener((observable, oldValue, newValue) -> { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java index 6f47d55720..ccf1b0d264 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java @@ -62,12 +62,10 @@ public class FiatAccountView extends ActivatableViewAndModel { if (newValue) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); actions.add(new AbstractAction(BSResources.get("shared.no")) { @Override @@ -228,7 +226,7 @@ public class FiatAccountView extends ActivatableViewAndModel { if (newValue) { - overlayManager.blurContent(); + OverlayManager.blurContent(); List actions = new ArrayList<>(); /* actions.add(new AbstractAction(BSResources.get("shared.copyTxId")) { diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml index ce7b6b9590..a4f9e8a52d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml @@ -56,7 +56,7 @@