X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=ba80ac615f4991bdd8d237b0f07779510d76840d;hb=5545ddea3574103c2a7eea552fff0d43a0587fac;hp=ad6c94c26f2948368f06c725cd6913c91f9140d8;hpb=04f4085aad9982912b5061d3c0fb67892089816a;p=mobile-ledger-staging.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 ad6c94c2..ba80ac61 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java @@ -23,58 +23,70 @@ public class LedgerTransactionAccount { private String accountName; private String shortAccountName; private float amount; - private boolean amountSet; + 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.comment = comment; } - public LedgerTransactionAccount(String accountName) { this.accountName = accountName; } - + 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; } - public String getShortAccountName() { - return shortAccountName; - } public void setAccountName(String accountName) { this.accountName = accountName; shortAccountName = accountName.replaceAll("(?<=^|:)(.)[^:]+(?=:)", "$1"); } - + public String getShortAccountName() { + return shortAccountName; + } public float getAmount() { - if (!amountSet) throw new IllegalStateException("Account amount is not set"); + if (!amountSet) + throw new IllegalStateException("Account amount is not set"); 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 = currency; + } @NonNull public String toString() { - if (!amountSet) return ""; + if (!amountSet) + return ""; StringBuilder sb = new StringBuilder(); if (currency != null) {