X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=6a8234f28dc8d7145f8cd578db2353f8f5f41aad;hb=c27aa72c2c641bcd568692b4a20b125605cfb3b5;hp=638a692cff56d21417e15786183c2bb0a14109a2;hpb=0a73337c99e2074aa7e7228204289896342ec636;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java index 638a692c..6a8234f2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -36,25 +36,21 @@ import java.util.Comparator; public class LedgerTransaction { private static final String DIGEST_TYPE = "SHA-256"; - public final Comparator comparator = - new Comparator() { - @Override - public int compare(LedgerTransactionAccount o1, LedgerTransactionAccount o2) { - int res = o1.getAccountName() - .compareTo(o2.getAccountName()); - if (res != 0) - return res; - res = o1.getCurrency() - .compareTo(o2.getCurrency()); - if (res != 0) - return res; - res = o1.getComment() - .compareTo(o2.getComment()); - if (res != 0) - return res; - return Float.compare(o1.getAmount(), o2.getAmount()); - } - }; + public final Comparator comparator = (o1, o2) -> { + int res = o1.getAccountName() + .compareTo(o2.getAccountName()); + if (res != 0) + return res; + res = o1.getCurrency() + .compareTo(o2.getCurrency()); + if (res != 0) + return res; + res = o1.getComment() + .compareTo(o2.getComment()); + if (res != 0) + return res; + return Float.compare(o1.getAmount(), o2.getAmount()); + }; private String profile; private Integer id; private SimpleDate date; @@ -78,7 +74,7 @@ public class LedgerTransaction { dataLoaded = false; } public LedgerTransaction(Integer id, SimpleDate date, String description) { - this(id, date, description, Data.profile.getValue()); + this(id, date, description, Data.getProfile()); } public LedgerTransaction(SimpleDate date, String description) { this(null, date, description);