mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6183 from ghubstan/fix-getacctform-testbug

Browse source 
Rename AustraliaPayidPayload -> AustraliaPayidAccountPayload
This commit is contained in:
Christoph Atteneder 2022-05-02 09:46:24 +02:00 • committed by GitHub
commit 0152f00493
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java
View file

@ -19,7 +19,7 @@ package bisq.core.payment;
import bisq.core.locale.FiatCurrency; import bisq.core.locale.FiatCurrency;
import bisq.core.locale.TradeCurrency; import bisq.core.locale.TradeCurrency;
import bisq.core.payment.payload.AustraliaPayidPayload; import bisq.core.payment.payload.AustraliaPayidAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod; import bisq.core.payment.payload.PaymentMethod;
@ -38,7 +38,7 @@ public final class AustraliaPayidAccount extends PaymentAccount {
@Override @Override
protected PaymentAccountPayload createPayload() { protected PaymentAccountPayload createPayload() {
return new AustraliaPayidPayload(paymentMethod.getId(), id); return new AustraliaPayidAccountPayload(paymentMethod.getId(), id);
} }
@Override @Override
@ -47,20 +47,20 @@ public final class AustraliaPayidAccount extends PaymentAccount {
} }
public String getPayid() { public String getPayid() {
return ((AustraliaPayidPayload) paymentAccountPayload).getPayid(); return ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid();
} }
public void setPayid(String payid) { public void setPayid(String payid) {
if (payid == null) payid = ""; if (payid == null) payid = "";
((AustraliaPayidPayload) paymentAccountPayload).setPayid(payid); ((AustraliaPayidAccountPayload) paymentAccountPayload).setPayid(payid);
} }
public String getBankAccountName() { public String getBankAccountName() {
return ((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName(); return ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName();
} }
public void setBankAccountName(String bankAccountName) { public void setBankAccountName(String bankAccountName) {
if (bankAccountName == null) bankAccountName = ""; if (bankAccountName == null) bankAccountName = "";
((AustraliaPayidPayload) paymentAccountPayload).setBankAccountName(bankAccountName); ((AustraliaPayidAccountPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
} }
} }

20
core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java → core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
View file

@ -39,11 +39,11 @@ import lombok.extern.slf4j.Slf4j;
@Setter @Setter
@Getter @Getter
@Slf4j @Slf4j
public final class AustraliaPayidPayload extends PaymentAccountPayload { public final class AustraliaPayidAccountPayload extends PaymentAccountPayload {
private String payid = ""; private String payid = "";
private String bankAccountName = ""; private String bankAccountName = "";
public AustraliaPayidPayload(String paymentMethod, String id) { public AustraliaPayidAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id); super(paymentMethod, id);
} }
@ -52,12 +52,12 @@ public final class AustraliaPayidPayload extends PaymentAccountPayload {
// PROTO BUFFER // PROTO BUFFER
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private AustraliaPayidPayload(String paymentMethod, private AustraliaPayidAccountPayload(String paymentMethod,
String id, String id,
String payid, String payid,
String bankAccountName, String bankAccountName,
long maxTradePeriod, long maxTradePeriod,
Map<String, String> excludeFromJsonDataMap) { Map<String, String> excludeFromJsonDataMap) {
super(paymentMethod, super(paymentMethod,
id, id,
maxTradePeriod, maxTradePeriod,
@ -77,9 +77,9 @@ public final class AustraliaPayidPayload extends PaymentAccountPayload {
).build(); ).build();
} }
public static AustraliaPayidPayload fromProto(protobuf.PaymentAccountPayload proto) { public static AustraliaPayidAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
protobuf.AustraliaPayidPayload AustraliaPayidPayload = proto.getAustraliaPayidPayload(); protobuf.AustraliaPayidPayload AustraliaPayidPayload = proto.getAustraliaPayidPayload();
return new AustraliaPayidPayload(proto.getPaymentMethodId(), return new AustraliaPayidAccountPayload(proto.getPaymentMethodId(),
proto.getId(), proto.getId(),
AustraliaPayidPayload.getPayid(), AustraliaPayidPayload.getPayid(),
AustraliaPayidPayload.getBankAccountName(), AustraliaPayidPayload.getBankAccountName(),

4
core/src/main/java/bisq/core/proto/CoreProtoResolver.java
View file

@ -25,7 +25,7 @@ import bisq.core.payment.payload.AchTransferAccountPayload;
import bisq.core.payment.payload.AdvancedCashAccountPayload; import bisq.core.payment.payload.AdvancedCashAccountPayload;
import bisq.core.payment.payload.AliPayAccountPayload; import bisq.core.payment.payload.AliPayAccountPayload;
import bisq.core.payment.payload.AmazonGiftCardAccountPayload; import bisq.core.payment.payload.AmazonGiftCardAccountPayload;
import bisq.core.payment.payload.AustraliaPayidPayload; import bisq.core.payment.payload.AustraliaPayidAccountPayload;
import bisq.core.payment.payload.BizumAccountPayload; import bisq.core.payment.payload.BizumAccountPayload;
import bisq.core.payment.payload.BsqSwapAccountPayload; import bisq.core.payment.payload.BsqSwapAccountPayload;
import bisq.core.payment.payload.CapitualAccountPayload; import bisq.core.payment.payload.CapitualAccountPayload;
@ -186,7 +186,7 @@ public class CoreProtoResolver implements ProtoResolver {
case JAPAN_BANK_ACCOUNT_PAYLOAD: case JAPAN_BANK_ACCOUNT_PAYLOAD:
return JapanBankAccountPayload.fromProto(proto); return JapanBankAccountPayload.fromProto(proto);
case AUSTRALIA_PAYID_PAYLOAD: case AUSTRALIA_PAYID_PAYLOAD:
return AustraliaPayidPayload.fromProto(proto); return AustraliaPayidAccountPayload.fromProto(proto);
case UPHOLD_ACCOUNT_PAYLOAD: case UPHOLD_ACCOUNT_PAYLOAD:
return UpholdAccountPayload.fromProto(proto); return UpholdAccountPayload.fromProto(proto);
case MONEY_BEAM_ACCOUNT_PAYLOAD: case MONEY_BEAM_ACCOUNT_PAYLOAD:

6
desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
View file

@ -26,7 +26,7 @@ import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency; import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AustraliaPayidAccount; import bisq.core.payment.AustraliaPayidAccount;
import bisq.core.payment.PaymentAccount; import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AustraliaPayidPayload; import bisq.core.payment.payload.AustraliaPayidAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter; import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator; import bisq.core.util.validation.InputValidator;
@ -43,9 +43,9 @@ public class AustraliaPayidForm extends PaymentMethodForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName()); ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName());
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"), addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
((AustraliaPayidPayload) paymentAccountPayload).getPayid()); ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid());
return gridRow; return gridRow;
} }