From 12aadf9ab83cd283293351077c4973dbf716ae80 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Wed, 3 Nov 2021 13:42:06 +0100
Subject: [PATCH] Add getAmountAsLong to TradeModel

---
 core/src/main/java/bisq/core/trade/model/TradeModel.java   | 2 ++
 .../src/main/java/bisq/core/trade/model/bisq_v1/Trade.java | 7 ++++++-
 .../java/bisq/core/trade/model/bsq_swap/BsqSwapTrade.java  | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/model/TradeModel.java b/core/src/main/java/bisq/core/trade/model/TradeModel.java
index 04104c8c6a..a267e625fb 100644
--- a/core/src/main/java/bisq/core/trade/model/TradeModel.java
+++ b/core/src/main/java/bisq/core/trade/model/TradeModel.java
@@ -65,6 +65,8 @@ public abstract class TradeModel implements Tradable, Model {
 
     public abstract TradePhase getTradePhase();
 
+    public abstract long getAmountAsLong();
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Tradable implementation
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
index 50bdf3344d..40f8f8e421 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
@@ -306,7 +306,6 @@ public abstract class Trade extends TradeModel {
     @Getter
     @Setter
     private String payoutTxId;
-    @Getter
     @Setter
     private long amountAsLong;
     @Setter
@@ -729,6 +728,12 @@ public abstract class Trade extends TradeModel {
         return isWithdrawn();
     }
 
+    @Override
+    public long getAmountAsLong() {
+        return amountAsLong;
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Abstract
     ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapTrade.java b/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapTrade.java
index 6304d3780b..540180b209 100644
--- a/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapTrade.java
@@ -70,7 +70,7 @@ public abstract class BsqSwapTrade extends TradeModel {
         }
     }
 
-    @Getter
+
     private final long amountAsLong;
     @Getter
     private final long txFeePerVbyte;
@@ -180,6 +180,11 @@ public abstract class BsqSwapTrade extends TradeModel {
         return state.getTradePhase();
     }
 
+    @Override
+    public long getAmountAsLong() {
+        return amountAsLong;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Setters