Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename AustraliaPayidPayload -> AustraliaPayidAccountPayload #6183

Merged
merged 5 commits into from
May 2, 2022
Merged

Rename AustraliaPayidPayload -> AustraliaPayidAccountPayload #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f58d39e
Rename AustraliaPayidPayload -> AustraliaPayidAccountPayload
ghubstan Apr 30, 2022
77a206e
Remove deleted (renamed) class
ghubstan Apr 30, 2022
4df152b
Adjust to renamed class: AustraliaPayidAccountPayload
ghubstan Apr 30, 2022
c03dac5
Adjust to renamed class: AustraliaPayidAccountPayload
ghubstan Apr 30, 2022
0bd38c9
Adjust to renamed class: AustraliaPayidAccountPayload
ghubstan Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import bisq.core.locale.FiatCurrency;
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.PaymentMethod;

Expand All @@ -38,7 +38,7 @@ public AustraliaPayidAccount() {

@Override
protected PaymentAccountPayload createPayload() {
return new AustraliaPayidPayload(paymentMethod.getId(), id);
return new AustraliaPayidAccountPayload(paymentMethod.getId(), id);
}

@Override
Expand All @@ -47,20 +47,20 @@ protected PaymentAccountPayload createPayload() {
}

public String getPayid() {
return ((AustraliaPayidPayload) paymentAccountPayload).getPayid();
return ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid();
}

public void setPayid(String payid) {
if (payid == null) payid = "";
((AustraliaPayidPayload) paymentAccountPayload).setPayid(payid);
((AustraliaPayidAccountPayload) paymentAccountPayload).setPayid(payid);
}

public String getBankAccountName() {
return ((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName();
return ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName();
}

public void setBankAccountName(String bankAccountName) {
if (bankAccountName == null) bankAccountName = "";
((AustraliaPayidPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
((AustraliaPayidAccountPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
}
}
20 changes: 10 additions & 10 deletions ...ayment/payload/AustraliaPayidPayload.java → ...payload/AustraliaPayidAccountPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
@Setter
@Getter
@Slf4j
public final class AustraliaPayidPayload extends PaymentAccountPayload {
public final class AustraliaPayidAccountPayload extends PaymentAccountPayload {
private String payid = "";
private String bankAccountName = "";

public AustraliaPayidPayload(String paymentMethod, String id) {
public AustraliaPayidAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id);
}

Expand All @@ -52,12 +52,12 @@ public AustraliaPayidPayload(String paymentMethod, String id) {
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////

private AustraliaPayidPayload(String paymentMethod,
String id,
String payid,
String bankAccountName,
long maxTradePeriod,
Map<String, String> excludeFromJsonDataMap) {
private AustraliaPayidAccountPayload(String paymentMethod,
String id,
String payid,
String bankAccountName,
long maxTradePeriod,
Map<String, String> excludeFromJsonDataMap) {
super(paymentMethod,
id,
maxTradePeriod,
Expand All @@ -77,9 +77,9 @@ public Message toProtoMessage() {
).build();
}

public static AustraliaPayidPayload fromProto(protobuf.PaymentAccountPayload proto) {
public static AustraliaPayidAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
protobuf.AustraliaPayidPayload AustraliaPayidPayload = proto.getAustraliaPayidPayload();
return new AustraliaPayidPayload(proto.getPaymentMethodId(),
return new AustraliaPayidAccountPayload(proto.getPaymentMethodId(),
proto.getId(),
AustraliaPayidPayload.getPayid(),
AustraliaPayidPayload.getBankAccountName(),
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/proto/CoreProtoResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import bisq.core.payment.payload.AdvancedCashAccountPayload;
import bisq.core.payment.payload.AliPayAccountPayload;
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.BsqSwapAccountPayload;
import bisq.core.payment.payload.CapitualAccountPayload;
Expand Down Expand Up @@ -186,7 +186,7 @@ public PaymentAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
case JAPAN_BANK_ACCOUNT_PAYLOAD:
return JapanBankAccountPayload.fromProto(proto);
case AUSTRALIA_PAYID_PAYLOAD:
return AustraliaPayidPayload.fromProto(proto);
return AustraliaPayidAccountPayload.fromProto(proto);
case UPHOLD_ACCOUNT_PAYLOAD:
return UpholdAccountPayload.fromProto(proto);
case MONEY_BEAM_ACCOUNT_PAYLOAD:
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AustraliaPayidAccount;
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.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
Expand All @@ -43,9 +43,9 @@ public class AustraliaPayidForm extends PaymentMethodForm {

public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName());
((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName());
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
((AustraliaPayidPayload) paymentAccountPayload).getPayid());
((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid());
return gridRow;
}

Expand Down