Merge pull request #3655 from lusarz/refactor-offer-view

Refactor OfferView constructor
bisq-network · Nov 22, 2019 · c0108b8 · c0108b8
2 parents cb2093a + 8917df9
commit c0108b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
@@ -21,6 +21,7 @@
 import bisq.desktop.common.view.FxmlView;
 import bisq.desktop.common.view.ViewLoader;
 
+import bisq.core.offer.OfferPayload;
 import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
@@ -44,7 +45,7 @@ public BuyOfferView(ViewLoader viewLoader,
                 preferences,
                 arbitratorManager,
                 user,
-                p2PService);
+                p2PService,
+                OfferPayload.Direction.BUY);
     }
 }
-
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
@@ -83,13 +83,14 @@ protected OfferView(ViewLoader viewLoader,
                         Preferences preferences,
                         ArbitratorManager arbitratorManager,
                         User user,
-                        P2PService p2PService) {
+                        P2PService p2PService,
+                        OfferPayload.Direction direction) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
         this.preferences = preferences;
         this.user = user;
         this.p2PService = p2PService;
-        this.direction = (this instanceof BuyOfferView) ? OfferPayload.Direction.BUY : OfferPayload.Direction.SELL;
+        this.direction = direction;
         this.arbitratorManager = arbitratorManager;
     }
 
@@ -133,7 +134,7 @@ else if (removedTabs.get(0).getContent().equals(takeOfferPane))
 
     @Override
     protected void activate() {
-        Optional<TradeCurrency> tradeCurrencyOptional = (this instanceof SellOfferView) ?
+        Optional<TradeCurrency> tradeCurrencyOptional = (this.direction == OfferPayload.Direction.SELL) ?
                 CurrencyUtil.getTradeCurrency(preferences.getSellScreenCurrencyCode()) :
                 CurrencyUtil.getTradeCurrency(preferences.getBuyScreenCurrencyCode());
         tradeCurrency = tradeCurrencyOptional.orElseGet(GlobalSettings::getDefaultTradeCurrency);

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
@@ -21,6 +21,7 @@
 import bisq.desktop.common.view.FxmlView;
 import bisq.desktop.common.view.ViewLoader;
 
+import bisq.core.offer.OfferPayload;
 import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
@@ -44,7 +45,7 @@ public SellOfferView(ViewLoader viewLoader,
                 preferences,
                 arbitratorManager,
                 user,
-                p2PService);
+                p2PService,
+                OfferPayload.Direction.SELL);
     }
 }
-