remove references to style members from the parser classes

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPosting.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPosting.java
index a0607512fa3aec4bf71f178f7d8448e7d869a545..d773420ef1cf4c7be20263d6a87edce6591e2f6e 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPosting.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPosting.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
@@ -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;
@@ -56,12 +56,8 @@ public class ParsedPosting {
         qty.setDecimalPlaces(2);
         qty.setDecimalMantissa(Math.round(acc.getAmount() * 100));
         amt.setAquantity(qty);
-        ParsedStyle style = new ParsedStyle();
-        style.setAscommodityside('L');
-        style.setAscommodityspaced(false);
-        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 +90,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;