From c43575073d502b01cf8e025b5c18e7ca6cd8f026 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 14 Apr 2016 22:28:47 +0200 Subject: [PATCH] display trade amount in table instead of payout amount. refactor method in trade --- .../java/io/bitsquare/trade/BuyerAsOffererTrade.java | 12 ------------ .../java/io/bitsquare/trade/BuyerAsTakerTrade.java | 9 --------- .../src/main/java/io/bitsquare/trade/BuyerTrade.java | 8 ++++++++ .../main/java/io/bitsquare/trade/SellerTrade.java | 6 ++++++ core/src/main/java/io/bitsquare/trade/Trade.java | 5 +---- .../portfolio/pendingtrades/PendingTradesView.java | 2 +- 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java index cf2cda9812..8cb852b864 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java @@ -18,22 +18,18 @@ package io.bitsquare.trade; import io.bitsquare.app.Version; -import io.bitsquare.btc.FeePolicy; import io.bitsquare.p2p.NodeAddress; import io.bitsquare.storage.Storage; import io.bitsquare.trade.offer.Offer; import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol; import io.bitsquare.trade.protocol.trade.OffererProtocol; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; -import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.ObjectInputStream; -import static com.google.common.base.Preconditions.checkNotNull; - public final class BuyerAsOffererTrade extends BuyerTrade implements OffererTrade { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; @@ -73,12 +69,4 @@ public final class BuyerAsOffererTrade extends BuyerTrade implements OffererTrad public void handleTakeOfferRequest(TradeMessage message, NodeAddress taker) { ((OffererProtocol) tradeProtocol).handleTakeOfferRequest(message, taker); } - - @Override - public Coin getPayoutAmount() { - checkNotNull(getTradeAmount(), "Invalid state: getTradeAmount() = null"); - - return FeePolicy.getSecurityDeposit().add(getTradeAmount()); - } - } diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java index 938d9812ea..4a1bee811f 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java @@ -18,7 +18,6 @@ package io.bitsquare.trade; import io.bitsquare.app.Version; -import io.bitsquare.btc.FeePolicy; import io.bitsquare.p2p.NodeAddress; import io.bitsquare.storage.Storage; import io.bitsquare.trade.offer.Offer; @@ -32,7 +31,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade { // That object is saved to disc. We need to take care of changes to not break deserialization. @@ -74,11 +72,4 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade { checkArgument(tradeProtocol instanceof TakerProtocol, "tradeProtocol NOT instanceof TakerProtocol"); ((TakerProtocol) tradeProtocol).takeAvailableOffer(); } - - @Override - public Coin getPayoutAmount() { - checkNotNull(getTradeAmount(), "Invalid state: getTradeAmount() = null"); - - return FeePolicy.getSecurityDeposit().add(getTradeAmount()); - } } diff --git a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java index 3732863963..59fd993420 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java @@ -18,6 +18,7 @@ package io.bitsquare.trade; import io.bitsquare.app.Version; +import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.p2p.NodeAddress; @@ -29,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; public abstract class BuyerTrade extends Trade { // That object is saved to disc. We need to take care of changes to not break deserialization. @@ -63,7 +65,13 @@ public abstract class BuyerTrade extends Trade { log::warn); } } + + @Override + public Coin getPayoutAmount() { + checkNotNull(getTradeAmount(), "Invalid state: getTradeAmount() = null"); + return FeePolicy.getSecurityDeposit().add(getTradeAmount()); + } /////////////////////////////////////////////////////////////////////////////////////////// // Setter for Mutable objects diff --git a/core/src/main/java/io/bitsquare/trade/SellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerTrade.java index 9c60dc19c5..e49b269912 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerTrade.java @@ -18,6 +18,7 @@ package io.bitsquare.trade; import io.bitsquare.app.Version; +import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.p2p.NodeAddress; @@ -64,6 +65,11 @@ public abstract class SellerTrade extends Trade { } } + @Override + public Coin getPayoutAmount() { + return FeePolicy.getSecurityDeposit(); + } + /////////////////////////////////////////////////////////////////////////////////////////// // Setter for Mutable objects /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java index e49a79122d..b34f0ee666 100644 --- a/core/src/main/java/io/bitsquare/trade/Trade.java +++ b/core/src/main/java/io/bitsquare/trade/Trade.java @@ -24,7 +24,6 @@ import com.google.common.util.concurrent.ListenableFuture; import io.bitsquare.app.Log; import io.bitsquare.app.Version; import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.btc.WalletService; import io.bitsquare.common.crypto.KeyRing; @@ -374,9 +373,7 @@ public abstract class Trade implements Tradable, Model { return offer; } - public Coin getPayoutAmount() { - return FeePolicy.getSecurityDeposit(); - } + abstract public Coin getPayoutAmount(); public ProcessModel getProcessModel() { return processModel; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java index c2ec3176ca..bc7a5b6ba1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java @@ -336,7 +336,7 @@ public class PendingTradesView extends ActivatableViewAndModel