Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-30 18:28:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

error handling, popups, code cleanup

Browse source
This commit is contained in:
Manfred Karrer 2014-06-27 15:36:03 +02:00
parent 828b5ad9f2
commit 7abbe21329
107 changed files with 1911 additions and 2283 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/io/bitsquare/trade/Offer.java
View file

@ -4,7 +4,6 @@ import io.bitsquare.bank.BankAccountTypeInfo;
import io.bitsquare.btc.BtcFormatter;
import io.bitsquare.locale.Country;
import io.bitsquare.user.Arbitrator;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.*;
@ -20,7 +19,7 @@ public class Offer implements Serializable
private final String id;
private final Date creationDate;
private double price;
private final double price;
private final BigInteger amount;
private final BigInteger minAmount;
private final String messagePubKeyAsHex;
@ -30,9 +29,9 @@ public class Offer implements Serializable
private final int collateral;
private final List<Country> acceptedCountries;
private final List<Locale> acceptedLanguageLocales;
private String offerFeePaymentTxID;
private final String bankAccountUID;
private final Arbitrator arbitrator;
private String offerFeePaymentTxID;
///////////////////////////////////////////////////////////////////////////////////////////
@ -77,9 +76,9 @@ public class Offer implements Serializable
// Setters
///////////////////////////////////////////////////////////////////////////////////////////
public void setOfferFeePaymentTxID(String offerFeePaymentTxID)
public String getMessagePubKeyAsHex()
{
this.offerFeePaymentTxID = offerFeePaymentTxID;
return messagePubKeyAsHex;
}
@ -87,11 +86,6 @@ public class Offer implements Serializable
// Getters
///////////////////////////////////////////////////////////////////////////////////////////
public String getMessagePubKeyAsHex()
{
return messagePubKeyAsHex;
}
public String getId()
{
return id;
@ -157,6 +151,11 @@ public class Offer implements Serializable
return offerFeePaymentTxID;
}
public void setOfferFeePaymentTxID(String offerFeePaymentTxID)
{
this.offerFeePaymentTxID = offerFeePaymentTxID;
}
public Arbitrator getArbitrator()
{
return arbitrator;