X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fjson%2Fv1_14%2FParsedPosting.java;h=e099f703c36019593417b7ccccc8d5f183777e0b;hb=2edabed5abbd2ec4fcc59f24eb7f99934c268a74;hp=21cc6dbff22130980ca02e624d2c01ef0d13efbb;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java index 21cc6dbf..e099f703 100644 --- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java +++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) -public class ParsedPosting { +public class ParsedPosting extends net.ktnx.mobileledger.json.ParsedPosting { private Void pbalanceassertion; private String pstatus = "Unmarked"; private String paccount; @@ -42,6 +42,12 @@ public class ParsedPosting { public static ParsedPosting fromLedgerAccount(LedgerTransactionAccount acc) { ParsedPosting result = new ParsedPosting(); result.setPaccount(acc.getAccountName()); + + String comment = acc.getComment(); + if (comment == null) + comment = ""; + result.setPcomment(comment); + ArrayList amounts = new ArrayList<>(); ParsedAmount amt = new ParsedAmount(); amt.setAcommodity((acc.getCurrency() == null) ? "" : acc.getCurrency()); @@ -88,7 +94,7 @@ public class ParsedPosting { return pcomment; } public void setPcomment(String pcomment) { - this.pcomment = pcomment; + this.pcomment = (pcomment == null) ? null : pcomment.trim(); } public List> getPtags() { return ptags; @@ -129,7 +135,8 @@ public class ParsedPosting { public LedgerTransactionAccount asLedgerAccount() { ParsedAmount amt = pamount.get(0); return new LedgerTransactionAccount(paccount, amt.getAquantity() - .asFloat(), amt.getAcommodity()); + .asFloat(), amt.getAcommodity(), + getPcomment()); } }