Revert "remove references to style members from the parser classes"

Breaks new transaction submission

This reverts commit 47f69abd0ff71ef40d37fc8b9f8693d370f473ea.

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedAmount.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedAmount.java
index dd32d8b6d87f28356d553aed55b7419f68ced8d5..3dee4ae908312934f2d12454061bc5399b6d3a77 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedAmount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedAmount.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2019 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
@@ -24,6 +24,7 @@ public class ParsedAmount {
     private String acommodity;
     private ParsedQuantity aquantity;
     private boolean aismultiplier;
+    private ParsedStyle astyle;
     private ParsedPrice aprice;
     public ParsedAmount() {
     }
@@ -51,4 +52,11 @@ public class ParsedAmount {
     public void setAismultiplier(boolean aismultiplier) {
         this.aismultiplier = aismultiplier;
     }
+    public ParsedStyle getAstyle() {
+        return astyle;
+    }
+    public void setAstyle(ParsedStyle astyle) {
+        this.astyle = astyle;
+    }
+
 }

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedBalance.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedBalance.java
index c2854c0e964b474f01a5e4dcc7a93a7745a4a745..24e9ccb07f8015523c287e4860d00d359dff5d0c 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedBalance.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedBalance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2019 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,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 public class ParsedBalance {
     private ParsedQuantity aquantity;
     private String acommodity;
+    private ParsedStyle astyle;
     public ParsedBalance() {
     }
     public ParsedQuantity getAquantity() {
@@ -40,4 +41,10 @@ public class ParsedBalance {
     public void setAcommodity(String acommodity) {
         this.acommodity = acommodity;
     }
+    public ParsedStyle getAstyle() {
+        return astyle;
+    }
+    public void setAstyle(ParsedStyle astyle) {
+        this.astyle = astyle;
+    }
 }

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 d773420ef1cf4c7be20263d6a87edce6591e2f6e..38777684bbd8e3aec545f407bb836d9945fce809 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 © 2020 Damyan Ivanov.
+ * Copyright © 2019 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
@@ -56,6 +56,12 @@ public class ParsedPosting extends net.ktnx.mobileledger.json.ParsedPosting {
         qty.setDecimalPlaces(2);
         qty.setDecimalMantissa(Math.round(acc.getAmount() * 100));
         amt.setAquantity(qty);
+        ParsedStyle style = new ParsedStyle();
+        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);

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPrice.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPrice.java
index d3691d66f7d9b94dacb419268249e1912279f26a..0b93e15f46311e4b642941b000af18365b60e488 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPrice.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedPrice.java
@@ -40,6 +40,7 @@ class ParsedPrice {
         private ParsedQuantity aquantity;
         private String acommodity;
         private boolean aismultiplier;
+        private ParsedStyle astyle;
         public Contents() {
             acommodity = "";
         }
@@ -67,5 +68,11 @@ class ParsedPrice {
         public void setAismultiplier(boolean aismultiplier) {
             this.aismultiplier = aismultiplier;
         }
+        public ParsedStyle getAstyle() {
+            return astyle;
+        }
+        public void setAstyle(ParsedStyle astyle) {
+            this.astyle = astyle;
+        }
     }
 }