X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=59e1dab00fb90d69b8d28ec45f465d9574db74a4;hb=1738aee062f23cc9a69ed11cade1cb048f083def;hp=2e5e9c4990163e81fe0e2719adb098e3df573725;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5;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 2e5e9c49..59e1dab0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -23,36 +23,47 @@ 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; } @@ -74,7 +85,8 @@ public class LedgerTransactionAccount { } @NonNull public String toString() { - if (!amountSet) return ""; + if (!amountSet) + return ""; StringBuilder sb = new StringBuilder(); if (currency != null) {