Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

change data type of maxTradePeriod to long

Browse Source
This commit is contained in:
Manfred Karrer 2016-04-04 12:58:21 +02:00
parent ed4d643fab
commit 86405a4b88
14 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/bitsquare/payment/AliPayAccountContractData.java
View File

@ -25,7 +25,7 @@ public final class AliPayAccountContractData extends PaymentAccountContractData
private String accountNr;
public AliPayAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public AliPayAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/BankAccountContractData.java
View File

@ -40,7 +40,7 @@ public abstract class BankAccountContractData extends CountryBasedPaymentAccount
@Nullable
protected String holderTaxId;
public BankAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public BankAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/CountryBasedPaymentAccountContractData.java
View File

@ -34,7 +34,7 @@ public abstract class CountryBasedPaymentAccountContractData extends PaymentAcco
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
CountryBasedPaymentAccountContractData(String paymentMethodName, String id, int maxTradePeriod) {
CountryBasedPaymentAccountContractData(String paymentMethodName, String id, long maxTradePeriod) {
super(paymentMethodName, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/CryptoCurrencyAccountContractData.java
View File

@ -31,7 +31,7 @@ public final class CryptoCurrencyAccountContractData extends PaymentAccountContr
@Nullable
private String paymentId;
public CryptoCurrencyAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public CryptoCurrencyAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/NationalBankAccountContractData.java
View File

@ -27,7 +27,7 @@ public final class NationalBankAccountContractData extends BankAccountContractDa
private static final Logger log = LoggerFactory.getLogger(NationalBankAccountContractData.class);
public NationalBankAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public NationalBankAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java
View File

@ -25,7 +25,7 @@ public final class OKPayAccountContractData extends PaymentAccountContractData {
private String accountNr;
public OKPayAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public OKPayAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

4
core/src/main/java/io/bitsquare/payment/PaymentAccount.java
View File

@ -135,10 +135,6 @@ public abstract class PaymentAccount implements Persistable {
return contractData.getPaymentDetails();
}
public int getMaxTradePeriod() {
return contractData.getMaxTradePeriod();
}
public Date getCreationDate() {
return creationDate;
}

9
core/src/main/java/io/bitsquare/payment/PaymentAccountContractData.java
View File

@ -26,14 +26,14 @@ public abstract class PaymentAccountContractData implements Payload {
protected final String paymentMethodName;
protected final String id;
protected final int maxTradePeriod;
protected final long maxTradePeriod;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
PaymentAccountContractData(String paymentMethodName, String id, int maxTradePeriod) {
PaymentAccountContractData(String paymentMethodName, String id, long maxTradePeriod) {
this.paymentMethodName = paymentMethodName;
this.id = id;
this.maxTradePeriod = maxTradePeriod;
@ -55,11 +55,10 @@ public abstract class PaymentAccountContractData implements Payload {
abstract public String getPaymentDetailsForTradePopup();
public int getMaxTradePeriod() {
public long getMaxTradePeriod() {
return maxTradePeriod;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -78,7 +77,7 @@ public abstract class PaymentAccountContractData implements Payload {
public int hashCode() {
int result = paymentMethodName != null ? paymentMethodName.hashCode() : 0;
result = 31 * result + (id != null ? id.hashCode() : 0);
result = 31 * result + maxTradePeriod;
result = 31 * result + (int) (maxTradePeriod ^ (maxTradePeriod >>> 32));
return result;
}

2
core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java
View File

@ -25,7 +25,7 @@ public final class PerfectMoneyAccountContractData extends PaymentAccountContrac
private String accountNr;
public PerfectMoneyAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public PerfectMoneyAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/SameBankAccountContractData.java
View File

@ -28,7 +28,7 @@ public final class SameBankAccountContractData extends BankAccountContractData {
private static final Logger log = LoggerFactory.getLogger(SameBankAccountContractData.class);
public SameBankAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public SameBankAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java
View File

@ -40,7 +40,7 @@ public final class SepaAccountContractData extends CountryBasedPaymentAccountCon
// Dont use a set here as we need a deterministic ordering, otherwise the contract hash does not match
private final ArrayList<String> acceptedCountryCodes;
public SepaAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public SepaAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
Set<String> acceptedCountryCodesAsSet = CountryUtil.getAllSepaCountries().stream().map(e -> e.code).collect(Collectors.toSet());
acceptedCountryCodes = new ArrayList<>(acceptedCountryCodesAsSet);

2
core/src/main/java/io/bitsquare/payment/SpecificBanksAccountContractData.java
View File

@ -36,7 +36,7 @@ public final class SpecificBanksAccountContractData extends BankAccountContractD
// Dont use a set here as we need a deterministic ordering, otherwise the contract hash does not match
private ArrayList<String> acceptedBanks;
public SpecificBanksAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public SpecificBanksAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
acceptedBanks = new ArrayList<>();
}

2
core/src/main/java/io/bitsquare/payment/SwishAccountContractData.java
View File

@ -26,7 +26,7 @@ public final class SwishAccountContractData extends PaymentAccountContractData {
private String mobileNr;
private String holderName;
public SwishAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
public SwishAccountContractData(String paymentMethod, String id, long maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

2
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
View File

@ -108,7 +108,7 @@ public abstract class PaymentMethodForm {
public static void addAllowedPeriod(GridPane gridPane, int gridRow,
@Nullable PaymentAccountContractData paymentAccountContractData, String dateFromBlocks) {
if (paymentAccountContractData != null) {
long hours = paymentAccountContractData.getMaxTradePeriod() / 6;
long hours = paymentAccountContractData.getMaxTradePeriod() / 3600;
String displayText;
if (hours == 1)
displayText = hours + " hour";