X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FTemplateDetailsItem.java;h=f158f413196dace141b2f9f6cdb6f1e9cb1d92fe;hb=99ed62c9371fc199580720de7e72e6476413960f;hp=7dfed8989b5fb040974c58b0137b27a6bfe2ceb9;hpb=ecad510202857eb3115de5e575165e61a9f91481;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java b/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
index 7dfed898..f158f413 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
@@ -32,11 +32,13 @@ import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.db.TemplateAccount;
 import net.ktnx.mobileledger.db.TemplateBase;
 import net.ktnx.mobileledger.db.TemplateHeader;
+import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.Misc;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -102,6 +104,7 @@ abstract public class TemplateDetailsItem {
             TemplateAccount pa = (TemplateAccount) p;
             AccountRow acc = createAccountRow();
             acc.setId(pa.getId());
+            acc.setPosition(pa.getPosition());
 
             if (pa.getAccountNameMatchGroup() == null)
                 acc.setAccountName(Misc.nullIsEmpty(pa.getAccountName()));
@@ -225,6 +228,11 @@ abstract public class TemplateDetailsItem {
             result.setValue(initialValue);
             return result;
         }
+        public void copyFrom(@NonNull PossiblyMatchedValue<T> origin) {
+            literalValue = origin.literalValue;
+            value = origin.value;
+            matchGroup = origin.matchGroup;
+        }
         public T getValue() {
             if (!literalValue)
                 throw new IllegalStateException("Value is not literal");
@@ -286,9 +294,19 @@ abstract public class TemplateDetailsItem {
                 PossiblyMatchedValue.withLiteralFloat(null);
         private final PossiblyMatchedValue<Currency> currency = new PossiblyMatchedValue<>();
         private boolean negateAmount;
-        private AccountRow() {
+        public AccountRow() {
             super(Type.ACCOUNT_ITEM);
         }
+        public AccountRow(AccountRow origin) {
+            super(Type.ACCOUNT_ITEM);
+            id = origin.id;
+            position = origin.position;
+            accountName.copyFrom(origin.accountName);
+            accountComment.copyFrom(origin.accountComment);
+            amount.copyFrom(origin.amount);
+            currency.copyFrom(origin.currency);
+            negateAmount = origin.negateAmount;
+        }
         public boolean isNegateAmount() {
             return negateAmount;
         }
@@ -360,8 +378,15 @@ abstract public class TemplateDetailsItem {
             return accountComment.hasLiteralValue();
         }
         public boolean equalContents(AccountRow o) {
+            if (position != o.position) {
+                Logger.debug("cmpAcc",
+                        String.format(Locale.US, "[%d] != [%d]: pos %d != pos %d", getId(),
+                                o.getId(), position, o.position));
+                return false;
+            }
             return amount.equals(o.amount) && accountName.equals(o.accountName) &&
-                   accountComment.equals(o.accountComment) && negateAmount == o.negateAmount;
+                   position == o.position && accountComment.equals(o.accountComment) &&
+                   negateAmount == o.negateAmount;
         }
         public void switchToLiteralAmount() {
             amount.switchToLiteral();
@@ -658,7 +683,7 @@ abstract public class TemplateDetailsItem {
                                 ss.setSpan(notMatchedSpan(), 0, m.start(),
                                         Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                             if (m.end() < testText.length() - 1)
-                                ss.setSpan(notMatchedSpan(), m.end(), testText.length() - 1,
+                                ss.setSpan(notMatchedSpan(), m.end(), testText.length(),
                                         Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
                             ss.setSpan(matchedSpan(), m.start(0), m.end(0),