more pronounced day/month delimiters in the transaction list

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / json / v1_14 / ParsedPosting.java

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 f1a6e1ff9975c214f6b0519f86f58f9fe12d2e31..472fee7c91864aabbcd58b947a4a12383e63eb33 100644 (file)
--- 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;
@@ -57,11 +57,13 @@ public class ParsedPosting {
         qty.setDecimalMantissa(Math.round(acc.getAmount() * 100));
         amt.setAquantity(qty);
         ParsedStyle style = new ParsedStyle();
-        style.setAscommodityside('L');
-        style.setAscommodityspaced(false);
+        style.setAscommodityside(getCommoditySide());
+        style.setAscommodityspaced(getCommoditySpaced());
         style.setAsprecision(2);
         style.setAsdecimalpoint('.');
         amt.setAstyle(style);
+        if (acc.getCurrency() != null)
+            amt.setAcommodity(acc.getCurrency());
         amounts.add(amt);
         result.setPamount(amounts);
         return result;
@@ -94,7 +96,7 @@ public class ParsedPosting {
         return pcomment;
     }
     public void setPcomment(String pcomment) {
-        this.pcomment = pcomment;
+        this.pcomment = (pcomment == null) ? null : pcomment.trim();
     }
     public List<List<String>> getPtags() {
         return ptags;
@@ -135,7 +137,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());
     }
 
 }