changeset 188:5cee31b1418a

Cleaning up.
author Zerotorescue
date Mon, 31 Jan 2011 15:06:37 +0100
parents 2707dea58d96
children 90e5911a2ff1
files Core.lua Modules/Alerts.lua
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Core.lua	Sun Jan 30 20:54:50 2011 +0100
+++ b/Core.lua	Mon Jan 31 15:06:37 2011 +0100
@@ -374,10 +374,10 @@
 function addon:DisplayItemCount(value, minimumStock)
 	if value == -1 then
 		return "|cffffff00Unknown|r";
+	elseif value == -2 then
+		return "|cffffff00-|r";
 	elseif value == -3 then
 		return "|cffffff00Unknown|r";
-	elseif value == -4 then
-		return "|cffffff00-|r";
 	else
 		return sformat("%s / %d", self:ColorCode(value, minimumStock), minimumStock);
 	end
@@ -523,22 +523,22 @@
 	for i, v in pairs(t) do
 		if type(v) == "table" then
 			if includeKeys then
-				local key = (type(i) == "number" and tostring(i)) or string.format("\"%s\"", tostring(i));
+				local key = (type(i) == "number" and tostring(i)) or sformat("\"%s\"", tostring(i));
 				
-				temp = string.format("%s%s  [%s] => %s,\n", temp, tabs, key, ReadableTable(v, includeKeys, (jumps or 0) + 1));
+				temp = sformat("%s%s  [%s] => %s,\n", temp, tabs, key, ReadableTable(v, includeKeys, (jumps or 0) + 1));
 			else
-				temp = string.format("%s%s  %s,\n", temp, tabs, ReadableTable(v, includeKeys, (jumps or 0) + 1));
+				temp = sformat("%s%s  %s,\n", temp, tabs, ReadableTable(v, includeKeys, (jumps or 0) + 1));
 			end
 		else
 			if includeKeys then
-				local key = (type(i) == "number" and tostring(i)) or string.format("\"%s\"", tostring(i));
-				local value = (type(v) == "number" and tostring(v)) or string.format("\"%s\"", tostring(v));
+				local key = (type(i) == "number" and tostring(i)) or sformat("\"%s\"", tostring(i));
+				local value = (type(v) == "number" and tostring(v)) or sformat("\"%s\"", tostring(v));
 				
-				temp = string.format("%s%s  [%s] => %s,\n", temp, tabs, key, value);
+				temp = sformat("%s%s  [%s] => %s,\n", temp, tabs, key, value);
 			else
-				local value = (type(v) == "number" and tostring(v)) or string.format("\"%s\"", tostring(v));
+				local value = (type(v) == "number" and tostring(v)) or sformat("\"%s\"", tostring(v));
 				
-				temp = string.format("%s%s  %s,\n", temp, tabs, value);
+				temp = sformat("%s%s  %s,\n", temp, tabs, value);
 			end
 		end
 	end
--- a/Modules/Alerts.lua	Sun Jan 30 20:54:50 2011 +0100
+++ b/Modules/Alerts.lua	Mon Jan 31 15:06:37 2011 +0100
@@ -270,12 +270,12 @@
 		}, -- item
 		{
 			["value"] = function(data, cols, realrow, column, table)
-				return addon:DisplayItemCount(data[realrow].rowData.localCount or -4, data[realrow].rowData.group.minLocalStock);
+				return addon:DisplayItemCount(data[realrow].rowData.localCount or -2, data[realrow].rowData.group.minLocalStock);
 			end,
 		}, -- local
 		{
 			["value"] = function(data, cols, realrow, column, table)
-				return addon:DisplayItemCount(data[realrow].rowData.globalCount or -4, data[realrow].rowData.group.minGlobalStock);
+				return addon:DisplayItemCount(data[realrow].rowData.globalCount or -2, data[realrow].rowData.group.minGlobalStock);
 			end,
 		}, -- global
 	};