X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=4468724e5f3771490ce81221ec8d480ce30f3817;hb=2d09e6a32395295afec7deb5561b7eb2a82f8efc;hp=89d6a83a5d3c935ce98b0dcaa65c8d82fa0b6410;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java index 89d6a83a..4468724e 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java @@ -19,34 +19,44 @@ package net.ktnx.mobileledger.model; import androidx.annotation.NonNull; +import net.ktnx.mobileledger.utils.Misc; + public class LedgerTransactionAccount { private String accountName; private String shortAccountName; private float amount; private boolean amountSet = false; private String currency; - - public LedgerTransactionAccount(String accountName, float amount) { - this(accountName, amount, null); - } - public LedgerTransactionAccount(String accountName, float amount, String currency) { + private String comment; + public LedgerTransactionAccount(String accountName, float amount, String currency, + String comment) { this.setAccountName(accountName); this.amount = amount; this.amountSet = true; - this.currency = currency; + this.currency = Misc.emptyIsNull(currency); + this.comment = Misc.emptyIsNull(comment); } - public LedgerTransactionAccount(String accountName) { this.accountName = accountName; } + public LedgerTransactionAccount(String accountName, String currency) { + this.accountName = accountName; + this.currency = Misc.emptyIsNull(currency); + } public LedgerTransactionAccount(LedgerTransactionAccount origin) { // copy constructor setAccountName(origin.getAccountName()); + setComment(origin.getComment()); if (origin.isAmountSet()) setAmount(origin.getAmount()); currency = origin.getCurrency(); } - + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } public String getAccountName() { return accountName; } @@ -63,22 +73,22 @@ public class LedgerTransactionAccount { return amount; } - public void setAmount(float account_amount) { this.amount = account_amount; this.amountSet = true; } - public void resetAmount() { this.amountSet = false; } - public boolean isAmountSet() { return amountSet; } public String getCurrency() { return currency; } + public void setCurrency(String currency) { + this.currency = Misc.emptyIsNull(currency); + } @NonNull public String toString() { if (!amountSet)