From 355660eea4e480c59017aa8265651c49b21a05f0 Mon Sep 17 00:00:00 2001
From: Matthew Cech <contact@matthewcech.com>
Date: Sat, 1 Jun 2019 22:06:28 -0700
Subject: [PATCH] = Tracked values updating

---
 src/dataStructures/KittyTrackedLong.java   |  6 ++----
 src/dataStructures/KittyTrackedString.java |  2 +-
 src/dataStructures/KittyTrackedVector.java | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java
index 588d64f..b584e4b 100644
--- a/src/dataStructures/KittyTrackedLong.java
+++ b/src/dataStructures/KittyTrackedLong.java
@@ -17,8 +17,7 @@ import utils.LogFilter;
 //
 public class KittyTrackedLong extends DatabaseTrackedObject 
 {
-	private long tracked;            // Tracked value
-	private final String databaseID; // in-database ID of this value
+	private long tracked; // Tracked value
 	
 	// Config
 	private final static String differentiator = "long-";
@@ -26,7 +25,6 @@ public class KittyTrackedLong extends DatabaseTrackedObject
 	public KittyTrackedLong(String readableName, String UniqueID)
 	{
 		super(differentiator + readableName + UniqueID);
-		databaseID = differentiator + readableName + UniqueID;
 	}
 	
 	public long Add(long toAdd)
@@ -73,7 +71,7 @@ public class KittyTrackedLong extends DatabaseTrackedObject
 			catch(Exception e)
 			{
 				tracked = 0;
-				GlobalLog.Error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + databaseID);
+				GlobalLog.Error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + identifier);
 			}
 		}
 		else
diff --git a/src/dataStructures/KittyTrackedString.java b/src/dataStructures/KittyTrackedString.java
index bba0559..d57d268 100644
--- a/src/dataStructures/KittyTrackedString.java
+++ b/src/dataStructures/KittyTrackedString.java
@@ -6,7 +6,7 @@ import utils.LogFilter;
 
 public class KittyTrackedString extends DatabaseTrackedObject
 {
-	private String trackedString;    // Tracked value
+	private String trackedString; // Tracked value
 	private final static String differentiator = "string-";
 	
 	// Constructor with unique id and readable name
diff --git a/src/dataStructures/KittyTrackedVector.java b/src/dataStructures/KittyTrackedVector.java
index 2b12714..5bff03f 100644
--- a/src/dataStructures/KittyTrackedVector.java
+++ b/src/dataStructures/KittyTrackedVector.java
@@ -8,7 +8,7 @@ import core.DatabaseTrackedObject;
 public class KittyTrackedVector extends DatabaseTrackedObject
 {
 	// Variables
-	private Vector<String> allowedRole = new Vector<String>();
+	private Vector<String> trackedVector = new Vector<String>();
 	
 	private final static String delimiter = "\n";
 	private final static String split = "\\n";
@@ -24,7 +24,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject
 	// See if the string is contined in the vector, regardless of case.
 	public boolean containsIgnoreCase(String str)
 	{
-		Iterator<String> value = allowedRole.iterator();
+		Iterator<String> value = trackedVector.iterator();
 		
 		while (value.hasNext())
 		{
@@ -38,33 +38,33 @@ public class KittyTrackedVector extends DatabaseTrackedObject
 	// Mirrored behavior
 	public boolean contains(String str)
 	{
-		return allowedRole.contains(str);
+		return trackedVector.contains(str);
 	}
 	
 	public void add(String str)
 	{
-		allowedRole.add(str);
+		trackedVector.add(str);
 		this.MarkDirty();
 	}
 	
 	public boolean isEmpty()
 	{
-		return allowedRole.isEmpty();
+		return trackedVector.isEmpty();
 	}
 	
 	public int size()
 	{
-		return allowedRole.size();
+		return trackedVector.size();
 	}
 	
 	public String get(int index)
 	{
-		return allowedRole.get(index);
+		return trackedVector.get(index);
 	}
 	
 	public void remove(String str)
 	{
-		allowedRole.remove(str);
+		trackedVector.remove(str);
 		this.MarkDirty();
 	}
 	
@@ -74,12 +74,12 @@ public class KittyTrackedVector extends DatabaseTrackedObject
 	{
 		String toSerialize = "";
 		
-		for(int i = 0; i < allowedRole.size(); ++i)
+		for(int i = 0; i < trackedVector.size(); ++i)
 		{
 			if(i != 0)
 				toSerialize += delimiter;
 			
-			toSerialize += allowedRole.get(i);
+			toSerialize += trackedVector.get(i);
 		}
 		
 		return toSerialize; 
@@ -96,7 +96,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject
 				String[] rolesSplit = string.split(split);
 				
 				for(int i = 0; i < rolesSplit.length; ++i)
-					allowedRole.add(rolesSplit[i]);
+					trackedVector.add(rolesSplit[i]);
 			}
 		}
 	}