X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerAccount.java;h=92ce6c80c8c1a7352b8d340ff4dc505da23635f3;hb=0a73337c99e2074aa7e7228204289896342ec636;hp=11c1a16bfa097febf4361fb5c1e294cc4647269d;hpb=d08ab8235d0fd152c772b2dd5ffa1ca5747f67b1;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
index 11c1a16b..92ce6c80 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
@@ -23,7 +23,6 @@ import androidx.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class LedgerAccount {
@@ -31,27 +30,32 @@ public class LedgerAccount {
     private String name;
     private String shortName;
     private int level;
-    private String parentName;
-    private boolean hiddenByStarToBe;
+    private LedgerAccount parent;
     private boolean expanded;
     private List<LedgerAmount> amounts;
     private boolean hasSubAccounts;
     private boolean amountsExpanded;
     private WeakReference<MobileLedgerProfile> profileWeakReference;
 
-    public LedgerAccount(MobileLedgerProfile profile, String name) {
+    public LedgerAccount(MobileLedgerProfile profile, String name, @Nullable LedgerAccount parent) {
         this.profileWeakReference = new WeakReference<>(profile);
+        this.parent = parent;
+        if (parent != null && !name.startsWith(parent.getName() + ":"))
+            throw new IllegalStateException(
+                    String.format("Account name '%s' doesn't match parent account '%s'", name,
+                            parent.getName()));
         this.setName(name);
     }
-
-    public LedgerAccount(MobileLedgerProfile profile, String name, float amount) {
-        this.profileWeakReference = new WeakReference<>(profile);
-        this.setName(name);
-        this.expanded = true;
-        this.amounts = new ArrayList<LedgerAmount>();
-        this.addAmount(amount);
+    @Nullable
+    public static String extractParentName(@NonNull String accName) {
+        int colonPos = accName.lastIndexOf(':');
+        if (colonPos < 0)
+            return null;    // no parent account -- this is a top-level account
+        else
+            return accName.substring(0, colonPos);
     }
-    public @Nullable MobileLedgerProfile getProfile() {
+    public @Nullable
+    MobileLedgerProfile getProfile() {
         return profileWeakReference.get();
     }
     @Override
@@ -60,40 +64,43 @@ public class LedgerAccount {
     }
     @Override
     public boolean equals(@Nullable Object obj) {
-        if (obj == null) return false;
+        if (obj == null)
+            return false;
+
+        if (!(obj instanceof LedgerAccount))
+            return false;
 
-        return obj.getClass().equals(this.getClass()) &&
-               name.equals(((LedgerAccount) obj).getName());
+        LedgerAccount acc = (LedgerAccount) obj;
+        if (!name.equals(acc.name))
+            return false;
+
+        if (!getAmountsString().equals(acc.getAmountsString()))
+            return false;
+
+        return expanded == acc.expanded && amountsExpanded == acc.amountsExpanded;
     }
     // an account is visible if:
-    //  - it has an expanded parent or is a top account
-    public boolean isVisible(List<LedgerAccount> list) {
-        for (LedgerAccount acc : list) {
-            if (acc.isParentOf(this)) {
-                if (!acc.isExpanded()) return false;
-            }
-        }
-        return true;
+    //  - it has an expanded visible parent or is a top account
+    public boolean isVisible() {
+        if (parent == null)
+            return true;
+
+        return (parent.isExpanded() && parent.isVisible());
     }
     public boolean isParentOf(LedgerAccount potentialChild) {
-        return potentialChild.getName().startsWith(name + ":");
+        return potentialChild.getName()
+                             .startsWith(name + ":");
     }
     private void stripName() {
-        level = 0;
-        shortName = name;
-        StringBuilder parentBuilder = new StringBuilder();
-        while (true) {
-            Matcher m = reHigherAccount.matcher(shortName);
-            if (m.find()) {
-                level++;
-                parentBuilder.append(m.group(0));
-                shortName = m.replaceFirst("");
-            }
-            else break;
+        if (parent == null) {
+            level = 0;
+            shortName = name;
+        }
+        else {
+            level = parent.level + 1;
+            shortName = name.substring(parent.getName()
+                                             .length() + 1);
         }
-        if (parentBuilder.length() > 0)
-            parentName = parentBuilder.substring(0, parentBuilder.length() - 1);
-        else parentName = null;
     }
     public String getName() {
         return name;
@@ -102,37 +109,43 @@ public class LedgerAccount {
         this.name = name;
         stripName();
     }
-    public void addAmount(float amount, String currency) {
-        if (amounts == null) amounts = new ArrayList<>();
+    public void addAmount(float amount, @NonNull String currency) {
+        if (amounts == null)
+            amounts = new ArrayList<>();
         amounts.add(new LedgerAmount(amount, currency));
     }
     public void addAmount(float amount) {
-        this.addAmount(amount, null);
+        this.addAmount(amount, "");
     }
     public int getAmountCount() { return (amounts != null) ? amounts.size() : 0; }
     public String getAmountsString() {
-        if ((amounts == null) || amounts.isEmpty()) return "";
+        if ((amounts == null) || amounts.isEmpty())
+            return "";
 
         StringBuilder builder = new StringBuilder();
         for (LedgerAmount amount : amounts) {
             String amt = amount.toString();
-            if (builder.length() > 0) builder.append('\n');
+            if (builder.length() > 0)
+                builder.append('\n');
             builder.append(amt);
         }
 
         return builder.toString();
     }
     public String getAmountsString(int limit) {
-        if ((amounts == null) || amounts.isEmpty()) return "";
+        if ((amounts == null) || amounts.isEmpty())
+            return "";
 
         int included = 0;
         StringBuilder builder = new StringBuilder();
         for (LedgerAmount amount : amounts) {
             String amt = amount.toString();
-            if (builder.length() > 0) builder.append('\n');
+            if (builder.length() > 0)
+                builder.append('\n');
             builder.append(amt);
             included++;
-            if (included == limit) break;
+            if (included == limit)
+                break;
         }
 
         return builder.toString();
@@ -147,16 +160,7 @@ public class LedgerAccount {
     }
 
     public String getParentName() {
-        return parentName;
-    }
-    public boolean isHiddenByStarToBe() {
-        return hiddenByStarToBe;
-    }
-    public void setHiddenByStarToBe(boolean hiddenByStarToBe) {
-        this.hiddenByStarToBe = hiddenByStarToBe;
-    }
-    public void toggleHiddenToBe() {
-        setHiddenByStarToBe(!hiddenByStarToBe);
+        return (parent == null) ? null : parent.getName();
     }
     public boolean hasSubAccounts() {
         return hasSubAccounts;
@@ -174,10 +178,18 @@ public class LedgerAccount {
         expanded = !expanded;
     }
     public void removeAmounts() {
-        if (amounts != null) amounts.clear();
+        if (amounts != null)
+            amounts.clear();
     }
     public boolean amountsExpanded() { return amountsExpanded; }
     public void setAmountsExpanded(boolean flag) { amountsExpanded = flag; }
     public void toggleAmountsExpanded() { amountsExpanded = !amountsExpanded; }
 
+    public void propagateAmountsTo(LedgerAccount acc) {
+        for (LedgerAmount a : amounts)
+            a.propagateToAccount(acc);
+    }
+    public List<LedgerAmount> getAmounts() {
+        return amounts;
+    }
 }