X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fjson%2Fv1_14%2FParsedLedgerTransaction.java;h=5b9b399b30406e6211aa9edf667c02be62e8efe9;hp=926717cc9f7570862915a98dba2907e5ce02c2a8;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=1ad7a3b131b2510bcb9a515dafe6a08765bd6100 diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedLedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedLedgerTransaction.java index 926717cc..5b9b399b 100644 --- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedLedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedLedgerTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 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,11 +23,10 @@ import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Misc; +import net.ktnx.mobileledger.utils.SimpleDate; import java.text.ParseException; import java.util.ArrayList; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) @@ -60,9 +59,9 @@ public class ParsedLedgerTransaction implements net.ktnx.mobileledger.json.Parse } result.setTpostings(postings); - Date transactionDate = tr.getDate(); + SimpleDate transactionDate = tr.getDate(); if (transactionDate == null) { - transactionDate = new GregorianCalendar().getTime(); + transactionDate = SimpleDate.today(); } result.setTdate(Globals.formatIsoDate(transactionDate)); result.setTdate2(null); @@ -145,7 +144,7 @@ public class ParsedLedgerTransaction implements net.ktnx.mobileledger.json.Parse tpostings.add(posting); } public LedgerTransaction asLedgerTransaction() throws ParseException { - Date date = Globals.parseIsoDate(tdate); + SimpleDate date = Globals.parseIsoDate(tdate); LedgerTransaction tr = new LedgerTransaction(tindex, date, tdescription); tr.setComment(Misc.trim(Misc.emptyIsNull(tcomment)));